Переглянути джерело

Fixed Issues with Editor Grids opening up off-screen

frankvandenbos 7 місяців тому
батько
коміт
2bdea4ae45

+ 1 - 1
prs.desktop/DockPanels/Problems/ProblemsDockGrid.cs

@@ -291,7 +291,7 @@ public class ProblemsDockGrid : DynamicDataGrid<Problems>
         if (_item == null)
             return;
         var _grid = DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), _type);
-        if (_grid.EditItems([ _item ], null, false, this))
+        if (_grid.EditItems([ _item ], null, false))
             Refresh(false,true);
     }
 }

+ 3 - 3
prs.desktop/Grids/TimesheetGrid.cs

@@ -383,7 +383,7 @@ namespace PRSDesktop
             return leavegrid.EditItems(new[] { leave });
         }
 
-        public override bool EditItems(TimeSheet[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
+        public override bool EditItems(TimeSheet[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false)
         {
             var leaveids = items.Select(x => x.LeaveRequestLink.ID).Distinct().ToArray();
             if (leaveids.Length > 1 && leaveids.Contains(Guid.Empty))
@@ -408,10 +408,10 @@ namespace PRSDesktop
                     leavegrid ??= new LeaveRequestGrid();
                 }
 
-                return leavegrid.EditItems(leaves, parent: parent);
+                return leavegrid.EditItems(leaves);
             }
 
-            return base.EditItems(items, PageDataHandler, PreloadPages, parent);
+            return base.EditItems(items, PageDataHandler, PreloadPages);
         }
 
         protected override Dictionary<string, object?> EditorValueChanged(IDynamicEditorForm editor, TimeSheet[] items, string name, object value)

+ 2 - 2
prs.desktop/Panels/Consignments/ConsignmentItemGrid.cs

@@ -136,7 +136,7 @@ public class ConsignmentItemGrid : DynamicDataGrid<PurchaseOrderItem>
         }
     }
 
-    public override bool EditItems(PurchaseOrderItem[] items, Func<Type, CoreTable?>? PageDataHandler, bool PreloadPages = false, DependencyObject? parent = null)
+    public override bool EditItems(PurchaseOrderItem[] items, Func<Type, CoreTable?>? PageDataHandler, bool PreloadPages = false)
     {
         if (ConsignmentID.Equals(Guid.Empty))
         {
@@ -150,7 +150,7 @@ public class ConsignmentItemGrid : DynamicDataGrid<PurchaseOrderItem>
             return false;
         }
 
-        return base.EditItems(items, PageDataHandler, PreloadPages, parent);
+        return base.EditItems(items, PageDataHandler, PreloadPages);
     }
 
     protected override bool CanDeleteItems(CoreRow[] rows)

+ 2 - 2
prs.desktop/Panels/Equipment/EquipmentGrid.cs

@@ -208,9 +208,9 @@ namespace PRSDesktop
             return id == null ? null : specification;
         }
 
-        public override bool EditItems(Equipment[] items, Func<Type, CoreTable>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
+        public override bool EditItems(Equipment[] items, Func<Type, CoreTable>? PageDataHandler = null, bool PreloadPages = false)
         {
-            var result = base.EditItems(items, PageDataHandler, PreloadPages, parent);
+            var result = base.EditItems(items, PageDataHandler, PreloadPages);
             if (result)
             {
                 var changedcustomers = items.Any(x => x.Customer.ID != CustomerID);

+ 3 - 3
prs.desktop/Panels/Jobs/DocumentSets/JobDocumentSetFolderTree.cs

@@ -76,7 +76,7 @@ public class JobDocumentSetFolderTree : DynamicDataGrid<JobDocumentSetFolder>, I
             {
                 var item = CreateItem();
                 item.Parent.ID = n.ID;
-                if (EditItems(new[] { item }))
+                if (EditItems([item]))
                 {
                     DoChanged();
                     Refresh(false, true);
@@ -148,14 +148,14 @@ public class JobDocumentSetFolderTree : DynamicDataGrid<JobDocumentSetFolder>, I
         return base.LoadItems(rows);
     }
 
-    public override bool EditItems(JobDocumentSetFolder[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
+    public override bool EditItems(JobDocumentSetFolder[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false)
     {
         if (items.Any(x => x.ID == CoreUtils.FullGuid))
         {
             MessageWindow.ShowMessage("This item cannot be edited.", "Cannot edit");
             return false;
         }
-        return base.EditItems(items, PageDataHandler, PreloadPages, parent);
+        return base.EditItems(items, PageDataHandler, PreloadPages);
     }
 
     public override void SaveItem(JobDocumentSetFolder folder)

+ 2 - 2
prs.desktop/Panels/Products/Master List/ProductGroupTree.cs

@@ -105,14 +105,14 @@ public class ProductGroupTree : DynamicDataGrid<ProductGroup>
         return base.LoadItems(rows);
     }
 
-    public override bool EditItems(ProductGroup[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
+    public override bool EditItems(ProductGroup[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false)
     {
         if (items.Any(x => x.ID == CoreUtils.FullGuid))
         {
             MessageWindow.ShowMessage("This item cannot be edited.", "Cannot edit");
             return false;
         }
-        return base.EditItems(items, PageDataHandler, PreloadPages, parent: parent);
+        return base.EditItems(items, PageDataHandler, PreloadPages);
     }
 
     public override void SaveItem(ProductGroup folder)

+ 1 - 1
prs.server/Forms/SMSProviderGrid.cs

@@ -171,7 +171,7 @@ namespace PRSServer.Forms
             }
         }
 
-        public override bool EditItems(SMSProviderProperties[] items, Func<Type, CoreTable> PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
+        public override bool EditItems(SMSProviderProperties[] items, Func<Type, CoreTable> PageDataHandler = null, bool PreloadPages = false)
         {
             var item = items.FirstOrDefault();
             if (item == null)