Просмотр исходного кода

Changed grids to use Reconfigure() rather than directly editing options

Kenric Nugteren 1 год назад
Родитель
Сommit
340753eebc

+ 7 - 2
prs.desktop/Panels/DeliveredOnSite/DeliveredOnSitePanel.xaml.cs

@@ -51,10 +51,15 @@ namespace PRSDesktop
             return new Dictionary<string, object[]> { { typeof(DeliveryItem).EntityName(), Items.SelectedRows } };
         }
 
+        private void Items_OnReconfigure(DynamicGridOptions options)
+        {
+            options.PageSize = _globalSettings.PageSize;
+        }
+
         public void Setup()
         {
             LoadSettings();
-            Items.Options.PageSize = _globalSettings.PageSize;
+            Items.Reconfigure();
             Items.Refresh(true, false);
         }
 
@@ -71,7 +76,7 @@ namespace PRSDesktop
                     if (grid.EditItems(new DeliveredOnSiteGlobalSettings[] { _globalSettings }))
                     {
                         new GlobalConfiguration<DeliveredOnSiteGlobalSettings>().Save(_globalSettings);
-                        Items.Options.PageSize = _globalSettings.PageSize;
+                        Items.Reconfigure();
                         Refresh();
                     }   
                     

+ 7 - 2
prs.desktop/Panels/Products/Master List/ProductsPanel.xaml.cs

@@ -70,8 +70,8 @@ namespace PRSDesktop
                 _settings.ViewType == ScreenViewType.Details ? DynamicSplitPanelView.Detail : DynamicSplitPanelView.Combined;
             SplitPanel.AnchorWidth = _settings.AnchorWidth;
 
-            Products.Options.PageSize = _globalsettings.PageSize;
             Products.ColumnsTag = _settings.ViewType == ScreenViewType.Register ? _settings.ViewType.ToString() : "";
+            Products.Reconfigure();
             Products.Refresh(true, false);
             Products.OnSelectItem += Products_OnSelectItem;
 
@@ -98,7 +98,7 @@ namespace PRSDesktop
                     if (grid.EditItems(new ProductsGlobalSettings[] { _globalsettings }))
                     {
                         new GlobalConfiguration<ProductsGlobalSettings>().Save(_globalsettings);
-                        Products.Options.PageSize = _globalsettings.PageSize;
+                        Products.Reconfigure();
                         Refresh();
                     }   
                     
@@ -120,6 +120,11 @@ namespace PRSDesktop
             return new ProductDataModel(new Filter<Product>(x => x.ID).InList(ids));
         }
 
