Jobrequi and JobBOM panel improvements for split panel detail mode

prs.classes/Entities/Job/JobBillOfMaterialsLink.cs

@@ -5,6 +5,8 @@ namespace Comal.Classes
 {
     public class JobBillOfMaterialsLink : EntityLink<JobBillOfMaterials>
     {
+        public JobLink Job { get; set; }
+
         [LookupEditor(typeof(JobBillOfMaterials))]
         public override Guid ID { get; set; }
 

prs.desktop/Panels/Jobs/BillOfMaterials/JobBillOfMaterialsItemsGrid.cs

@@ -8,294 +8,322 @@ using Comal.Classes;
 using InABox.Clients;
 using InABox.Core;
 using InABox.DynamicGrid;
+using InABox.Wpf;
 using InABox.WPF;
 
-namespace PRSDesktop
+namespace PRSDesktop;
+
+public class JobBillOfMaterialsItemGrid : DynamicDataGrid<JobBillOfMaterialsItem>, IMasterDetailControl<JobBillOfMaterials, JobBillOfMaterialsItem>
 {
-    public class JobBillOfMaterialsItemGrid : DynamicDataGrid<JobBillOfMaterialsItem>
-    {
-        Guid empID = Guid.Empty;
-        string empName = "";
+    public Job? Job { get; set; }
 
-        public JobBillOfMaterials BillOfMaterials { get; set; }
-        
-        public JobBillOfMaterialsItemGrid()
+    private JobBillOfMaterials? _master;
+    public JobBillOfMaterials? Master
+    {
+        get => _master;
+        set
         {
-            GetEmpID();
+            _master = value;
+            Reconfigure();
+            CheckVisibility();
         }
-
-        protected override void DoReconfigure(FluentList<DynamicGridOption> options)
+    }
+    
+    public Filter<JobBillOfMaterialsItem> MasterDetailFilter => Master != null
+        ? Master.ID != Guid.Empty
+            ? new Filter<JobBillOfMaterialsItem>(x => x.BillOfMaterials.ID).IsEqualTo(Master.ID)
+            : new Filter<JobBillOfMaterialsItem>().None()
+        : Job is not null && Job.ID != Guid.Empty
+            ? new Filter<JobBillOfMaterialsItem>(x => x.BillOfMaterials.Job.ID).IsEqualTo(Job.ID)
+            : new Filter<JobBillOfMaterialsItem>().None();
+
+    private Button CreateRequiButton;
+
+    protected override void DoReconfigure(FluentList<DynamicGridOption> options)
+    {
+        base.DoReconfigure(options);
+        options.AddRange(
+            DynamicGridOption.RecordCount,
+            DynamicGridOption.SelectColumns,
+            DynamicGridOption.ExportData,
+            DynamicGridOption.FilterRows,
+            DynamicGridOption.MultiSelect,
+            DynamicGridOption.EditRows,
+            DynamicGridOption.DeleteRows
+        );
+        if(Master is not null)
         {
-            base.DoReconfigure(options);
-            options.AddRange(
-                DynamicGridOption.RecordCount,
-                DynamicGridOption.SelectColumns,
-                DynamicGridOption.AddRows,
-                DynamicGridOption.ExportData,
-                DynamicGridOption.FilterRows,
-                DynamicGridOption.MultiSelect,
-                DynamicGridOption.EditRows,
-                DynamicGridOption.DeleteRows
-            );
+            options.Add(DynamicGridOption.AddRows);
         }
-
-        protected override void Init()
+        else
         {
-            base.Init();
+            options.Remove(DynamicGridOption.AddRows);
+        }
+    }
 
-            foreach(var column in new Columns<JobBillOfMaterialsItem>()
-                .AddDimensionsColumns(x => x.Dimensions, Dimensions.ColumnsType.Data)
-                .GetColumns())
-            {
-                HiddenColumns.Add(column);
-            }
+    private void CheckVisibility()
+    {
+        CreateRequiButton.Visibility = Master is not null && Security.CanEdit<JobRequisition>()
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+    }
 
-            HiddenColumns.Add(x => x.Product.ID);
-            HiddenColumns.Add(x => x.Product.Code);
-            HiddenColumns.Add(x => x.Product.Name);
-            HiddenColumns.Add(x => x.Style.ID);
-            HiddenColumns.Add(x => x.Style.Code);
-            HiddenColumns.Add(x => x.Style.Description);
-            HiddenColumns.Add(x => x.BillOfMaterials.ID);
-            HiddenColumns.Add(x => x.BillOfMaterials.Description);
-            HiddenColumns.Add(x => x.Job.ID);
-            HiddenColumns.Add(x => x.PurchaseOrderItem.ID);
-            HiddenColumns.Add(x => x.PurchaseOrderItem.PurchaseOrderLink.PONumber);
-            HiddenColumns.Add(x => x.PurchaseOrderItem.ReceivedDate);
-            HiddenColumns.Add(x => x.Packet.ID);
-
-            AddButton("Create Requi", null, CreateRequi);
-            AddButton("Create PO", null, CreatePO);
-        }
+    protected override void Init()
+    {
+        base.Init();
 
-        private bool CreateRequi(System.Windows.Controls.Button btn, CoreRow[] rows)
+        foreach(var column in new Columns<JobBillOfMaterialsItem>()
+            .AddDimensionsColumns(x => x.Dimensions, Dimensions.ColumnsType.Data)
+            .GetColumns())
         {
-            if (!rows.Any())
-            {
-                MessageBox.Show("Please select at least one row to add to Requi");
-                return false;
-            }
+            HiddenColumns.Add(column);
+        }
 
-            JobRequisition jobRequi = new JobRequisition();
-            jobRequi.Job.ID = BillOfMaterials.Job.ID;
-            jobRequi.Job.Synchronise(BillOfMaterials.Job);
-            jobRequi.Description = "New Requisition";
+        HiddenColumns.Add(x => x.Product.ID);
+        HiddenColumns.Add(x => x.Product.Code);
+        HiddenColumns.Add(x => x.Product.Name);
+        HiddenColumns.Add(x => x.Style.ID);
+        HiddenColumns.Add(x => x.Style.Code);
+        HiddenColumns.Add(x => x.Style.Description);
+        HiddenColumns.Add(x => x.BillOfMaterials.ID);
+        HiddenColumns.Add(x => x.BillOfMaterials.Description);
+        HiddenColumns.Add(x => x.Job.ID);
+        HiddenColumns.Add(x => x.PurchaseOrderItem.ID);
+        HiddenColumns.Add(x => x.PurchaseOrderItem.PurchaseOrderLink.PONumber);
+        HiddenColumns.Add(x => x.PurchaseOrderItem.ReceivedDate);
+        HiddenColumns.Add(x => x.Packet.ID);
+
+        CreateRequiButton = AddButton("Create Requi", null, CreateRequi);
+        AddButton("Create PO", null, CreatePO);
+
+        CheckVisibility();
+    }
 
-            var page = new JobRequisitionGrid();
-            page.OnAfterSave += (form, items) => { MessageBox.Show("Success - Job Requisition Raised."); };
-            return page.EditItems(new[] { jobRequi }, LoadJobRequiItems, true);
-        }
+    private bool CreateRequi(System.Windows.Controls.Button btn, CoreRow[] rows)
+    {
+        if (Master is null) return false;
 
-        private CoreTable LoadJobRequiItems(Type arg)
+        if (!rows.Any())
         {
-            Progress.Show("Working");
-            var result = new CoreTable();
-            result.LoadColumns(typeof(JobRequisitionItem));
-            var requiItems = new List<JobRequisitionItem>();
-            foreach (var BOMitem in SelectedRows.ToObjects<JobBillOfMaterialsItem>())
-            {
-                var requiItem = new JobRequisitionItem();
-
-                requiItem.Qty = BOMitem.Quantity;
-                requiItem.UnitCost = BOMitem.UnitCost;
-                requiItem.Product.ID = BOMitem.Product.ID;
-                requiItem.Product.Code = BOMitem.Product.Code;
-                requiItem.Product.Name = BOMitem.Product.Name;
-                requiItem.Style.ID = BOMitem.Style.ID;
-                requiItem.Style.Code = BOMitem.Style.Code;
-                requiItem.Style.Description = BOMitem.Style.Description;
-                requiItem.Supplier.ID = BOMitem.Supplier.ID;
-                requiItem.Supplier.Code = BOMitem.Supplier.Code;
-                requiItem.Supplier.Name = BOMitem.Supplier.Name;
-                requiItem.Dimensions.CopyFrom(BOMitem.Dimensions);
-                requiItem.Job.ID = BillOfMaterials.Job.ID;
-                requiItem.Job.Synchronise(BillOfMaterials.Job);
-                requiItem.Supplier.ID = BOMitem.Supplier.ID;
-                requiItem.Notes = "Create from BOM " + BOMitem.BillOfMaterials.Description + " on " + DateTime.Now.ToString("hh:mm t dd-MMM-yy") + " by " + empName;
-
-                requiItems.Add(requiItem);
-            }
-            result.LoadRows(requiItems);
-            Progress.Close();
-            return result;
+            MessageBox.Show("Please select at least one row to add to Requi");
+            return false;
         }
 
+        var jobRequi = new JobRequisition();
+        jobRequi.Job.ID = Master.Job.ID;
+        jobRequi.Job.Synchronise(Master.Job);
+        jobRequi.Description = "New Requisition";
 
+        var page = new JobRequisitionGrid();
+        page.OnAfterSave += (form, items) => { MessageBox.Show("Success - Job Requisition Raised."); };
+        return page.EditItems(new[] { jobRequi }, LoadJobRequiItems, true);
+    }
 
-        public event DataModelUpdateEvent? OnUpdateDataModel;
+    private CoreTable? LoadJobRequiItems(Type arg)
+    {
+        if (Master is null || arg != typeof(JobRequisitionItem)) return null;
 
-        protected override void DoAdd(bool OpenEditorOnDirectEdit = false)
-        {
-            if (BillOfMaterials.ID.Equals(Guid.Empty) || BillOfMaterials.ID.Equals(CoreUtils.FullGuid))
-                MessageBox.Show("Please select a Bill Of Materials first!");
-            else
-                base.DoAdd();
-        }
+        var result = new CoreTable();
+        result.LoadColumns(typeof(JobRequisitionItem));
 
-        protected override JobBillOfMaterialsItem CreateItem()
+        var requiItems = new List<JobRequisitionItem>();
+        foreach (var BOMitem in SelectedRows.ToObjects<JobBillOfMaterialsItem>())
         {
-            var result = base.CreateItem();
-            result.BillOfMaterials.ID = BillOfMaterials.ID;
-            result.BillOfMaterials.Synchronise(BillOfMaterials);
-            result.Job.ID = BillOfMaterials.Job.ID;
-            result.Job.Synchronise(BillOfMaterials.Job);
-            result.Quantity = 1;
-            return result;
+            var requiItem = new JobRequisitionItem();
+
+            requiItem.Qty = BOMitem.Quantity;
+            requiItem.UnitCost = BOMitem.UnitCost;
+            requiItem.Product.ID = BOMitem.Product.ID;
+            requiItem.Product.Code = BOMitem.Product.Code;
+            requiItem.Product.Name = BOMitem.Product.Name;
+            requiItem.Style.ID = BOMitem.Style.ID;
+            requiItem.Style.Code = BOMitem.Style.Code;
+            requiItem.Style.Description = BOMitem.Style.Description;
+            requiItem.Supplier.ID = BOMitem.Supplier.ID;
+            requiItem.Supplier.Code = BOMitem.Supplier.Code;
+            requiItem.Supplier.Name = BOMitem.Supplier.Name;
+            requiItem.Dimensions.CopyFrom(BOMitem.Dimensions);
+            requiItem.Job.ID = Master.Job.ID;
+            requiItem.Job.Synchronise(Master.Job);
+            requiItem.Supplier.ID = BOMitem.Supplier.ID;
+            requiItem.Notes = "Create from BOM " + BOMitem.BillOfMaterials.Description + " on " + DateTime.Now.ToString("hh:mm t dd-MMM-yy") + " by " + App.EmployeeName;
+
+            requiItems.Add(requiItem);
         }
+        result.LoadRows(requiItems);
+
+        return result;
+    }
+
 
-        protected override void Reload(Filters<JobBillOfMaterialsItem> criteria, Columns<JobBillOfMaterialsItem> columns,
-            ref SortOrder<JobBillOfMaterialsItem>? sort, Action<CoreTable?, Exception?> action)
-        {
-            criteria.Add(new Filter<JobBillOfMaterialsItem>(x => x.BillOfMaterials.ID).IsEqualTo(BillOfMaterials?.ID ?? Guid.Empty));
-            base.Reload(criteria, columns, ref sort, action);
-        }
 
+    public event DataModelUpdateEvent? OnUpdateDataModel;
 
-        protected override void OnAfterEditorValueChanged(DynamicEditorGrid? grid, JobBillOfMaterialsItem[] items, AfterEditorValueChangedArgs args, Dictionary<string, object?> changes)
+    protected override void DoAdd(bool OpenEditorOnDirectEdit = false)
+    {
+        if (Master is null || Master.ID == Guid.Empty || Master.ID == CoreUtils.FullGuid)
+            MessageWindow.ShowMessage("Please select a bill of materials to cancel.", "Select BOM");
+        else
+            base.DoAdd();
+    }
+
+    protected override JobBillOfMaterialsItem CreateItem()
+    {
+        var result = base.CreateItem();
+        if(Master is not null)
         {
-            base.OnAfterEditorValueChanged(grid, items, args, changes);
-            if (args.ColumnName.Equals("Product.ID") || args.ColumnName.Equals("Dimensions") || args.ColumnName.StartsWith("Dimensions.") || args.ColumnName.Equals("Style.ID") || args.ColumnName.Equals("Supplier.ID"))
-            {
-                JobBillOfMaterialsItem.UpdateCosts(
-                    items, 
-                    changes
-                );
-            }
+            result.BillOfMaterials.ID = Master.ID;
+            result.BillOfMaterials.Synchronise(Master);
+            result.Job.ID = Master.Job.ID;
+            result.Job.Synchronise(Master.Job);
         }
+        result.Quantity = 1;
+        return result;
+    }
+
+    protected override void Reload(Filters<JobBillOfMaterialsItem> criteria, Columns<JobBillOfMaterialsItem> columns,
+        ref SortOrder<JobBillOfMaterialsItem>? sort, Action<CoreTable?, Exception?> action)
+    {
+        criteria.Add(MasterDetailFilter);
+        base.Reload(criteria, columns, ref sort, action);
+    }
 
-        #region Create PO
-        private void GetEmpID()
+
+    protected override void OnAfterEditorValueChanged(DynamicEditorGrid? grid, JobBillOfMaterialsItem[] items, AfterEditorValueChangedArgs args, Dictionary<string, object?> changes)
+    {
+        base.OnAfterEditorValueChanged(grid, items, args, changes);
+        if (args.ColumnName.Equals("Product.ID") || args.ColumnName.Equals("Dimensions") || args.ColumnName.StartsWith("Dimensions.") || args.ColumnName.Equals("Style.ID") || args.ColumnName.Equals("Supplier.ID"))
         {
-            CoreTable table = new Client<Employee>().Query(new Filter<Employee>(x => x.UserLink.UserID).IsEqualTo(ClientFactory.UserID), new Columns<Employee>(x => x.ID, x => x.Name));
-            if (table.Rows.Any())
-            {
-                empID = Guid.Parse(table.Rows.FirstOrDefault().Values[0].ToString());
-                empName = table.Rows.FirstOrDefault().Values[1].ToString();
-            }
+            JobBillOfMaterialsItem.UpdateCosts(
+                items, 
+                changes
+            );
         }
+    }
 
-        private bool CreatePO(System.Windows.Controls.Button btn, CoreRow[] rows)
+    #region Create PO
+
+    private bool CreatePO(System.Windows.Controls.Button btn, CoreRow[] rows)
+    {
+        if (!rows.Any())
         {
-            if (!rows.Any())
-            {
-                MessageBox.Show("Please select at least one row to add to PO");
-                return false;
-            }
-            PurchaseOrder purchaseOrder = new PurchaseOrder();
-            purchaseOrder.Description = "Created from Job BOM Review Screen" + System.Environment.NewLine;
-            purchaseOrder.RaisedBy.ID = empID;
-            var page = new SupplierPurchaseOrders();
-            page.OnAfterSave += (form, items) =>
-            {
-                PurchaseOrderOnSave(form, items.Cast<PurchaseOrder>().ToArray());
-                MessageBox.Show("Success - New Purchase Order Created (" + purchaseOrder.PONumber + ")");
-            };
-            return page.EditItems(new[] { purchaseOrder }, LoadPurchaseOrderItems, true);
+            MessageWindow.ShowMessage("Please select at least one row to add to PO.", "Select items");
+            return false;
         }
-
-        private void PurchaseOrderOnSave(IDynamicEditorForm form, PurchaseOrder[] items)
+        var purchaseOrder = new PurchaseOrder();
+        purchaseOrder.Description = "Created from Job BOM Review Screen" + System.Environment.NewLine;
+        purchaseOrder.RaisedBy.ID = App.EmployeeID;
+        var page = new SupplierPurchaseOrders();
+        page.OnAfterSave += (form, items) =>
         {
-            Progress.Show("Working");
+            PurchaseOrderOnSave(form, items.Cast<PurchaseOrder>().ToArray());
+            MessageBox.Show("Success - New Purchase Order Created (" + purchaseOrder.PONumber + ")");
+        };
+        return page.EditItems(new[] { purchaseOrder }, LoadPurchaseOrderItems, true);
+    }
 
-            Guid POID = items[0].ID;
+    private void PurchaseOrderOnSave(IDynamicEditorForm form, PurchaseOrder[] items)
+    {
+        Progress.Show("Working");
 
-            CoreTable table = new Client<PurchaseOrderItem>().Query(new Filter<PurchaseOrderItem>(x => x.PurchaseOrderLink.ID).IsEqualTo(POID),
-                new Columns<PurchaseOrderItem>(x => x.ID, x => x.Product.ID, x => x.Qty, x => x.Dimensions.UnitSize, x => x.Dimensions.Value, x => x.Style.ID, x => x.DueDate, x => x.Job.ID));
+        Guid POID = items[0].ID;
 
-            if (table.Rows.Any())
-            {
-                var poItems = AddPOItems(table, new List<PurchaseOrderItem>());
+        CoreTable table = new Client<PurchaseOrderItem>().Query(new Filter<PurchaseOrderItem>(x => x.PurchaseOrderLink.ID).IsEqualTo(POID),
+            new Columns<PurchaseOrderItem>(x => x.ID, x => x.Product.ID, x => x.Qty, x => x.Dimensions.UnitSize, x => x.Dimensions.Value, x => x.Style.ID, x => x.DueDate, x => x.Job.ID));
+
+        if (table.Rows.Any())
+        {
+            var poItems = AddPOItems(table, new List<PurchaseOrderItem>());
 
-                var BOMItems = MatchBOMItems(poItems, new List<JobBillOfMaterialsItem>());
+            var BOMItems = MatchBOMItems(poItems, new List<JobBillOfMaterialsItem>());
 
-                if (BOMItems.Count > 0)
-                    SaveAndRefreshScreen(BOMItems);
-            }
-            Progress.Close();
+            if (BOMItems.Count > 0)
+                SaveAndRefreshScreen(BOMItems);
         }
+        Progress.Close();
+    }
 
-        private void SaveAndRefreshScreen(List<JobBillOfMaterialsItem> bomItems)
+    private void SaveAndRefreshScreen(List<JobBillOfMaterialsItem> bomItems)
+    {
+        new Client<JobBillOfMaterialsItem>().Save(bomItems, "Updated on Create Purchase Order from BOM Dashboard");
+        Dispatcher.BeginInvoke(() =>
         {
-            new Client<JobBillOfMaterialsItem>().Save(bomItems, "Updated on Create Purchase Order from BOM Dashboard");
-            Dispatcher.BeginInvoke(() =>
-            {
-                Refresh(false, true);
-            });
-        }
+            Refresh(false, true);
+        });
+    }
 
-        private List<PurchaseOrderItem> AddPOItems(CoreTable table, List<PurchaseOrderItem> poItems)
+    private List<PurchaseOrderItem> AddPOItems(CoreTable table, List<PurchaseOrderItem> poItems)
+    {
+        foreach (CoreRow row in table.Rows)
         {
-            foreach (CoreRow row in table.Rows)
-            {
-                PurchaseOrderItem poItem = row.ToObject<PurchaseOrderItem>();
-                poItems.Add(poItem);
-            }
-            return poItems;
+            PurchaseOrderItem poItem = row.ToObject<PurchaseOrderItem>();
+            poItems.Add(poItem);
         }
+        return poItems;
+    }
 
-        private List<JobBillOfMaterialsItem> MatchBOMItems(List<PurchaseOrderItem> poItems, List<JobBillOfMaterialsItem> bomItems)
+    private List<JobBillOfMaterialsItem> MatchBOMItems(List<PurchaseOrderItem> poItems, List<JobBillOfMaterialsItem> bomItems)
+    {
+        foreach (CoreRow row in SelectedRows)
         {
-            foreach (CoreRow row in SelectedRows)
+            JobBillOfMaterialsItem bomItem = row.ToObject<JobBillOfMaterialsItem>();
+            foreach (var item in poItems)
             {
-                JobBillOfMaterialsItem bomItem = row.ToObject<JobBillOfMaterialsItem>();
-                foreach (var item in poItems)
-                {
-                    if (MatchBOMItemToPOItem(bomItem, item))
-                        bomItems.Add(UpdateBOMItemWithPODetails(bomItem, item));
-                }
+                if (MatchBOMItemToPOItem(bomItem, item))
+                    bomItems.Add(UpdateBOMItemWithPODetails(bomItem, item));
             }
-            return bomItems;
         }
+        return bomItems;
+    }
 
-        private JobBillOfMaterialsItem UpdateBOMItemWithPODetails(JobBillOfMaterialsItem bomItem, PurchaseOrderItem item)
-        {
-            bomItem.PurchaseOrderItem.ID = item.ID;
-            bomItem.PurchaseOrderItem.DueDate = item.DueDate;
-            return bomItem;
-        }
+    private JobBillOfMaterialsItem UpdateBOMItemWithPODetails(JobBillOfMaterialsItem bomItem, PurchaseOrderItem item)
+    {
+        bomItem.PurchaseOrderItem.ID = item.ID;
+        bomItem.PurchaseOrderItem.DueDate = item.DueDate;
+        return bomItem;
+    }
 
-        private bool MatchBOMItemToPOItem(JobBillOfMaterialsItem bomItem, PurchaseOrderItem item)
-        {
-            if (bomItem.Product.ID == item.Product.ID &&
-                                bomItem.Dimensions.UnitSize == item.Dimensions.UnitSize &&
-                                bomItem.Dimensions.Value == item.Dimensions.Value &&
-                                bomItem.Style.ID == item.Style.ID &&
-                                bomItem.Quantity == item.Qty &&
-                                bomItem.Job.ID == item.Job.ID)
-                return true;
-            else
-                return false;
-        }
+    private bool MatchBOMItemToPOItem(JobBillOfMaterialsItem bomItem, PurchaseOrderItem item)
+    {
+        if (bomItem.Product.ID == item.Product.ID &&
+                            bomItem.Dimensions.UnitSize == item.Dimensions.UnitSize &&
+                            bomItem.Dimensions.Value == item.Dimensions.Value &&
+                            bomItem.Style.ID == item.Style.ID &&
+                            bomItem.Quantity == item.Qty &&
+                            bomItem.Job.ID == item.Job.ID)
+            return true;
+        else
+            return false;
+    }
 
-        private CoreTable LoadPurchaseOrderItems(Type arg)
+    private CoreTable LoadPurchaseOrderItems(Type arg)
+    {
+        Progress.Show("Working");
+        var result = new CoreTable();
+        result.LoadColumns(typeof(PurchaseOrderItem));
+        List<PurchaseOrderItem> items = new List<PurchaseOrderItem>();
+        foreach (CoreRow row in SelectedRows)
         {
-            Progress.Show("Working");
-            var result = new CoreTable();
-            result.LoadColumns(typeof(PurchaseOrderItem));
-            List<PurchaseOrderItem> items = new List<PurchaseOrderItem>();
-            foreach (CoreRow row in SelectedRows)
-            {
-                JobBillOfMaterialsItem BOMItem = row.ToObject<JobBillOfMaterialsItem>();
-                PurchaseOrderItem POItem = new PurchaseOrderItem();
-                POItem.Product.ID = BOMItem.Product.ID;
-                POItem.Product.Code = BOMItem.Product.Code;
-                POItem.Product.Name = BOMItem.Product.Name;               
-                POItem.Qty = BOMItem.Quantity;
-                POItem.Dimensions.CopyFrom(BOMItem.Dimensions);
-                POItem.Dimensions.Value = BOMItem.Dimensions.Value;
-                POItem.Style.ID = BOMItem.Style.ID;
-                POItem.Style.Code = BOMItem.Style.Code;
-                POItem.Style.Description = BOMItem.Style.Description;
-                POItem.Job.ID = BOMItem.Job.ID;
-                POItem.Dimensions.UnitSize = BOMItem.Dimensions.UnitSize;
-                POItem.Description = BOMItem.Product.Name + " (" + BOMItem.Dimensions.ToString() + ")";
-                items.Add(POItem);
-            }
-            result.LoadRows(items);
-            Progress.Close();
-            return result;
+            JobBillOfMaterialsItem BOMItem = row.ToObject<JobBillOfMaterialsItem>();
+            PurchaseOrderItem POItem = new PurchaseOrderItem();
+            POItem.Product.ID = BOMItem.Product.ID;
+            POItem.Product.Code = BOMItem.Product.Code;
+            POItem.Product.Name = BOMItem.Product.Name;               
+            POItem.Qty = BOMItem.Quantity;
+            POItem.Dimensions.CopyFrom(BOMItem.Dimensions);
+            POItem.Dimensions.Value = BOMItem.Dimensions.Value;
+            POItem.Style.ID = BOMItem.Style.ID;
+            POItem.Style.Code = BOMItem.Style.Code;
+            POItem.Style.Description = BOMItem.Style.Description;
+            POItem.Job.ID = BOMItem.Job.ID;
+            POItem.Dimensions.UnitSize = BOMItem.Dimensions.UnitSize;
+            POItem.Description = BOMItem.Product.Name + " (" + BOMItem.Dimensions.ToString() + ")";
+            items.Add(POItem);
         }
-
-        #endregion
+        result.LoadRows(items);
+        Progress.Close();
+        return result;
     }
+
+    #endregion
 }

