diff --git a/CutList.Web/Components/Layout/NavMenu.razor b/CutList.Web/Components/Layout/NavMenu.razor index 87759a3..2c38276 100644 --- a/CutList.Web/Components/Layout/NavMenu.razor +++ b/CutList.Web/Components/Layout/NavMenu.razor @@ -28,16 +28,6 @@ Stock Items -
- - Orders - -
-
- - Suppliers - -
Cutting Tools diff --git a/CutList.Web/Components/Pages/Home.razor b/CutList.Web/Components/Pages/Home.razor index b2d75c5..3182423 100644 --- a/CutList.Web/Components/Pages/Home.razor +++ b/CutList.Web/Components/Pages/Home.razor @@ -7,7 +7,7 @@

1D Bin Packing Optimization for Material Cutting

-
+
Jobs
@@ -16,7 +16,7 @@
-
+
Materials
@@ -25,16 +25,7 @@
-
-
-
-
Suppliers
-

Track suppliers and their available stock lengths for quick project setup.

- Manage Suppliers -
-
-
-
+
Cutting Tools
@@ -50,9 +41,9 @@

How It Works

  1. Set up materials - Define the shapes and sizes of materials you work with
    2. -
  2. Add suppliers - Track which stock lengths are available from your suppliers
    3. +
  3. Add stock - Record which stock lengths you have on hand
  4. Create a job - Add the parts you need to cut with their lengths and quantities
    5. -
  5. Add stock bins - Specify which stock lengths to cut from (import from supplier or add manually)
    6. +
  6. Add stock bins - Specify which stock lengths to cut from
  7. Optimize - Run the optimizer to find the best cutting pattern
  8. Print report - Generate a printable cut list to take to the shop
diff --git a/CutList.Web/Components/Pages/Orders/Add.razor b/CutList.Web/Components/Pages/Orders/Add.razor deleted file mode 100644 index 72c9d4d..0000000 --- a/CutList.Web/Components/Pages/Orders/Add.razor +++ /dev/null @@ -1,151 +0,0 @@ -@page "/orders/add" -@inject PurchaseItemService PurchaseItemService -@inject StockItemService StockItemService -@inject SupplierService SupplierService -@inject JobService JobService -@inject NavigationManager Navigation -@using CutList.Core.Formatting -@using CutList.Web.Data.Entities - -Add Order Item - -

Add Order Item

- -@if (loading) -{ -

Loading...

-} -else -{ -
-
-
-
-
Order Item Details
-
-
- - - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- - @if (!string.IsNullOrEmpty(errorMessage)) - { -
@errorMessage
- } - -
- - Cancel -
- -
-
-
-
-} - -@code { - private PurchaseItem item = new() { Quantity = 1 }; - private List stockItems = new(); - private Dictionary> stockItemGroups = new(); - private List suppliers = new(); - private List jobs = new(); - private bool loading = true; - private bool saving; - private string? errorMessage; - - protected override async Task OnInitializedAsync() - { - stockItems = await StockItemService.GetAllAsync(); - suppliers = await SupplierService.GetAllAsync(); - jobs = await JobService.GetAllAsync(); - - stockItemGroups = stockItems - .GroupBy(s => s.Material.Shape.GetDisplayName()) - .OrderBy(g => g.Key) - .ToDictionary(g => g.Key, g => g.OrderBy(s => s.Material.Size).ThenBy(s => s.LengthInches).ToList()); - - loading = false; - } - - private async Task SaveAsync() - { - errorMessage = null; - saving = true; - - try - { - if (item.StockItemId == 0) - { - errorMessage = "Please select a stock item"; - return; - } - - if (item.Quantity <= 0) - { - errorMessage = "Quantity must be at least 1"; - return; - } - - await PurchaseItemService.CreateAsync(item); - Navigation.NavigateTo("orders"); - } - finally - { - saving = false; - } - } -} diff --git a/CutList.Web/Components/Pages/Orders/Index.razor b/CutList.Web/Components/Pages/Orders/Index.razor deleted file mode 100644 index 7c30880..0000000 --- a/CutList.Web/Components/Pages/Orders/Index.razor +++ /dev/null @@ -1,291 +0,0 @@ -@page "/orders" -@inject PurchaseItemService PurchaseItemService -@inject SupplierService SupplierService -@inject NavigationManager Navigation -@using CutList.Core.Formatting -@using CutList.Web.Data.Entities - -Orders - -
-

