From 124d70afe7dd6cd74ed1890638960e352ff3a1eb Mon Sep 17 00:00:00 2001 From: AJ Isaacs Date: Mon, 5 Oct 2026 18:01:54 -0400 Subject: [PATCH] feat(ui): edit quantities in the BOM part table The BOM import dialog's Parts table now binds to the BomPartRow objects themselves (a BindingList with Designer-defined columns) instead of a DataTable of strings: - Columns: Item #, File Name, Description, Material, Thickness, Qty, Status. Only Material, Thickness and Qty are editable, and only on rows that have a drawing; those rows are grey and locked. Rows that still need input are tinted amber. - Qty is editable. Anything but a whole number of 1 or more is refused in the cell with an error icon; Esc restores the old value. A blank-in-BOM quantity shows a tooltip saying 1 is used. - A thickness that is not a number above 0 is refused the same way; blanking it marks the row "Needs thickness". - Every edit goes through the row's bound part, so the Groups tab (part count and Total Qty) and the summary follow at once, and an edit can never land on a different part. Rows stay in BOM order: the headers no longer sort, which removes the sort-then-edit defect where index mapping applied an edit to another part. - Create Nests first finishes the cell being edited. BomImportFormTests (OpenNest.WinForms.Tests) cover the columns, the quantity edit and its group total, refused quantities, edits after the rows are reloaded in another order, locked rows and blanked material/thickness. They first run on the windows-desktop CI job; the sort defect's red evidence is source review, not an executed test. Project Memory: 5b0808d1-7353-4a34-87df-d1fbfc38f2b4 --- .../Forms/BomImportFormTests.cs | 188 +++++++++++++++ OpenNest/Forms/BomImportForm.Designer.cs | 89 ++++++++ OpenNest/Forms/BomImportForm.cs | 215 +++++++++++------- 3 files changed, 408 insertions(+), 84 deletions(-) create mode 100644 OpenNest.WinForms.Tests/Forms/BomImportFormTests.cs diff --git a/OpenNest.WinForms.Tests/Forms/BomImportFormTests.cs b/OpenNest.WinForms.Tests/Forms/BomImportFormTests.cs new file mode 100644 index 0000000..6357dc7 --- /dev/null +++ b/OpenNest.WinForms.Tests/Forms/BomImportFormTests.cs @@ -0,0 +1,188 @@ +using System.Data; +using System.Reflection; +using System.Windows.Forms; +using OpenNest.Forms; +using OpenNest.IO.Bom; + +namespace OpenNest.WinForms.Tests.Forms; + +public class BomImportFormTests +{ + [Fact] + public void PartColumns_KeepBomOrderAndOnlyMaterialThicknessAndQtyAreEditable() + { + RunSta(() => + { + using var form = Show(out var parts); + + Assert.Equal( + new[] { "Item #", "File Name", "Description", "Material", "Thickness", "Qty", "Status" }, + parts.Columns.Cast().OrderBy(c => c.DisplayIndex).Select(c => c.HeaderText) + ); + Assert.All( + parts.Columns.Cast(), + c => Assert.Equal(DataGridViewColumnSortMode.NotSortable, c.SortMode) + ); + Assert.Equal( + new[] { "colMaterial", "colThickness", "colQty" }, + parts.Columns.Cast().Where(c => !c.ReadOnly).Select(c => c.Name) + ); + }); + } + + [Fact] + public void EditingQty_ChangesThatPartAndTheGroupTotal() + { + RunSta(() => + { + using var form = Show(out var parts); + var first = Ready("PT01", qty: 2); + var second = Ready("PT02", qty: 3); + form.LoadRows(new[] { first, second }); + Assert.Equal(5, GroupTotal(form, 0)); + + Assert.True(Edit(parts, 0, "colQty", "5")); + + Assert.Equal(5, first.Qty); + Assert.Equal(3, second.Qty); + Assert.Equal(8, GroupTotal(form, 0)); + Assert.Equal("Ready", parts.Rows[0].Cells["colStatus"].Value); + }); + } + + [Theory] + [InlineData("0")] + [InlineData("-1")] + [InlineData("2.5")] + [InlineData("abc")] + [InlineData("")] + public void InvalidQty_IsRefusedAndTheOldValueKept(string text) + { + RunSta(() => + { + using var form = Show(out var parts); + var part = Ready("PT01", qty: 2); + form.LoadRows(new[] { part }); + + Assert.False(Edit(parts, 0, "colQty", text)); + Assert.True(parts.IsCurrentCellInEditMode); + Assert.False(string.IsNullOrEmpty(parts.CurrentCell.ErrorText)); + + parts.CancelEdit(); + Assert.True(parts.EndEdit()); + + Assert.Equal(2, part.Qty); + Assert.Equal(2, GroupTotal(form, 0)); + }); + } + + [Fact] + public void Edits_ChangeThePartShownInThatRow_AfterTheRowsAreReloadedInAnotherOrder() + { + RunSta(() => + { + using var form = Show(out var parts); + var a = Ready("PT01", qty: 1); + var b = Ready("PT02", qty: 1); + var c = Ready("PT03", qty: 1); + form.LoadRows(new[] { a, b, c }); + + Assert.True(Edit(parts, 2, "colMaterial", "Aluminum")); + Assert.Equal("Aluminum", c.Material); + Assert.Equal("Stainless", a.Material); + + form.LoadRows(new[] { c, a, b }); + Assert.Same(c, parts.Rows[0].DataBoundItem); + + Assert.True(Edit(parts, 0, "colQty", "9")); + Assert.Equal(9, c.Qty); + Assert.Equal(1, a.Qty); + }); + } + + [Fact] + public void RowsWithoutADrawing_CannotEnterEditMode() + { + RunSta(() => + { + using var form = Show(out var parts); + var noDrawing = Ready("PT01", qty: 1); + noDrawing.DxfPath = null; + form.LoadRows(new[] { noDrawing, Ready("PT02", qty: 1) }); + + parts.CurrentCell = parts.Rows[0].Cells["colQty"]; + Assert.False(parts.BeginEdit(selectAll: true)); + Assert.False(parts.IsCurrentCellInEditMode); + + parts.CurrentCell = parts.Rows[1].Cells["colQty"]; + Assert.True(parts.BeginEdit(selectAll: true)); + parts.CancelEdit(); + }); + } + + [Fact] + public void BlankingMaterialOrThickness_MarksTheRowAndDropsItFromTheGroups() + { + RunSta(() => + { + using var form = Show(out var parts); + var first = Ready("PT01", qty: 1); + var second = Ready("PT02", qty: 1); + form.LoadRows(new[] { first, second }); + + Assert.True(Edit(parts, 0, "colMaterial", " ")); + Assert.Null(first.Material); + Assert.Equal("Needs material", parts.Rows[0].Cells["colStatus"].Value); + + Assert.False(Edit(parts, 1, "colThickness", "abc")); + parts.CancelEdit(); + Assert.True(parts.EndEdit()); + Assert.Equal(0.25, second.Thickness); + + Assert.True(Edit(parts, 1, "colThickness", "")); + Assert.Null(second.Thickness); + Assert.Equal("Needs thickness", parts.Rows[1].Cells["colStatus"].Value); + + Assert.Empty(GroupsTable(form).Rows); + Assert.Equal("0 ready, 1 needs a material, 1 needs a thickness", Field