wpf: Moved Manufacturing dashboards into Manufacturing Tab

prs.desktop/MainWindow.xaml

@@ -322,6 +322,18 @@
                     <fluent:Button x:Name="FactoryFloorButton" Header="Factory Floor"
                                    LargeIcon="pack://application:,,,/Resources/wrench.png" />
                     
+                    <syncfusion:RibbonSeparator x:Name="ManufacturingAnalysisSeparator" />
+                    
+                    <fluent:Button x:Name="FactoryProductivityButton" Header="Factory KPIs"
+                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
+                    
+                    <fluent:Button x:Name="TemplateAnalysisButton" Header="Template Analysis"
+                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
+                    
+                    <fluent:Button x:Name="FactoryAnalysisButton" Header="Factory Analysis"
+                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
+                    
+                    
                 </fluent:RibbonGroupBox>
 
                 <fluent:RibbonGroupBox x:Name="ManufacturingReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
@@ -689,15 +701,6 @@
                     <syncfusion:RibbonSeparator x:Name="DashboardsTaskSeparator" />
                     
                     <!--This is where the static dashboards need to go-->
-                    <fluent:Button x:Name="FactoryProductivityButton" Header="Factory KPIs"
-                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
-                    
-                    <fluent:Button x:Name="TemplateAnalysisButton" Header="Template Analysis"
-                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
-                    
-                    <fluent:Button x:Name="FactoryAnalysisButton" Header="Factory Analysis"
-                                   LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
-                    
                     <fluent:Button x:Name="DatabaseActivityButton" Header="Database Activity"
                                    LargeIcon="{svgc:SvgImage Source=/Resources/kpi.svg}" />
                     

prs.desktop/MainWindow.xaml.cs

@@ -816,21 +816,6 @@ public partial class MainWindow : IPanelHostControl
         SetModuleVisibility<DailyReport>(DashboardsDailyReportButton,
             ClientFactory.IsSupported<TimeSheet, Assignment>() && Security.IsAllowed<CanViewDailyReports>());
 
-        SetModuleVisibility<FactoryProductivityDashboard>(FactoryProductivityButton,
-            ClientFactory.IsSupported<ManufacturingHistory>() 
-            && Security.IsAllowed<CanViewFactoryKPIs>()
-            && Security.IsAllowed<ViewDesktopFactoryKPIsDashboard>());
-
-        SetModuleVisibility<ManufacturingTemplateAnalysis>(TemplateAnalysisButton,
-            ClientFactory.IsSupported<ManufacturingTemplate, ManufacturingHistory>() 
-            && Security.IsAllowed<CanViewTemplateAnalysis>()
-            && Security.IsAllowed<ViewDesktopTemplateAnalysisDashboard>());
-
-        SetModuleVisibility<FactoryFloorAnalysis>(FactoryAnalysisButton,
-            ClientFactory.IsSupported<ManufacturingTemplate, ManufacturingHistory>() 
-            && Security.IsAllowed<CanViewFactoryAnalysis>()
-            && Security.IsAllowed<ViewDesktopFactoryAnalysisDashboard>());
-
         SetModuleVisibility<DatabaseActivityDashboard>(DatabaseActivityButton,
             ClientFactory.IsSupported<UserTracking>() 
             && Security.IsAllowed<CanViewDatabaseActivity>()
@@ -851,18 +836,16 @@ public partial class MainWindow : IPanelHostControl
             },
             new FrameworkElement[]
             {
-                            FactoryProductivityButton, TemplateAnalysisButton, FactoryAnalysisButton, DatabaseActivityButton, UserActivityButton, QuickStatusButton
+                            DatabaseActivityButton, UserActivityButton, QuickStatusButton
             });
         SetVisibleIfAny(DashboardsActions, DashboardsDashboardButton, DashboardMessagesButton, DashboardsTaskButton,
-            DashboardsAttendanceButton, DashboardsDailyReportButton, FactoryProductivityButton, TemplateAnalysisButton,
-            FactoryAnalysisButton, DatabaseActivityButton, UserActivityButton, QuickStatusButton);
+            DashboardsAttendanceButton, DashboardsDailyReportButton,
+            DatabaseActivityButton, UserActivityButton, QuickStatusButton);
 
         //DashboardsActions.IsLauncherButtonVisible = Security.IsAllowed<CanCustomiseModules>();
         //DashboardsReports.IsLauncherButtonVisible = Security.IsAllowed<CanDesignReports>();
 
-        SetVisibleIfAny(DashboardsTab, FactoryProductivityButton, TemplateAnalysisButton, FactoryAnalysisButton,
-            DatabaseActivityButton,
-            UserActivityButton, QuickStatusButton);
+        SetVisibleIfAny(DashboardsTab, DatabaseActivityButton, UserActivityButton, QuickStatusButton);
     }
     
     private void SetupDigitalFormsTab(bool bMaps)
@@ -1183,11 +1166,27 @@ public partial class MainWindow : IPanelHostControl
             {
                 FactoryStatusButton, FactoryAllocationButton, FactoryFloorButton
             });
+
+        SetModuleVisibility<FactoryProductivityDashboard>(FactoryProductivityButton,
+            ClientFactory.IsSupported<ManufacturingHistory>() 
+            && Security.IsAllowed<CanViewFactoryKPIs>()
+            && Security.IsAllowed<ViewDesktopFactoryKPIsDashboard>());
+        SetModuleVisibility<ManufacturingTemplateAnalysis>(TemplateAnalysisButton,
+            ClientFactory.IsSupported<ManufacturingTemplate, ManufacturingHistory>() 
+            && Security.IsAllowed<CanViewTemplateAnalysis>()
+            && Security.IsAllowed<ViewDesktopTemplateAnalysisDashboard>());
+
+        SetModuleVisibility<FactoryFloorAnalysis>(FactoryAnalysisButton,
+            ClientFactory.IsSupported<ManufacturingTemplate, ManufacturingHistory>() 
+            && Security.IsAllowed<CanViewFactoryAnalysis>()
+            && Security.IsAllowed<ViewDesktopFactoryAnalysisDashboard>());
+        
+        SetVisibleIfAny(ManufacturingAnalysisSeparator, [FactoryProductivityButton, TemplateAnalysisButton, FactoryAnalysisButton]);
         
         
         SetVisibleIfAny(ManufacturingActions, ManufacturingDashboardButton, ManufacturingMessagesButton, ManufacturingTaskButton,
             ManufacturingAttendanceButton, ManufacturingDailyReportButton, FactoryStatusButton, FactoryAllocationButton,
-            FactoryFloorButton);
+            FactoryFloorButton, FactoryProductivityButton, TemplateAnalysisButton, FactoryAnalysisButton);
 
         SetTabVisibleIfAny(ManufacturingTab, FactoryStatusButton, FactoryAllocationButton, FactoryFloorButton);
     }