prs.desktop/Panels/Jobs/BillOfMaterials/JobBillOfMaterialsPanel.xaml

@@ -7,7 +7,8 @@
              xmlns:dynamicgrid="clr-namespace:InABox.DynamicGrid;assembly=InABox.Wpf"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
-    <dynamicgrid:DynamicSplitPanel View="Combined" AnchorWidth="500" AllowableViews="Combined">
+    <dynamicgrid:DynamicSplitPanel x:Name="SplitPanel" View="Combined" AnchorWidth="500" AllowableViews="Combined,Detail"
+                                   OnChanged="SplitPanel_OnChanged">
 
         <dynamicgrid:DynamicSplitPanel.Header>
             <Border BorderBrush="Gray" BorderThickness="0.75" Background="WhiteSmoke" Height="25">

prs.desktop/Panels/Jobs/BillOfMaterials/JobBillOfMaterialsPanel.xaml.cs

@@ -5,23 +5,46 @@ using System.Linq;
 using System.Windows.Controls;
 using Comal.Classes;
 using InABox.Clients;
+using InABox.Configuration;
 using InABox.Core;
 using InABox.DynamicGrid;
 using InABox.Wpf;
 
 namespace PRSDesktop;
 
+public class JobBillOfMaterialsPanelSettings : IUserConfigurationSettings, ISplitPanelSettings
+{
+    public DynamicSplitPanelView ViewType { get; set; } = DynamicSplitPanelView.Combined;
+
+    public double AnchorWidth { get; set; } = 500;
+}
+
 /// <summary>
 ///     Interaction logic for JobBillOfMaterialsPanel.xaml
 /// </summary>
 public partial class JobBillOfMaterialsPanel : UserControl, IBasePanel, IMasterDetailControl<Job>, IDataModelSource
 {
+    private JobBillOfMaterialsPanelSettings Settings;
     
     public JobBillOfMaterialsPanel()
     {
         InitializeComponent();
     }
 
+    private void LoadSettings()
+    {
+        Settings = new UserConfiguration<JobBillOfMaterialsPanelSettings>().Load();
+        SplitPanel.AnchorWidth = Settings.AnchorWidth;
+        SplitPanel.View = Settings.ViewType;
+    }
+    
+    protected void SaveSettings()
+    {
+        Settings.AnchorWidth = SplitPanel.AnchorWidth;
+        Settings.ViewType = SplitPanel.View;
+        Settings.SaveUser();
+    }
+
     public CoreRow[] SelectedRows => BillsOfMaterials.SelectedRows;
 
     public event DataModelUpdateEvent? OnUpdateDataModel;
@@ -54,6 +77,8 @@ public partial class JobBillOfMaterialsPanel : UserControl, IBasePanel, IMasterD
 
     public void Setup()
     {
+        LoadSettings();
+
         BillsOfMaterials.Refresh(true, false);
         BillOfMaterialsItems.Refresh(true, false);
     }
@@ -64,7 +89,16 @@ public partial class JobBillOfMaterialsPanel : UserControl, IBasePanel, IMasterD
 
     public void Refresh()
     {
-        BillsOfMaterials.Refresh(false, true);
+        if(Settings.ViewType == DynamicSplitPanelView.Detail)
+        {
+            BillOfMaterialsItems.Master = null;
+            BillOfMaterialsItems.Job = Master;
+            BillOfMaterialsItems.Refresh(false, true);
+        }
+        else
+        {
+            BillsOfMaterials.Refresh(false, true);
+        }
     }
 
     public Dictionary<string, object[]> Selected()
@@ -98,7 +132,17 @@ public partial class JobBillOfMaterialsPanel : UserControl, IBasePanel, IMasterD
     
     private void BillsOfMaterials_OnSelectItem(object sender, DynamicGridSelectionEventArgs e)
     {
-        BillOfMaterialsItems.BillOfMaterials = e.Rows?.FirstOrDefault()?.ToObject<JobBillOfMaterials>();
+        BillOfMaterialsItems.Master = e.Rows?.FirstOrDefault()?.ToObject<JobBillOfMaterials>();
         BillOfMaterialsItems.Refresh(false, true);
     }
+
+    private void SplitPanel_OnChanged(object sender, DynamicSplitPanelSettings e)
+    {
+        var changedView = e.View != Settings.ViewType;
+        SaveSettings();
+        if (changedView)
+        {
+            Refresh();
+        }
+    }
 }

