Browse Source

Fixed Ribbon Tab Visibility Issues

Frank van den Bos 2 years ago
parent
commit
8863e1526c
1 changed files with 5 additions and 6 deletions
  1. 5 6
      prs.desktop/MainWindow.xaml.cs

+ 5 - 6
prs.desktop/MainWindow.xaml.cs

@@ -562,6 +562,8 @@ namespace PRSDesktop
                             ClientFactory.IsSupported<TimeSheet, Assignment>() && Security.IsAllowed<CanViewDailyReports>());
                             ClientFactory.IsSupported<TimeSheet, Assignment>() && Security.IsAllowed<CanViewDailyReports>());
 
 
                         SetVisibility(QuotesButton, Security.CanView<Quote>());
                         SetVisibility(QuotesButton, Security.CanView<Quote>());
+                        SetVisibility(KitsMasterList, Security.CanView<Kit>());
+                        SetVisibility(CostSheetsMasterList, Security.CanView<CostSheet>());
 
 
                         SetVisibleIfEither(QuotesTaskSeparator,
                         SetVisibleIfEither(QuotesTaskSeparator,
                             new FrameworkElement[]
                             new FrameworkElement[]
@@ -570,9 +572,7 @@ namespace PRSDesktop
                                 QuotesDailyReportButton
                                 QuotesDailyReportButton
                             }, new FrameworkElement[] { QuotesButton });
                             }, new FrameworkElement[] { QuotesButton });
 
 
-                        SetVisibility(KitsMasterList, Security.CanView<Kit>());
-                        SetVisibility(CostSheetsMasterList, Security.CanView<CostSheet>());
-
+                        
                         SetVisibleIfEither(QuotesActionSeparator, new FrameworkElement[] { QuotesButton },
                         SetVisibleIfEither(QuotesActionSeparator, new FrameworkElement[] { QuotesButton },
                             new FrameworkElement[] { KitsMasterList, CostSheetsMasterList });
                             new FrameworkElement[] { KitsMasterList, CostSheetsMasterList });
 
 
@@ -788,8 +788,7 @@ namespace PRSDesktop
                                 ProductsDailyReportButton
                                 ProductsDailyReportButton
                             }, new FrameworkElement[] { ProductsMasterList, StockLocationList, StockMovementList, StockSummaryButton });
                             }, new FrameworkElement[] { ProductsMasterList, StockLocationList, StockMovementList, StockSummaryButton });
 
 
-                        SetVisibleIfAny(ProductActions, ProductsDashboardButton, ProductsMessagesButton, ProductsTaskButton, ProductsAttendanceButton,
-                            ProductsDailyReportButton, ProductsMasterList, StockLocationList, StockMovementList, StockSummaryButton);
+                        SetVisibleIfAny(ProductActions, ProductsMasterList, StockLocationList, StockMovementList, StockSummaryButton);
 
 
                         AddSetupAction(ProductTab, "Product Dimensions", ProductDimensionUnitsList_Click, PRSDesktop.Resources.unitofmeasure,
                         AddSetupAction(ProductTab, "Product Dimensions", ProductDimensionUnitsList_Click, PRSDesktop.Resources.unitofmeasure,
                             Security.CanView<ProductDimensionUnit>());
                             Security.CanView<ProductDimensionUnit>());
@@ -1840,7 +1839,7 @@ namespace PRSDesktop
             foreach (var button in buttons)
             foreach (var button in buttons)
                 bVisible = bVisible || button.Visibility == Visibility.Visible;
                 bVisible = bVisible || button.Visibility == Visibility.Visible;
 
 
-            bVisible = bVisible || (SetupActions.GetValueOrDefault(tab)?.Count(x => x is SetupActionItem) ?? 0) > 0;
+            bVisible = bVisible || (SetupActions.GetValueOrDefault(tab)?.Count(x => x is SetupActionItem) ?? 0) > 3;
 
 
             tab.Visibility = bVisible ? Visibility.Visible : Visibility.Collapsed;
             tab.Visibility = bVisible ? Visibility.Visible : Visibility.Collapsed;
         }
         }