Browse Source

Fixing build errors

Kenric Nugteren 8 months ago
parent
commit
37f8d2e3e7

+ 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)
+        public override bool EditItems(TimeSheet[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
         {
             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);
+                return leavegrid.EditItems(leaves, parent: parent);
             }
 
-            return base.EditItems(items, PageDataHandler, PreloadPages);
+            return base.EditItems(items, PageDataHandler, PreloadPages, parent);
         }
 
         protected override Dictionary<string, object?> EditorValueChanged(IDynamicEditorForm editor, TimeSheet[] items, string name, object value)

+ 5 - 4
prs.desktop/Panels/Consignments/ConsignmentItemGrid.cs

@@ -7,6 +7,7 @@ using Comal.Classes;
 using InABox.Clients;
 using InABox.Core;
 using InABox.DynamicGrid;
+using InABox.Wpf;
 using InABox.WPF;
 
 namespace PRSDesktop;
@@ -135,21 +136,21 @@ public class ConsignmentItemGrid : DynamicDataGrid<PurchaseOrderItem>
         }
     }
 
-    public override bool EditItems(PurchaseOrderItem[] items, Func<Type, CoreTable?>? PageDataHandler, bool PreloadPages = false)
+    public override bool EditItems(PurchaseOrderItem[] items, Func<Type, CoreTable?>? PageDataHandler, bool PreloadPages = false, DependencyObject? parent = null)
     {
         if (ConsignmentID.Equals(Guid.Empty))
         {
-            MessageBox.Show("Please select a Requisition first!");
+            MessageWindow.ShowMessage("Please select a Requisition first!", "Invalid Action");
             return false;
         }
 
         if (Completed)
         {
-            MessageBox.Show("Cannot Modify a Completed Requisition");
+            MessageWindow.ShowMessage("Cannot Modify a Completed Requisition", "Invalid Action");
             return false;
         }
 
-        return base.EditItems(items, PageDataHandler, PreloadPages);
+        return base.EditItems(items, PageDataHandler, PreloadPages, parent);
     }
 
     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)
+        public override bool EditItems(Equipment[] items, Func<Type, CoreTable>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
         {
-            var result = base.EditItems(items, PageDataHandler, PreloadPages);
+            var result = base.EditItems(items, PageDataHandler, PreloadPages, parent);
             if (result)
             {
                 var changedcustomers = items.Any(x => x.Customer.ID != CustomerID);

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

@@ -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)
+    public override bool EditItems(JobDocumentSetFolder[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
     {
         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);
+        return base.EditItems(items, PageDataHandler, PreloadPages, parent);
     }
 
     public override void SaveItem(JobDocumentSetFolder folder)

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

@@ -10,6 +10,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace PRSDesktop;
 
@@ -104,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)
+    public override bool EditItems(ProductGroup[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
     {
         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);
+        return base.EditItems(items, PageDataHandler, PreloadPages, parent: parent);
     }
 
     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)
+        public override bool EditItems(SMSProviderProperties[] items, Func<Type, CoreTable> PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
         {
             var item = items.FirstOrDefault();
             if (item == null)