Explorar o código

Removed Approved Setouts screen

Kenric Nugteren hai 4 semanas
pai
achega
e8c355f3c3

+ 1 - 25
prs.desktop/Panels/Jobs/Designs/JobDesignPanel.xaml

@@ -7,29 +7,5 @@
              xmlns:dynamicGrid="clr-namespace:InABox.DynamicGrid;assembly=InABox.Wpf"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
-    <dynamicGrid:DynamicTabControl
-        x:Name="DesignsTabControl"
-        TabStripPlacement="Bottom" >
-        <dynamicGrid:DynamicTabItem Header="Unapproved" x:Name="UnapprovedTabItem">
-            <local:StagingPanel 
-                x:Name="UnapprovedDesigns" />
-        </dynamicGrid:DynamicTabItem>
-        <dynamicGrid:DynamicTabItem Header="Approved" x:Name="ApprovedTabItem">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.3*" />
-                    <ColumnDefinition Width="0.7*" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <local:JobDesignGrid x:Name="Designs" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,0,0,5" />
-                <local:JobDesignDocumentGrid x:Name="Documents" Grid.Column="0" Grid.Row="1" Margin="0,0,5,0" />
-                <local:ManufacturingGrid x:Name="Packets" Grid.Column="1" Grid.Row="1" Margin="0"
-                                         ColumnsTag="JobDesignManufacturing" />
-            </Grid>
-        </dynamicGrid:DynamicTabItem>
-    </dynamicGrid:DynamicTabControl>
-    
+    <local:StagingPanel x:Name="UnapprovedDesigns" />
 </UserControl>

+ 4 - 62
prs.desktop/Panels/Jobs/Designs/JobDesignPanel.xaml.cs

@@ -12,44 +12,22 @@ using InABox.Wpf;
 namespace PRSDesktop
 {
 
-    public enum JobDesignsView
-    {
-        Unapproved,
-        Approved
-    }
-    
-    public class JobDesignSettings : IUserConfigurationSettings
-    {
-        public JobDesignsView View { get; set; }
-    }
-    
     /// <summary>
     ///     Interaction logic for JobDesigns.xaml
     /// </summary>
     public partial class JobDesignPanel : UserControl, IPanel<Setout>, IMasterDetailControl<Job>
     {
-        
-        private JobDesignSettings _settings;
-        
         public JobDesignPanel()
         {
-            _settings = new UserConfiguration<JobDesignSettings>().Load();
             InitializeComponent();
-            DesignsTabControl.SelectedItem = _settings.View == JobDesignsView.Unapproved
-                ? UnapprovedTabItem
-                : ApprovedTabItem;
-            DesignsTabControl.SelectionChanged += DesignsTabControl_OnSelectionChanged;
-            Designs.OnSelectItem += Designs_OnSelectItem;
-            
         }
 
         public Job? Master
         {
-            get => Designs.Master;
+            get => UnapprovedDesigns.Job;
             set
             {
                 UnapprovedDesigns.Job = value;
-                Designs.Master = value;
             }
         }
 
@@ -59,26 +37,19 @@ namespace PRSDesktop
 
         public void CreateToolbarButtons(IPanelHost host)
         {
-            if (DesignsTabControl.SelectedTab == UnapprovedTabItem)
-            {
-                StagingPanel.SetoutsConfigurationSettings(host, () => new GlobalConfiguration<StagingPanellSettings>().Load());
-            }
+            StagingPanel.SetoutsConfigurationSettings(host, () => new GlobalConfiguration<StagingPanellSettings>().Load());
         }
 
         public string SectionName => "Job Designs";
         
         public DataModel DataModel(Selection selection)
         {
-            var ids = Designs.ExtractValues(c => c.ID, selection).ToArray();
-            return new BaseDataModel<Setout>(Filter<Setout>.Where(x => x.ID).InList(ids));
+            return UnapprovedDesigns.DataModel(selection);
         }
 
         public void Refresh()
         {
-            if (DesignsTabControl.SelectedTab == UnapprovedTabItem)
-                UnapprovedDesigns.Refresh();
-            else
-                Designs.Refresh(false, true);
+            UnapprovedDesigns.Refresh();
         }
 
         public Dictionary<string, object[]> Selected()
@@ -88,22 +59,7 @@ namespace PRSDesktop
 
         public void Setup()
         {
-            //DesignsTabControl.SelectedItem = ParentSettings
             UnapprovedDesigns.Setup();
-            Designs.Refresh(true, false);
-            Documents.Refresh(true, false);
-            Packets.Refresh(true, false);
-        }
-        
-        private void DesignsTabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.Source == e.OriginalSource)
-            {
-                _settings.View = DesignsTabControl.SelectedItem == UnapprovedTabItem ? JobDesignsView.Unapproved : JobDesignsView.Approved;
-                new UserConfiguration<JobDesignSettings>().Save(_settings);
-                Refresh();
-                OnUpdateDataModel?.Invoke(SectionName, DataModel(Selection.None));
-            }
         }
 
         public void Shutdown(CancelEventArgs? cancel)
@@ -113,19 +69,5 @@ namespace PRSDesktop
         public void Heartbeat(TimeSpan time)
         {
         }
-
-        private void Designs_OnSelectItem(object sender, DynamicGridSelectionEventArgs e)
-        {
-            var design = e.Rows?.FirstOrDefault()?.ToObject<Setout>();
-
-            Documents.Design = design;
-            Documents.Refresh(true, true);
-
-            Packets.Master = Master;
-            Packets.Design = design;
-            Packets.Refresh(true, true);
-        }
-
-
     }
 }