Bläddra i källkod

Moved DataEntry button

Kenric Nugteren 1 år sedan
förälder
incheckning
cb25a0cab1
2 ändrade filer med 7 tillägg och 6 borttagningar
  1. 3 3
      prs.desktop/MainWindow.xaml
  2. 4 3
      prs.desktop/MainWindow.xaml.cs

+ 3 - 3
prs.desktop/MainWindow.xaml

@@ -676,9 +676,6 @@
                     <fluent:Button x:Name="AccountsTaskButton" Header="Task List"
                                    LargeIcon="pack://application:,,,/Resources/kanban.png"
                                    Click="Tasks_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="AccountsDataButton" Header="Data Entry"
-                                   LargeIcon="pack://application:,,,/Resources/pencil.png"
-                                   Click="DataEntry_Click" MinWidth="60" />
                     <fluent:Button x:Name="AccountsAttendanceButton" Header="In/Out Board"
                                    LargeIcon="pack://application:,,,/Resources/attendance.png"
                                    Click="Attendance_Checked" MinWidth="60" />
@@ -702,6 +699,9 @@
                     <fluent:Button x:Name="SupplierList" Header="Suppliers"
                                    LargeIcon="pack://application:,,,/Resources/supplier.png"
                                    Click="SupplierList_Click" MinWidth="60" />
+                    <fluent:Button x:Name="AccountsDataButton" Header="Data Entry"
+                                   LargeIcon="pack://application:,,,/Resources/pencil.png"
+                                   Click="DataEntry_Click" MinWidth="60" />
                     <fluent:Button x:Name="PurchasesList" Header="Purchase Orders"
                                    LargeIcon="pack://application:,,,/Resources/purchase.png"
                                    Click="PurchasesList_Click" MinWidth="60" />

+ 4 - 3
prs.desktop/MainWindow.xaml.cs

@@ -941,7 +941,6 @@ namespace PRSDesktop
 
             SetVisibility(AccountsMessagesButton, Security.CanView<Notification>());
             SetVisibility(AccountsTaskButton, ClientFactory.IsSupported<Kanban>() && Security.IsAllowed<CanViewTasks>());
-            SetVisibility(AccountsDataButton, Security.IsAllowed<CanViewDataEntryPanel>());
             SetVisibility(AccountsAttendanceButton, ClientFactory.IsSupported<TimeSheet>() && Security.IsAllowed<CanViewInOutBoard>());
             SetVisibility(AccountsMapButton, bMaps);
             SetVisibility(AccountsDailyReportButton,
@@ -963,6 +962,8 @@ namespace PRSDesktop
                 && Security.CanView<Supplier>()
                 && Security.IsAllowed<ViewDesktopSuppliersScreen>());
 
+            SetVisibility(AccountsDataButton, Security.IsAllowed<CanViewDataEntryPanel>());
+
             SetVisibility(PurchasesList, ClientFactory.IsSupported<PurchaseOrder>() 
                 && Security.CanView<PurchaseOrder>()
                 && Security.IsAllowed<ViewDesktopPurchaseOrdersScreen>());
@@ -982,7 +983,7 @@ namespace PRSDesktop
                                 AccountsDailyReportButton
                 }, new FrameworkElement[] { CustomerList, InvoiceList, ReceiptList });
             SetVisibleIfEither(AccountsTaskSeparator2, new FrameworkElement[] { CustomerList, InvoiceList, ReceiptList },
-                new FrameworkElement[] { SupplierList, PurchasesList, BillsList, PaymentsList });
+                new FrameworkElement[] { SupplierList, AccountsDataButton, PurchasesList, BillsList, PaymentsList });
             SetVisibleIfAny(AccountsActions, AccountsDashboardButton, AccountsMessagesButton, AccountsTaskButton,
                 AccountsAttendanceButton,
                 AccountsDailyReportButton, CustomerList, InvoiceList, ReceiptList, SupplierList, PurchasesList, BillsList, PaymentsList);
@@ -1013,7 +1014,7 @@ namespace PRSDesktop
 
             AddSetupModulesAndReports(AccountsTab);
 
-            SetTabVisibleIfAny(AccountsTab, CustomerList, InvoiceList, ReceiptList, SupplierList, PurchasesList, BillsList, PaymentsList);
+            SetTabVisibleIfAny(AccountsTab, CustomerList, InvoiceList, ReceiptList, SupplierList, AccountsDataButton, PurchasesList, BillsList, PaymentsList);
         }
 
         private void SetupHumanResourcesTab(bool bMaps)