To Be Ordered

- Add Item -
- -

- Track material that needs to be ordered from suppliers. Items are added manually or automatically from job optimization results. -

- -@if (loading) -{ -

Loading...

-} -else -{ -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
- - @if (tabItems.Count == 0) - { -
- @if (activeTab == "pending") - { - No pending items. Add an item or use "Add to Order List" from a job's results page. - } - else if (activeTab == "ordered") - { - No ordered items. - } - else - { - No order items found. Add your first item. - } -
- } - else - { - - - @if (filteredItems.Count == 0) - { -
- No items match your filters. -
- } - else - { - - - - - - - - - - - - - - - @foreach (var item in pagedItems) - { - - - - - - - - - - - } - -
MaterialLengthQtySupplierJobStatusNotesActions
@item.StockItem.Material.DisplayName@ArchUnits.FormatFromInches((double)item.StockItem.LengthInches)@item.Quantity - - - @if (item.Job != null) - { - @item.Job.DisplayName - } - else - { - - - } - - @item.Status - - @(item.Notes ?? "-") - -
- @if (item.Status == PurchaseItemStatus.Pending) - { - - } - @if (item.Status == PurchaseItemStatus.Ordered) - { - - } - -
-
- - - } - } -} - - - -@code { - private List allItems = new(); - private List suppliers = new(); - private bool loading = true; - private string activeTab = "pending"; - private int currentPage = 1; - private int pageSize = 25; - private ConfirmDialog deleteDialog = null!; - private PurchaseItem? itemToDelete; - private string deleteMessage = ""; - private MaterialFilterState filterState = new(); - - private int pendingCount => allItems.Count(i => i.Status == PurchaseItemStatus.Pending); - private int orderedCount => allItems.Count(i => i.Status == PurchaseItemStatus.Ordered); - - private List tabItems => activeTab switch - { - "pending" => allItems.Where(i => i.Status == PurchaseItemStatus.Pending).ToList(), - "ordered" => allItems.Where(i => i.Status == PurchaseItemStatus.Ordered).ToList(), - _ => allItems - }; - - private List filteredItems => tabItems.Where(i => - { - var m = i.StockItem.Material; - if (filterState.Shape.HasValue && m.Shape != filterState.Shape.Value) - return false; - if (filterState.Type.HasValue && m.Type != filterState.Type.Value) - return false; - if (!string.IsNullOrEmpty(filterState.Grade) && m.Grade != filterState.Grade) - return false; - if (!string.IsNullOrWhiteSpace(filterState.SearchText)) - { - var search = filterState.SearchText.Trim(); - if (!Contains(m.Size, search) - && !Contains(m.Grade, search) - && !Contains(m.Shape.GetDisplayName(), search) - && !Contains(i.Notes, search) - && !Contains(i.Job?.DisplayName, search) - && !Contains(i.Supplier?.Name, search)) - return false; - } - return true; - }).ToList(); - - private IEnumerable availableGrades => tabItems - .Select(i => i.StockItem.Material.Grade) - .Where(g => !string.IsNullOrEmpty(g)) - .Distinct() - .OrderBy(g => g)!; - - private IEnumerable pagedItems => filteredItems - .Skip((currentPage - 1) * pageSize) - .Take(pageSize); - - protected override async Task OnInitializedAsync() - { - allItems = await PurchaseItemService.GetAllAsync(); - suppliers = await SupplierService.GetAllAsync(); - loading = false; - } - - private void SetTab(string tab) - { - activeTab = tab; - currentPage = 1; - filterState = new(); - } - - private void OnFilterChanged(MaterialFilterState state) - { - filterState = state; - currentPage = 1; - } - - private async Task OnSupplierChanged(PurchaseItem item, ChangeEventArgs e) - { - int? supplierId = int.TryParse(e.Value?.ToString(), out var id) && id > 0 ? id : null; - await PurchaseItemService.UpdateSupplierAsync(item.Id, supplierId); - item.SupplierId = supplierId; - item.Supplier = supplierId.HasValue ? suppliers.FirstOrDefault(s => s.Id == supplierId.Value) : null; - } - - private async Task MarkOrdered(PurchaseItem item) - { - await PurchaseItemService.UpdateStatusAsync(item.Id, PurchaseItemStatus.Ordered); - item.Status = PurchaseItemStatus.Ordered; - } - - private async Task MarkReceived(PurchaseItem item) - { - await PurchaseItemService.UpdateStatusAsync(item.Id, PurchaseItemStatus.Received); - allItems = await PurchaseItemService.GetAllAsync(); - - var totalPages = (int)Math.Ceiling((double)filteredItems.Count / pageSize); - if (currentPage > totalPages && totalPages > 0) - currentPage = totalPages; - } - - private void ConfirmDelete(PurchaseItem item) - { - itemToDelete = item; - deleteMessage = $"Are you sure you want to delete this order item ({item.StockItem.Material.DisplayName} - {ArchUnits.FormatFromInches((double)item.StockItem.LengthInches)} x{item.Quantity})?"; - deleteDialog.Show(); - } - - private async Task DeleteConfirmed() - { - if (itemToDelete != null) - { - await PurchaseItemService.DeleteAsync(itemToDelete.Id); - allItems = await PurchaseItemService.GetAllAsync(); - - var totalPages = (int)Math.Ceiling((double)filteredItems.Count / pageSize); - if (currentPage > totalPages && totalPages > 0) - currentPage = totalPages; - } - } - - private void OnPageChanged(int page) => currentPage = page; - - private static string GetStatusBadgeClass(PurchaseItemStatus status) => status switch - { - PurchaseItemStatus.Pending => "bg-warning text-dark", - PurchaseItemStatus.Ordered => "bg-primary", - PurchaseItemStatus.Received => "bg-success", - _ => "bg-secondary" - }; - - private static bool Contains(string? value, string search) => - value != null && value.Contains(search, StringComparison.OrdinalIgnoreCase); -} diff --git a/CutList.Web/Components/Pages/Suppliers/Edit.razor b/CutList.Web/Components/Pages/Suppliers/Edit.razor deleted file mode 100644 index 0e0d00c..0000000 --- a/CutList.Web/Components/Pages/Suppliers/Edit.razor +++ /dev/null @@ -1,333 +0,0 @@ -@page "/suppliers/new" -@page "/suppliers/{Id:int}" -@inject SupplierService SupplierService -@inject NavigationManager Navigation -@inject CutList.Web.Data.ApplicationDbContext DbContext -@using CutList.Core.Formatting -@using Microsoft.EntityFrameworkCore - -@(IsNew ? "Add Supplier" : "Edit Supplier") - -

@(IsNew ? "Add Supplier" : supplier.Name)

- -@if (loading) -{ -

Loading...

-} -else -{ -
-
-
-
-
Supplier Details
-
-
- - - -
- - - -
- -
- - -
- -
- - -
- - @if (!string.IsNullOrEmpty(supplierErrorMessage)) - { -
@supplierErrorMessage
- } - -
- - @(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 offerings configured yet.

- } - else - { - - - - - - - - - - - @foreach (var offering in offerings) - { - - - - - - - } - -
Stock ItemPart #PriceActions
@offering.StockItem.Material.DisplayName - @ArchUnits.FormatFromInches((double)offering.StockItem.LengthInches)@(offering.PartNumber ?? "-")@(offering.Price.HasValue ? offering.Price.Value.ToString("C") : "-") - - -
- } -
-
-
- } -
-} - - - -@code { - [Parameter] - public int? Id { get; set; } - - private Supplier supplier = new(); - private List offerings = new(); - private List stockItems = new(); - private bool loading = true; - private bool savingSupplier; - private bool savingOffering; - private string? supplierErrorMessage; - 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() - { - 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) - { - var existing = await SupplierService.GetByIdAsync(Id.Value); - if (existing == null) - { - Navigation.NavigateTo("suppliers"); - return; - } - supplier = existing; - offerings = await SupplierService.GetOfferingsForSupplierAsync(Id.Value); - } - loading = false; - } - - private async Task SaveSupplierAsync() - { - supplierErrorMessage = null; - savingSupplier = true; - - try - { - if (string.IsNullOrWhiteSpace(supplier.Name)) - { - supplierErrorMessage = "Name is required"; - return; - } - - if (IsNew) - { - var created = await SupplierService.CreateAsync(supplier); - Navigation.NavigateTo($"suppliers/{created.Id}"); - } - else - { - await SupplierService.UpdateAsync(supplier); - } - } - finally - { - savingSupplier = false; - } - } - - private void ShowAddOfferingForm() - { - editingOffering = null; - newOffering = new SupplierOffering { SupplierId = Id!.Value }; - showOfferingForm = true; - offeringErrorMessage = null; - } - - private void EditOffering(SupplierOffering offering) - { - editingOffering = offering; - newOffering = new SupplierOffering - { - Id = offering.Id, - SupplierId = offering.SupplierId, - StockItemId = offering.StockItemId, - 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.StockItemId == 0) - { - offeringErrorMessage = "Please select a stock item"; - 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); - } - - offerings = await SupplierService.GetOfferingsForSupplierAsync(Id!.Value); - showOfferingForm = false; - editingOffering = null; - } - finally - { - savingOffering = false; - } - } - - private void ConfirmDeleteOffering(SupplierOffering offering) - { - 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 DeleteOfferingConfirmed() - { - if (offeringToDelete != null) - { - await SupplierService.DeleteOfferingAsync(offeringToDelete.Id); - offerings = await SupplierService.GetOfferingsForSupplierAsync(Id!.Value); - } - } -} diff --git a/CutList.Web/Components/Pages/Suppliers/Index.razor b/CutList.Web/Components/Pages/Suppliers/Index.razor deleted file mode 100644 index 1b19b34..0000000 --- a/CutList.Web/Components/Pages/Suppliers/Index.razor +++ /dev/null @@ -1,105 +0,0 @@ -@page "/suppliers" -@inject SupplierService SupplierService -@inject NavigationManager Navigation - -Suppliers - -
-