+        private void Products_OnReconfigure(DynamicGridOptions options)
+        {
+            options.PageSize = _globalsettings.PageSize;
+        }
+
         public void Refresh()
         {
             Groups.Refresh(false, true);

+ 7 - 2
prs.desktop/Panels/Products/Movements/StockMovementPanel.xaml.cs

@@ -52,7 +52,7 @@ public partial class StockMovementPanel : UserControl, IPanel<StockMovement>
                 if (grid.EditItems(new StockMovementGlobalSettings[] { _globalSettings }))
                 {
                     new GlobalConfiguration<StockMovementGlobalSettings>().Save(_globalSettings);
-                    Movements.Options.PageSize = _globalSettings.PageSize;
+                    Movements.Reconfigure();
                     Refresh();
                 }   
                     
@@ -76,6 +76,11 @@ public partial class StockMovementPanel : UserControl, IPanel<StockMovement>
     {
     }
 
+    private void Movements_OnReconfigure(DynamicGridOptions options)
+    {
+        options.PageSize = _globalSettings.PageSize;
+    }
+
     public void Refresh()
     {
         var start = StartPicker.SelectedDate?? DateTime.Now;
@@ -100,7 +105,7 @@ public partial class StockMovementPanel : UserControl, IPanel<StockMovement>
     {
         LoadSettings();
         Batches.Refresh(true, false);
-        Movements.Options.PageSize = _globalSettings.PageSize;
+        Movements.Reconfigure();
         Movements.Refresh(true, false);
         Batches.OnSelectItem += Batches_OnSelectItem;
     }

+ 8 - 2
prs.desktop/Panels/ReadyToGo/ReadyToGoPanel.xaml.cs

@@ -45,12 +45,18 @@ namespace PRSDesktop
 
         public void Setup()
         {
-            Items.Options.PageSize = _globalSettings.PageSize;
+            Items.Reconfigure();
             Items.Refresh(true, false);
         }
 
+        private void Items_OnReconfigure(DynamicGridOptions options)
+        {
+            options.PageSize = _globalSettings.PageSize;
+        }
+
         public void Shutdown(CancelEventArgs? cancel)
         {
+            Items.Shutdown();
         }
 
         public void CreateToolbarButtons(IPanelHost host)
@@ -62,7 +68,7 @@ namespace PRSDesktop
                     if (grid.EditItems(new ReadyToGoGlobalSettings[] { _globalSettings }))
                     {
                         new GlobalConfiguration<ReadyToGoGlobalSettings>().Save(_globalSettings);
-                        Items.Options.PageSize = _globalSettings.PageSize;
+                        Items.Reconfigure();
                         Refresh();
                     }   
                     

+ 8 - 3
prs.desktop/Panels/Suppliers/SupplierPanel.xaml.cs

@@ -92,7 +92,7 @@ public partial class SupplierPanel : UserControl, IPanel<Supplier>
                 if (grid.EditItems(new SupplierGlobalSettings[] { _globalSettings }))
                 {
                     new GlobalConfiguration<SupplierGlobalSettings>().Save(_globalSettings);
-                    SupplierProducts.Options.PageSize = _globalSettings.ProductsPageSize;
+                    SupplierProducts.Reconfigure();
                     Refresh();
                 }   
                     
@@ -139,13 +139,18 @@ public partial class SupplierPanel : UserControl, IPanel<Supplier>
         Suppliers.ColumnsTag = _settings.View == DynamicSplitPanelView.Master ? _settings.View.ToString() : "";
         Suppliers.Refresh(true, false);
         SupplierContacts.Refresh(true,false);
-        
-        SupplierProducts.Options.PageSize = _globalSettings.ProductsPageSize;
+
+        SupplierProducts.Reconfigure();
         SupplierProducts.Refresh(true,false);
         
         SupplierSpreadsheets.Refresh(true,false);
     }
 
+    private void SupplierProducts_OnReconfigure(DynamicGridOptions options)
+    {
+        options.PageSize = _globalSettings.ProductsPageSize;
+    }
+
     public void Shutdown(CancelEventArgs? cancel)
     {
     }

+ 7 - 2
prs.desktop/Panels/Timesheets/TimesheetPanel.xaml.cs

@@ -46,10 +46,15 @@ namespace PRSDesktop
         public void Setup()
         {
             LoadSettings();
-            TimeSheets.Options.PageSize = _globalSettings.PageSize;
+            TimeSheets.Reconfigure();
             TimeSheets.Refresh(true, false);
         }
 
+        private void TimeSheets_OnReconfigure(DynamicGridOptions options)
+        {
+            options.PageSize = _globalSettings.PageSize;
+        }
+
         public Dictionary<string, object[]> Selected()
         {
             return new Dictionary<string, object[]> { { typeof(TimeSheet).EntityName(), TimeSheets.SelectedRows } };
@@ -76,7 +81,7 @@ namespace PRSDesktop
                     if (grid.EditItems(new TimesheetGlobalSettings[] { _globalSettings }))
                     {
                         new GlobalConfiguration<TimesheetGlobalSettings>().Save(_globalSettings);
-                        TimeSheets.Options.PageSize = _globalSettings.PageSize;
+                        TimeSheets.Reconfigure();
                         Refresh();
                     }