prs.desktop/Panels/Jobs/Requisitions/JobRequisitionItemGrid.cs

@@ -13,20 +13,41 @@ using InABox.WPF;
 
 namespace PRSDesktop;
 
-internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMasterDetailControl<JobRequisition,JobRequisitionItem>, ISpecificGrid
+internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMasterDetailControl<JobRequisition, JobRequisitionItem>, ISpecificGrid
 {
-    public JobRequisition? Master { get; set; }
-    
+    public Job? Job { get; set; }
+
+    private JobRequisition? _master;
+    public JobRequisition? Master
+    {
+        get => _master;
+        set
+        {
+            _master = value;
+            CheckVisibility();
+            Reconfigure();
+        }
+    }
+
     public Filter<JobRequisitionItem> MasterDetailFilter => Master != null
-        ? new Filter<JobRequisitionItem>(x => x.Requisition.ID).IsEqualTo(Master.ID)
-        : new Filter<JobRequisitionItem>().None();
-    
+        ? Master.ID != Guid.Empty
+            ? new Filter<JobRequisitionItem>(x => x.Requisition.ID).IsEqualTo(Master.ID)
+            : new Filter<JobRequisitionItem>().None()
+        : Job is not null && Job.ID != Guid.Empty
+            ? new Filter<JobRequisitionItem>(x => x.Requisition.Job.ID).IsEqualTo(Job.ID)
+            : new Filter<JobRequisitionItem>().None();
+
     private Button CancelItemsButton;
 
     public JobRequisitionItemGrid()
     {
         CancelItemsButton = AddButton("Cancel Items", PRSDesktop.Resources.disabled.AsBitmapImage(), CancelItems);
-        CancelItemsButton.Visibility = Security.CanEdit<JobRequisition>() && Security.CanEdit<JobRequisitionItem>()
+        CheckVisibility();
+    }
+
+    private void CheckVisibility()
+    {
+        CancelItemsButton.Visibility = Master is not null && Security.CanEdit<JobRequisition>() && Security.CanEdit<JobRequisitionItem>()
             ? System.Windows.Visibility.Visible
             : System.Windows.Visibility.Hidden;
     }
@@ -40,6 +61,8 @@ internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMa
 
     private bool CancelItems(Button button, CoreRow[] rows)
     {
+        if (Master is null) return false;
+
         if(rows.Length == 0)
         {
             MessageWindow.ShowMessage("Please select at least one item to cancel.", "Select items");
@@ -79,8 +102,8 @@ internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMa
             Description = $"Adjustment Requisition for Requisition {oldRequi.Number}",
             DueDate = oldRequi.DueDate
         };
-        requisition.Job.ID = Master?.Job.ID ?? Guid.Empty;
-        requisition.Job.Synchronise(Master?.Job ?? new JobLink());
+        requisition.Job.ID = Master.Job.ID;
+        requisition.Job.Synchronise(Master.Job);
 
         var requiItems = new List<JobRequisitionItem>();
         foreach(var oldItem in oldRequiItems.ToObjects<JobRequisitionItem>())
@@ -135,6 +158,14 @@ internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMa
             DynamicGridOption.FilterRows,
             DynamicGridOption.MultiSelect
             );
+        if(Master is not null)
+        {
+            options.Add(DynamicGridOption.AddRows);
+        }
+        else
+        {
+            options.Remove(DynamicGridOption.AddRows);
+        }
     }
     
 