Suppliers

- Add Supplier -
- -@if (loading) -{ -

Loading...

-} -else if (suppliers.Count == 0) -{ -
- No suppliers found. Add your first supplier. -
-} -else -{ - - - - - - - - - - - @foreach (var supplier in pagedSuppliers) - { - - - - - - - } - -
NameContact InfoNotesActions
@supplier.Name@supplier.ContactInfo@TruncateText(supplier.Notes, 50) -
- - -
-
- - -} - - - -@code { - private List suppliers = new(); - private bool loading = true; - private int currentPage = 1; - private int pageSize = 25; - private ConfirmDialog deleteDialog = null!; - private Supplier? supplierToDelete; - private string deleteMessage = ""; - - private IEnumerable pagedSuppliers => suppliers.Skip((currentPage - 1) * pageSize).Take(pageSize); - - protected override async Task OnInitializedAsync() - { - suppliers = await SupplierService.GetAllAsync(); - loading = false; - } - - private void ConfirmDelete(Supplier supplier) - { - supplierToDelete = supplier; - deleteMessage = $"Are you sure you want to delete \"{supplier.Name}\"? This will also remove all stock lengths associated with this supplier."; - deleteDialog.Show(); - } - - private async Task DeleteConfirmed() - { - if (supplierToDelete != null) - { - await SupplierService.DeleteAsync(supplierToDelete.Id); - suppliers = await SupplierService.GetAllAsync(); - - var totalPages = (int)Math.Ceiling((double)suppliers.Count / pageSize); - if (currentPage > totalPages && totalPages > 0) - currentPage = totalPages; - } - } - - private void OnPageChanged(int page) => currentPage = page; - - private string? TruncateText(string? text, int maxLength) - { - if (string.IsNullOrEmpty(text) || text.Length <= maxLength) - return text; - return text.Substring(0, maxLength) + "..."; - } -}