diff --git a/CutList.Web/Components/Pages/Jobs/Edit.razor b/CutList.Web/Components/Pages/Jobs/Edit.razor index 625e0cb..6011c31 100644 --- a/CutList.Web/Components/Pages/Jobs/Edit.razor +++ b/CutList.Web/Components/Pages/Jobs/Edit.razor @@ -229,92 +229,226 @@ else } -@* Import Stock Modal *@ -@if (showImportModal) +@* Add/Edit Stock Modal *@ +@if (showStockModal) {
-
Import Stock from Inventory
- +
@(editingStock == null ? "Add Stock" : "Edit Stock")
+
- @if (loadingImport) + @if (editingStock == null) { -
- -

Finding matching stock...

-
+
    + + +
} - else if (importCandidates.Count == 0) + + @if (stockModalTab == StockModalTab.Inventory && editingStock == null) { -
-

No matching inventory stock found.

-

Either no stock items exist for the materials in your parts, or they have already been added to this job.

+ @if (loadingImport) + { +
+ +

Finding matching stock...

+
+ } + else if (importCandidates.Count == 0) + { +
+

No matching inventory stock found.

+

Either no stock items exist for the materials in your parts, or they have already been added to this job.

+
+ } + else + { +
+
+ + +
+ @importCandidates.Count(c => c.Selected) of @importCandidates.Count selected +
+ + @foreach (var group in importCandidates + .GroupBy(c => c.StockItem.MaterialId) + .OrderBy(g => g.First().StockItem.Material.Shape) + .ThenBy(g => g.First().StockItem.Material.Size)) + { + var material = group.First().StockItem.Material; +
@material.DisplayName
+ + + + + + + + + + + @foreach (var candidate in group.OrderByDescending(c => c.StockItem.LengthInches)) + { + + + + + + + } + +
LengthQty to UsePriority
+ + @ArchUnits.FormatFromInches((double)candidate.StockItem.LengthInches) + + -1 = unlimited + + +
+ } + } + @if (!string.IsNullOrEmpty(importErrorMessage)) + { +
@importErrorMessage
+ } + } + else if (stockModalTab == StockModalTab.Inventory && editingStock != null) + { +
+
+ + +
+
+ + +
+
+ + +
+
+ + + -1 = unlimited +
+
+
+ + + Lower = used first +
+
+ @if (!string.IsNullOrEmpty(stockErrorMessage)) + { +
@stockErrorMessage
+ } } else { -
-
- - -
- @importCandidates.Count(c => c.Selected) of @importCandidates.Count selected -
- - @foreach (var group in importCandidates - .GroupBy(c => c.StockItem.MaterialId) - .OrderBy(g => g.First().StockItem.Material.Shape) - .ThenBy(g => g.First().StockItem.Material.Size)) - { - var material = group.First().StockItem.Material; -
@material.DisplayName
- - - - - - - - - - - @foreach (var candidate in group.OrderByDescending(c => c.StockItem.LengthInches)) +
+
+ +
- - - - - + } - -
LengthQty to UsePriority
- - @ArchUnits.FormatFromInches((double)candidate.StockItem.LengthInches) - - -1 = unlimited - - -
+ +
+
+ + +
+
+ + +
+
+ + + Use -1 for unlimited +
+
+
+
+ + + Lower = used first +
+
+ @if (!string.IsNullOrEmpty(stockErrorMessage)) + { +
@stockErrorMessage
} } - @if (!string.IsNullOrEmpty(importErrorMessage)) - { -
@importErrorMessage
- }
- - @if (importCandidates.Count > 0) + + @if (stockModalTab == StockModalTab.Inventory && editingStock == null) { - + } + } + else if (stockModalTab == StockModalTab.Inventory && editingStock != null) + { + + } + else + { + }
@@ -350,18 +484,16 @@ else private int partSelectedMaterialId; private List partRows = new(); - // Stock form - private bool showStockForm; - private bool showCustomStockForm; + // Stock modal (unified add/edit, both inventory-sourced and custom-length) + private enum StockModalTab { Inventory, Custom } + private bool showStockModal; + private StockModalTab stockModalTab = StockModalTab.Inventory; private JobStock newStock = new(); private JobStock? editingStock; private string? stockErrorMessage; private MaterialShape? stockSelectedShape; private int stockSelectedMaterialId; private List availableStockItems = new(); - - // Import modal - private bool showImportModal; private bool loadingImport; private List importCandidates = new(); private string? importErrorMessage; @@ -741,25 +873,10 @@ else
Stock for This Job
@if (!job.IsLocked) { -
- - -
+ }
- @if (showStockForm) - { - @RenderStockFromInventoryForm() - } - else if (showCustomStockForm) - { - @RenderCustomStockForm() - } - @if (job.Stock.Count == 0) {
@@ -776,122 +893,6 @@ else
}; - private RenderFragment RenderStockFromInventoryForm() => __builder => - { -
-
@(editingStock == null ? "Add Stock from Inventory" : "Edit Stock Selection")
-
-
- - -
-
- - -
-
- - -
-
- - - -1 = unlimited -
-
-
-
- - - Lower = used first -
-
- @if (!string.IsNullOrEmpty(stockErrorMessage)) - { -
@stockErrorMessage
- } -
- - -
-
- }; - - private RenderFragment RenderCustomStockForm() => __builder => - { -
-
@(editingStock == null ? "Add Custom Stock Length" : "Edit Custom Stock")
-
-
- - -
-
- - -
-
- - -
-
- - - Use -1 for unlimited -
-
-
-
- - - Lower = used first -
-
- @if (!string.IsNullOrEmpty(stockErrorMessage)) - { -
@stockErrorMessage
- } -
- - -
-
- }; private RenderFragment RenderStockTable() => __builder => { @@ -1227,21 +1228,32 @@ else await JS.InvokeVoidAsync("printWithTitle", filename); } - private void ShowAddCustomStock() + private async Task ShowAddStockModal() { editingStock = null; - newStock = new JobStock { JobId = Id!.Value, Quantity = -1, Priority = 10, IsCustomLength = true }; + newStock = new JobStock { JobId = Id!.Value, Quantity = -1, Priority = 10 }; stockSelectedShape = null; - showStockForm = false; - showCustomStockForm = true; + stockSelectedMaterialId = 0; + availableStockItems.Clear(); stockErrorMessage = null; + importErrorMessage = null; + importCandidates.Clear(); + stockModalTab = job.Parts.Count > 0 ? StockModalTab.Inventory : StockModalTab.Custom; + showStockModal = true; + + if (job.Parts.Count > 0) + { + await LoadImportCandidatesAsync(); + } } - private void CancelStockForm() + private void CloseStockModal() { - showStockForm = false; - showCustomStockForm = false; + showStockModal = false; editingStock = null; + importCandidates.Clear(); + stockErrorMessage = null; + importErrorMessage = null; } private async Task OnStockShapeChanged() @@ -1284,16 +1296,11 @@ else stockSelectedShape = stock.Material?.Shape; stockSelectedMaterialId = stock.MaterialId; stockErrorMessage = null; + stockModalTab = stock.IsCustomLength ? StockModalTab.Custom : StockModalTab.Inventory; + showStockModal = true; - if (stock.IsCustomLength) + if (!stock.IsCustomLength) { - showStockForm = false; - showCustomStockForm = true; - } - else - { - showStockForm = true; - showCustomStockForm = false; _ = OnStockMaterialChanged(); } } @@ -1347,7 +1354,7 @@ else } job = (await JobService.GetByIdAsync(Id!.Value))!; - showStockForm = false; + showStockModal = false; editingStock = null; packResult = null; summary = null; @@ -1394,7 +1401,7 @@ else } job = (await JobService.GetByIdAsync(Id!.Value))!; - showCustomStockForm = false; + showStockModal = false; editingStock = null; packResult = null; summary = null; @@ -1408,13 +1415,12 @@ else summary = null; } - // Import modal methods - private async Task ShowImportModal() + // Loads inventory stock candidates for the modal's "From Inventory" tab + private async Task LoadImportCandidatesAsync() { importErrorMessage = null; importCandidates.Clear(); loadingImport = true; - showImportModal = true; try { @@ -1449,13 +1455,6 @@ else } } - private void CloseImportModal() - { - showImportModal = false; - importCandidates.Clear(); - importErrorMessage = null; - } - private void ToggleAllImportCandidates(bool selected) { foreach (var c in importCandidates) @@ -1490,7 +1489,7 @@ else } job = (await JobService.GetByIdAsync(Id!.Value))!; - showImportModal = false; + showStockModal = false; importCandidates.Clear(); packResult = null; summary = null;