@@ -154,10 +185,13 @@ internal class JobRequisitionItemGrid : DynamicDataGrid<JobRequisitionItem>, IMa
     protected override JobRequisitionItem CreateItem()
     {
         var result = base.CreateItem();
-        result.Requisition.ID = Master?.ID ?? Guid.Empty;
-        result.Requisition.Synchronise(Master ?? new JobRequisition());
-        result.Job.ID = Master?.Job.ID ?? Guid.Empty;
-        result.Job.Synchronise(Master?.Job ?? new JobLink());
+        if(Master is not null)
+        {
+            result.Requisition.ID = Master.ID;
+            result.Requisition.Synchronise(Master);
+            result.Job.ID = Master.Job.ID;
+            result.Job.Synchronise(Master.Job);
+        }
         result.Qty = 1;
         return result;
     }

prs.desktop/Panels/Jobs/Requisitions/JobRequisitionPanel.xaml

@@ -9,7 +9,15 @@
     mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800">
 
-    <dynamicgrid:DynamicSplitPanel AnchorWidth="500" View="Combined" AllowableViews="Combined">
+    <dynamicgrid:DynamicSplitPanel x:Name="SplitPanel"  AnchorWidth="500" View="Combined" AllowableViews="Combined,Detail"
+                                   OnChanged="SplitPanel_OnChanged">
+        
+        <dynamicgrid:DynamicSplitPanel.Header>
+            <Border BorderBrush="Gray" BorderThickness="0.75" Background="WhiteSmoke" Height="25">
+                <Label Content="Requisitions" HorizontalContentAlignment="Center"
+                       VerticalContentAlignment="Center" />
+            </Border>
+        </dynamicgrid:DynamicSplitPanel.Header>
 
         <dynamicgrid:DynamicSplitPanel.Master>
             <local:JobRequisitionGrid x:Name="Requisitions" OnSelectItem="Requisitions_OnSelectItem" />

