Browse Source

DESKTOP - improvements to Manufacturing packet display/code cleanup

Nick-PRSDigital@bitbucket.org 1 year ago
parent
commit
03d6f257d9

+ 1 - 1
prs.desktop/Panels/Factory/FactoryPanel.xaml

@@ -119,7 +119,7 @@
 
 
                         <Border Grid.Row="0" Grid.Column="0" BorderBrush="Gray" BorderThickness="0.75,0.75,0,0.75"
-                                CornerRadius="5,0,0,5" Margin="0,2,0,0" Background="{Binding SharedColor}"
+                                CornerRadius="{Binding LeftSectionRadius}" Margin="0,2,0,0" Background="{Binding SharedColor}"
                                 Tag="{Binding}" MouseLeftButtonDown="CardSelected">
                             <Grid Margin="2,5,0,5">
 

+ 1 - 1
prs.desktop/Panels/Jobs/JobSummaryGrid.cs

@@ -205,7 +205,7 @@ namespace PRSDesktop
                     x=>x.Dimensions.UnitSize,
                     unitsize,
                     x=>x.Job.ID,
-                    null,
+                    new Filter<StockHolding>(x => x.Units).IsGreaterThan(0.1),
                     null
                 );                  
             }

+ 13 - 6
prs.desktop/Panels/Manufacturing/ManufacturingKanban.cs

@@ -34,8 +34,8 @@ namespace PRSDesktop
 
         #region Group Display Properties
         //Automatically displays/hides the group section of a displayed packet, and sorts out things like the corner radius
-        public CornerRadius MainRadius { get; set; }
-        public CornerRadius OrderRadius { get; set; }
+        public CornerRadius MainSectionRadius { get; set; }
+        public CornerRadius LeftSectionRadius { get; set; }
         public Visibility GroupVisibility { get; set; }
 
         private string groupname;
@@ -48,18 +48,25 @@ namespace PRSDesktop
                 if (string.IsNullOrWhiteSpace(groupname))
                 {
                     GroupVisibility = Visibility.Collapsed;
-                    OrderRadius = new CornerRadius(5, 0, 0, 5);
-                    MainRadius = new CornerRadius(0, 5, 5, 0);
+                    LeftSectionRadius = new CornerRadius(5, 0, 0, 5);
+                    MainSectionRadius = new CornerRadius(0, 5, 5, 0);
                 }
                 else
                 {
                     GroupVisibility = Visibility.Visible;
-                    OrderRadius = new CornerRadius(5, 0, 0, 0);
-                    MainRadius = new CornerRadius(0, 5, 0, 0);
+                    LeftSectionRadius = new CornerRadius(5, 0, 0, 0);
+                    MainSectionRadius = new CornerRadius(0, 5, 0, 0);
                 }
             }
         }
         #endregion
+
+        public ManufacturingKanban()
+        {
+            GroupVisibility = Visibility.Collapsed;
+            LeftSectionRadius = new CornerRadius(5, 0, 0, 5);
+            MainSectionRadius = new CornerRadius(0, 5, 5, 0);
+        }
     }
 }
 

+ 2 - 2
prs.desktop/Panels/Manufacturing/ManufacturingPanelColumn.xaml

@@ -27,7 +27,7 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <Border Grid.Column="0" Grid.Row="0" BorderBrush="Gray" BorderThickness="0.75,0.75,0,0.75" CornerRadius="{Binding OrderRadius}"
+                <Border Grid.Column="0" Grid.Row="0" BorderBrush="Gray" BorderThickness="0.75,0.75,0,0.75" CornerRadius="{Binding LeftSectionRadius}"
                         Background="{Binding OrderColor}" Tag="{Binding}"
                         MouseLeftButtonDown="Border_MouseLeftButtonDown" ToolTip="{Binding Issues}">
                     <DockPanel>
@@ -44,7 +44,7 @@
                     </DockPanel>
                 </Border>
 
-                <Border Grid.Column="1" Grid.Row="0" BorderBrush="Gray" BorderThickness="0,0.75,0.75,0.75" CornerRadius="{Binding MainRadius}"
+                <Border Grid.Column="1" Grid.Row="0" BorderBrush="Gray" BorderThickness="0,0.75,0.75,0.75" CornerRadius="{Binding MainSectionRadius}"
                         Background="{Binding ColorKey}" Tag="{Binding}"
                         MouseLeftButtonDown="Border_MouseLeftButtonDown" ToolTip="{Binding Issues}">
                     <Grid Margin="3">

+ 0 - 7
prs.desktop/Panels/Staging/StagingPanel.xaml.cs

@@ -393,12 +393,6 @@ namespace PRSDesktop
 
         private void ConfigSettingsClick(PanelAction obj)
         {
-            //var editor = new ObjectEditor(_settings, "Setouts Configuration");
-            //if (editor.ShowDialog() == true)
-            //{
-            //    _settings = (StagingPanellSettings)editor.Input;
-            //    new GlobalConfiguration<StagingPanellSettings>().Save(_settings);
-            //}
             var pages = new DynamicEditorPages();
             var propertyEditor = new DynamicEditorForm(typeof(StagingPanellSettings), pages);
             propertyEditor.OnDefineLookups += sender =>
@@ -421,7 +415,6 @@ namespace PRSDesktop
             {
                 new GlobalConfiguration<StagingPanellSettings>().Save(_settings);
             }
-
         }
 
         private void PropertyEditor_OnFormCustomiseEditor(IDynamicEditorForm sender, object[] items, DynamicGridColumn column, BaseEditor editor)