diff --git a/CutList.Web/Components/Layout/NavMenu.razor b/CutList.Web/Components/Layout/NavMenu.razor index 917c4d5..3329aac 100644 --- a/CutList.Web/Components/Layout/NavMenu.razor +++ b/CutList.Web/Components/Layout/NavMenu.razor @@ -23,6 +23,11 @@ Materials +
+ + Stock Items + +
Suppliers diff --git a/CutList.Web/Components/Pages/Stock/Edit.razor b/CutList.Web/Components/Pages/Stock/Edit.razor new file mode 100644 index 0000000..fe267dc --- /dev/null +++ b/CutList.Web/Components/Pages/Stock/Edit.razor @@ -0,0 +1,371 @@ +@page "/stock/new" +@page "/stock/{Id:int}" +@inject StockItemService StockItemService +@inject MaterialService MaterialService +@inject SupplierService SupplierService +@inject NavigationManager Navigation +@using CutList.Core.Formatting + +@(IsNew ? "Add Stock Item" : "Edit Stock Item") + +

@(IsNew ? "Add Stock Item" : $"{stockItem.Material?.DisplayName} - {ArchUnits.FormatFromInches((double)stockItem.LengthInches)}")

+ +@if (loading) +{ +

Loading...

+} +else +{ +
+
+
+
+
Stock Item Details
+
+
+ + + +
+ + +
+ +
+ + @if (IsNew) + { + + } + else + { + + } +
+ +
+ + +
+ + @if (!string.IsNullOrEmpty(errorMessage)) + { +
@errorMessage
+ } + +
+ + @(IsNew ? "Cancel" : "Back to List") +
+ +
+
+
+ + @if (!IsNew) + { +
+
+
+
Supplier Offerings
+ +
+
+ @if (showOfferingForm) + { +
+
@(editingOffering == null ? "Add Offering" : "Edit Offering")
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ @if (!string.IsNullOrEmpty(offeringErrorMessage)) + { +
@offeringErrorMessage
+ } +
+ + +
+
+ } + + @if (offerings.Count == 0) + { +

No supplier offerings configured yet.

+ } + else + { + + + + + + + + + + + @foreach (var offering in offerings) + { + + + + + + + } + +
SupplierPart #PriceActions
@offering.Supplier.Name@(offering.PartNumber ?? "-")@(offering.Price.HasValue ? offering.Price.Value.ToString("C") : "-") + + +
+ } +
+
+
+ } +
+} + + + +@code { + [Parameter] + public int? Id { get; set; } + + private StockItem stockItem = new(); + private List materials = new(); + private List suppliers = new(); + private List offerings = new(); + private bool loading = true; + private bool saving; + private bool savingOffering; + private string? errorMessage; + private string? offeringErrorMessage; + + private bool showOfferingForm; + private SupplierOffering newOffering = new(); + private SupplierOffering? editingOffering; + + private ConfirmDialog deleteOfferingDialog = null!; + private SupplierOffering? offeringToDelete; + private string deleteOfferingMessage = ""; + + private bool IsNew => !Id.HasValue; + + protected override async Task OnInitializedAsync() + { + materials = await MaterialService.GetAllAsync(); + suppliers = await SupplierService.GetAllAsync(); + + if (Id.HasValue) + { + var existing = await StockItemService.GetByIdAsync(Id.Value); + if (existing == null) + { + Navigation.NavigateTo("stock"); + return; + } + stockItem = existing; + offerings = existing.SupplierOfferings.Where(o => o.IsActive).ToList(); + } + loading = false; + } + + private async Task SaveStockItemAsync() + { + errorMessage = null; + saving = true; + + try + { + if (stockItem.MaterialId == 0) + { + errorMessage = "Please select a material"; + return; + } + + if (stockItem.LengthInches <= 0) + { + errorMessage = "Length must be greater than zero"; + return; + } + + var exists = await StockItemService.ExistsAsync( + stockItem.MaterialId, + stockItem.LengthInches, + IsNew ? null : stockItem.Id); + + if (exists) + { + errorMessage = "A stock item with this material and length already exists"; + return; + } + + if (IsNew) + { + var created = await StockItemService.CreateAsync(stockItem); + Navigation.NavigateTo($"stock/{created.Id}"); + } + else + { + await StockItemService.UpdateAsync(stockItem); + } + } + finally + { + saving = false; + } + } + + private void ShowAddOfferingForm() + { + editingOffering = null; + newOffering = new SupplierOffering { StockItemId = Id!.Value }; + showOfferingForm = true; + offeringErrorMessage = null; + } + + private void EditOffering(SupplierOffering offering) + { + editingOffering = offering; + newOffering = new SupplierOffering + { + Id = offering.Id, + StockItemId = offering.StockItemId, + SupplierId = offering.SupplierId, + PartNumber = offering.PartNumber, + SupplierDescription = offering.SupplierDescription, + Price = offering.Price, + Notes = offering.Notes + }; + showOfferingForm = true; + offeringErrorMessage = null; + } + + private void CancelOfferingForm() + { + showOfferingForm = false; + editingOffering = null; + offeringErrorMessage = null; + } + + private async Task SaveOfferingAsync() + { + offeringErrorMessage = null; + savingOffering = true; + + try + { + if (newOffering.SupplierId == 0) + { + offeringErrorMessage = "Please select a supplier"; + return; + } + + var exists = await SupplierService.OfferingExistsAsync( + newOffering.SupplierId, + newOffering.StockItemId, + editingOffering?.Id); + + if (exists) + { + offeringErrorMessage = "This supplier already has an offering for this stock item"; + return; + } + + if (editingOffering == null) + { + await SupplierService.AddOfferingAsync(newOffering); + } + else + { + await SupplierService.UpdateOfferingAsync(newOffering); + } + + // Refresh the stock item to get updated offerings + var updated = await StockItemService.GetByIdAsync(Id!.Value); + if (updated != null) + { + stockItem = updated; + offerings = updated.SupplierOfferings.Where(o => o.IsActive).ToList(); + } + showOfferingForm = false; + editingOffering = null; + } + finally + { + savingOffering = false; + } + } + + private void ConfirmDeleteOffering(SupplierOffering offering) + { + offeringToDelete = offering; + deleteOfferingMessage = $"Are you sure you want to delete the offering from {offering.Supplier.Name}?"; + deleteOfferingDialog.Show(); + } + + private async Task DeleteOfferingConfirmed() + { + if (offeringToDelete != null) + { + await SupplierService.DeleteOfferingAsync(offeringToDelete.Id); + + // Refresh the stock item to get updated offerings + var updated = await StockItemService.GetByIdAsync(Id!.Value); + if (updated != null) + { + stockItem = updated; + offerings = updated.SupplierOfferings.Where(o => o.IsActive).ToList(); + } + } + } +} diff --git a/CutList.Web/Components/Pages/Stock/Index.razor b/CutList.Web/Components/Pages/Stock/Index.razor new file mode 100644 index 0000000..ae7193e --- /dev/null +++ b/CutList.Web/Components/Pages/Stock/Index.razor @@ -0,0 +1,85 @@ +@page "/stock" +@inject StockItemService StockItemService +@inject NavigationManager Navigation +@using CutList.Core.Formatting + +Stock Items + +
+

Stock Items

+ Add Stock Item +
+ +@if (loading) +{ +

Loading...

+} +else if (stockItems.Count == 0) +{ +
+ No stock items found. Add your first stock item. +
+} +else +{ + + + + + + + + + + + @foreach (var item in stockItems) + { + + + + + + + } + +
MaterialLengthNameActions
@item.Material.DisplayName@ArchUnits.FormatFromInches((double)item.LengthInches)@(item.Name ?? "-") + Edit + +
+} + + + +@code { + private List stockItems = new(); + private bool loading = true; + private ConfirmDialog deleteDialog = null!; + private StockItem? itemToDelete; + private string deleteMessage = ""; + + protected override async Task OnInitializedAsync() + { + stockItems = await StockItemService.GetAllAsync(); + loading = false; + } + + private void ConfirmDelete(StockItem item) + { + itemToDelete = item; + deleteMessage = $"Are you sure you want to delete \"{item.Material.DisplayName} - {ArchUnits.FormatFromInches((double)item.LengthInches)}\"?"; + deleteDialog.Show(); + } + + private async Task DeleteConfirmed() + { + if (itemToDelete != null) + { + await StockItemService.DeleteAsync(itemToDelete.Id); + stockItems = await StockItemService.GetAllAsync(); + } + } +} diff --git a/CutList.Web/Components/Pages/Suppliers/Edit.razor b/CutList.Web/Components/Pages/Suppliers/Edit.razor index 4ece339..93933c8 100644 --- a/CutList.Web/Components/Pages/Suppliers/Edit.razor +++ b/CutList.Web/Components/Pages/Suppliers/Edit.razor @@ -1,9 +1,10 @@ @page "/suppliers/new" @page "/suppliers/{Id:int}" @inject SupplierService SupplierService -@inject MaterialService MaterialService @inject NavigationManager Navigation +@inject CutList.Web.Data.ApplicationDbContext DbContext @using CutList.Core.Formatting +@using Microsoft.EntityFrameworkCore @(IsNew ? "Add Supplier" : "Edit Supplier") @@ -66,80 +67,84 @@ else
-
Stock Lengths
- +
Supplier Offerings
+
- @if (showStockForm) + @if (showOfferingForm) {
-
@(editingStock == null ? "Add Stock Length" : "Edit Stock Length")
+
@(editingOffering == null ? "Add Offering" : "Edit Offering")
-
- - + + @foreach (var stockItem in stockItems) { - + }
- - + +
- - + +
-
+
+ + +
+
- +
- @if (!string.IsNullOrEmpty(stockErrorMessage)) + @if (!string.IsNullOrEmpty(offeringErrorMessage)) { -
@stockErrorMessage
+
@offeringErrorMessage
}
- - +
} - @if (stocks.Count == 0) + @if (offerings.Count == 0) { -

No stock lengths configured yet.

+

No offerings configured yet.

} else { - - + + - @foreach (var stock in stocks) + @foreach (var offering in offerings) { - - - + + + } @@ -153,38 +158,44 @@ else } - + OnConfirm="DeleteOfferingConfirmed" /> @code { [Parameter] public int? Id { get; set; } private Supplier supplier = new(); - private List stocks = new(); - private List materials = new(); + private List offerings = new(); + private List stockItems = new(); private bool loading = true; private bool savingSupplier; - private bool savingStock; + private bool savingOffering; private string? supplierErrorMessage; - private string? stockErrorMessage; + private string? offeringErrorMessage; - private bool showStockForm; - private SupplierStock newStock = new(); - private SupplierStock? editingStock; + private bool showOfferingForm; + private SupplierOffering newOffering = new(); + private SupplierOffering? editingOffering; - private ConfirmDialog deleteStockDialog = null!; - private SupplierStock? stockToDelete; - private string deleteStockMessage = ""; + private ConfirmDialog deleteOfferingDialog = null!; + private SupplierOffering? offeringToDelete; + private string deleteOfferingMessage = ""; private bool IsNew => !Id.HasValue; protected override async Task OnInitializedAsync() { - materials = await MaterialService.GetAllAsync(); + stockItems = await DbContext.StockItems + .Include(si => si.Material) + .Where(si => si.IsActive) + .OrderBy(si => si.Material.Shape) + .ThenBy(si => si.Material.Size) + .ThenBy(si => si.LengthInches) + .ToListAsync(); if (Id.HasValue) { @@ -195,7 +206,7 @@ else return; } supplier = existing; - stocks = await SupplierService.GetStocksForSupplierAsync(Id.Value); + offerings = await SupplierService.GetOfferingsForSupplierAsync(Id.Value); } loading = false; } @@ -229,100 +240,94 @@ else } } - private void ShowAddStockForm() + private void ShowAddOfferingForm() { - editingStock = null; - newStock = new SupplierStock { SupplierId = Id!.Value }; - showStockForm = true; - stockErrorMessage = null; + editingOffering = null; + newOffering = new SupplierOffering { SupplierId = Id!.Value }; + showOfferingForm = true; + offeringErrorMessage = null; } - private void EditStock(SupplierStock stock) + private void EditOffering(SupplierOffering offering) { - editingStock = stock; - newStock = new SupplierStock + editingOffering = offering; + newOffering = new SupplierOffering { - Id = stock.Id, - SupplierId = stock.SupplierId, - MaterialId = stock.MaterialId, - LengthInches = stock.LengthInches, - Price = stock.Price, - Notes = stock.Notes + Id = offering.Id, + SupplierId = offering.SupplierId, + StockItemId = offering.StockItemId, + PartNumber = offering.PartNumber, + SupplierDescription = offering.SupplierDescription, + Price = offering.Price, + Notes = offering.Notes }; - showStockForm = true; - stockErrorMessage = null; + showOfferingForm = true; + offeringErrorMessage = null; } - private void CancelStockForm() + private void CancelOfferingForm() { - showStockForm = false; - editingStock = null; - stockErrorMessage = null; + showOfferingForm = false; + editingOffering = null; + offeringErrorMessage = null; } - private async Task SaveStockAsync() + private async Task SaveOfferingAsync() { - stockErrorMessage = null; - savingStock = true; + offeringErrorMessage = null; + savingOffering = true; try { - if (newStock.MaterialId == 0) + if (newOffering.StockItemId == 0) { - stockErrorMessage = "Please select a material"; + offeringErrorMessage = "Please select a stock item"; return; } - if (newStock.LengthInches <= 0) - { - stockErrorMessage = "Length must be greater than zero"; - return; - } - - var exists = await SupplierService.StockExistsAsync( - newStock.SupplierId, - newStock.MaterialId, - newStock.LengthInches, - editingStock?.Id); + var exists = await SupplierService.OfferingExistsAsync( + newOffering.SupplierId, + newOffering.StockItemId, + editingOffering?.Id); if (exists) { - stockErrorMessage = "This stock length already exists for this material"; + offeringErrorMessage = "This supplier already has an offering for this stock item"; return; } - if (editingStock == null) + if (editingOffering == null) { - await SupplierService.AddStockAsync(newStock); + await SupplierService.AddOfferingAsync(newOffering); } else { - await SupplierService.UpdateStockAsync(newStock); + await SupplierService.UpdateOfferingAsync(newOffering); } - stocks = await SupplierService.GetStocksForSupplierAsync(Id!.Value); - showStockForm = false; - editingStock = null; + offerings = await SupplierService.GetOfferingsForSupplierAsync(Id!.Value); + showOfferingForm = false; + editingOffering = null; } finally { - savingStock = false; + savingOffering = false; } } - private void ConfirmDeleteStock(SupplierStock stock) + private void ConfirmDeleteOffering(SupplierOffering offering) { - stockToDelete = stock; - deleteStockMessage = $"Are you sure you want to delete the {ArchUnits.FormatFromInches((double)stock.LengthInches)} stock length?"; - deleteStockDialog.Show(); + offeringToDelete = offering; + deleteOfferingMessage = $"Are you sure you want to delete the offering for {offering.StockItem.Material.DisplayName} - {ArchUnits.FormatFromInches((double)offering.StockItem.LengthInches)}?"; + deleteOfferingDialog.Show(); } - private async Task DeleteStockConfirmed() + private async Task DeleteOfferingConfirmed() { - if (stockToDelete != null) + if (offeringToDelete != null) { - await SupplierService.DeleteStockAsync(stockToDelete.Id); - stocks = await SupplierService.GetStocksForSupplierAsync(Id!.Value); + await SupplierService.DeleteOfferingAsync(offeringToDelete.Id); + offerings = await SupplierService.GetOfferingsForSupplierAsync(Id!.Value); } } }
MaterialLengthStock ItemPart # Price Actions
@stock.Material.DisplayName@ArchUnits.FormatFromInches((double)stock.LengthInches)@(stock.Price.HasValue ? stock.Price.Value.ToString("C") : "-")@offering.StockItem.Material.DisplayName - @ArchUnits.FormatFromInches((double)offering.StockItem.LengthInches)@(offering.PartNumber ?? "-")@(offering.Price.HasValue ? offering.Price.Value.ToString("C") : "-") - - + +