prs.desktop/Panels/Jobs/Requisitions/JobRequisitionPanel.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows.Controls;
 using com.healthmarketscience.jackcess.impl;
 using Comal.Classes;
 using InABox.Clients;
+using InABox.Configuration;
 using InABox.Core;
 using InABox.DynamicGrid;
 using InABox.Wpf;
@@ -16,16 +17,40 @@ using Syncfusion.Pdf.Parsing;
 
 namespace PRSDesktop;
 
+public class JobRequisitionPanelSettings : IUserConfigurationSettings, ISplitPanelSettings
+{
+    public DynamicSplitPanelView ViewType { get; set; } = DynamicSplitPanelView.Combined;
+
+    public double AnchorWidth { get; set; } = 500;
+}
+
 /// <summary>
 ///     Interaction logic for JobMaterialPanel.xaml
 /// </summary>
 public partial class JobRequisitionPanel : UserControl, IPanel<JobMaterial>, IMasterDetailControl<Job>
 {
+    private JobRequisitionPanelSettings Settings;
+
     public JobRequisitionPanel()
     {
         InitializeComponent();
     }
 
+    private void LoadSettings()
+    {
+        Settings = new UserConfiguration<JobRequisitionPanelSettings>().Load();
+        SplitPanel.AnchorWidth = Settings.AnchorWidth;
+        SplitPanel.View = Settings.ViewType;
+    }
+    
+    protected void SaveSettings()
+    {
+        Settings.AnchorWidth = SplitPanel.AnchorWidth;
+        Settings.ViewType = SplitPanel.View;
+        Settings.SaveUser();
+    }
+
+
     public Job? Master
     {
         get => Requisitions.Master;
@@ -43,6 +68,8 @@ public partial class JobRequisitionPanel : UserControl, IPanel<JobMaterial>, IMa
 
     public void Setup()
     {
+        LoadSettings();
+
         Requisitions.Refresh(true, false);
         Items.Refresh(true, false);            
     }
@@ -53,7 +80,16 @@ public partial class JobRequisitionPanel : UserControl, IPanel<JobMaterial>, IMa
 
     public void Refresh()
     {
-        Requisitions.Refresh(false, true);
+        if(Settings.ViewType == DynamicSplitPanelView.Detail)
+        {
+            Items.Master = null;
+            Items.Job = Master;
+            Items.Refresh(false, true);
+        }
+        else
+        {
+            Requisitions.Refresh(false, true);
+        }
     }
 
     public string SectionName => "Job Requisitions";
@@ -81,4 +117,14 @@ public partial class JobRequisitionPanel : UserControl, IPanel<JobMaterial>, IMa
         Items.Master = e.Rows?.FirstOrDefault()?.ToObject<JobRequisition>();
         Items.Refresh(false, true);
     }
+
+    private void SplitPanel_OnChanged(object sender, DynamicSplitPanelSettings e)
+    {
+        var changedView = e.View != Settings.ViewType;
+        SaveSettings();
+        if (changedView)
+        {
+            Refresh();
+        }
+    }
 }