diff --git a/OpenNest.WinForms.Tests/Forms/EditNestInfoFormTests.cs b/OpenNest.WinForms.Tests/Forms/EditNestInfoFormTests.cs index f3eef988..c83f2efe 100644 --- a/OpenNest.WinForms.Tests/Forms/EditNestInfoFormTests.cs +++ b/OpenNest.WinForms.Tests/Forms/EditNestInfoFormTests.cs @@ -311,7 +311,7 @@ public class EditNestInfoFormTests } [Fact] - public void BlankMadeBy_StartsFromTheUserName_AndRemembersATypedName() + public void NewNestMadeBy_StartsFromTheUserName_AndRemembersATypedName() { RunSta(() => { @@ -320,20 +320,27 @@ public class EditNestInfoFormTests try { settings.MadeBy = ""; + Assert.Equal(Environment.UserName, NewNestFactory.DefaultMadeBy); + + // Viewing an existing nest's info leaves a blank author blank. + var existing = new Nest(); using (var form = new EditNestInfoForm()) { - form.LoadNestInfo(new Nest()); - Assert.Equal(Environment.UserName, form.MadeBy); - form.MadeBy = "Synthetic operator"; - form.SaveNestInfo(new Nest()); + form.LoadNestInfo(existing); + Assert.Equal("", form.MadeBy); + form.SaveNestInfo(existing); } - Assert.Equal("Synthetic operator", settings.MadeBy); + Assert.Equal("", existing.MadeBy); + Assert.Equal("", settings.MadeBy); using (var form = new EditNestInfoForm()) { form.LoadNestInfo(new Nest()); - Assert.Equal("Synthetic operator", form.MadeBy); + form.MadeBy = "Synthetic operator"; + form.SaveNestInfo(new Nest()); } + Assert.Equal("Synthetic operator", settings.MadeBy); + Assert.Equal("Synthetic operator", NewNestFactory.DefaultMadeBy); // A nest's own author is shown as is and, left alone, is not remembered. using (var form = new EditNestInfoForm()) diff --git a/OpenNest/Forms/BomImportForm.cs b/OpenNest/Forms/BomImportForm.cs index 909a7a93..19a4b916 100644 --- a/OpenNest/Forms/BomImportForm.cs +++ b/OpenNest/Forms/BomImportForm.cs @@ -450,6 +450,7 @@ namespace OpenNest.Forms _defaults.ApplyTo(nest); clamps.ApplyToNewNest(nest); MachineSettings.AssignMachine(nest, machine); + nest.MadeBy = NewNestFactory.DefaultMadeBy; } ); importErrors.AddRange(result.Errors); diff --git a/OpenNest/Forms/EditNestInfoForm.cs b/OpenNest/Forms/EditNestInfoForm.cs index f768cac4..480043e4 100644 --- a/OpenNest/Forms/EditNestInfoForm.cs +++ b/OpenNest/Forms/EditNestInfoForm.cs @@ -232,20 +232,9 @@ namespace OpenNest.Forms } /// - /// Fills a blank Made By: the name the user last typed there, else their Windows user name. - /// - public static string DefaultMadeBy - { - get - { - var remembered = Properties.Settings.Default.MadeBy; - return string.IsNullOrWhiteSpace(remembered) ? Environment.UserName : remembered.Trim(); - } - } - - /// - /// Remembers a Made By the user typed, so later blank nests start from it; clearing - /// the box falls back to the Windows user name again. + /// Remembers a Made By the user typed, so later new nests start from it + /// (); clearing the box falls back to the + /// Windows user name again. /// private void RememberMadeBy() { @@ -357,7 +346,9 @@ namespace OpenNest.Forms MaterialName = nest.Material?.Name ?? ""; MaterialGrade = nest.Material?.Grade ?? ""; Status = nest.Status; - MadeBy = string.IsNullOrWhiteSpace(nest.MadeBy) ? DefaultMadeBy : nest.MadeBy; + // Shown as stored: a new nest got its author when it was made, and viewing an + // existing nest's info must not sign it. + MadeBy = nest.MadeBy ?? ""; shownMadeBy = MadeBy; SizeString = nest.PlateDefaults.Size.ToString(); PartSpacing = nest.PlateDefaults.PartSpacing; diff --git a/OpenNest/Forms/NewNestFactory.cs b/OpenNest/Forms/NewNestFactory.cs index a1973adc..856c599d 100644 --- a/OpenNest/Forms/NewNestFactory.cs +++ b/OpenNest/Forms/NewNestFactory.cs @@ -31,10 +31,25 @@ namespace OpenNest.Forms nest.DateCreated = now; nest.DateLastModified = now; + nest.MadeBy = DefaultMadeBy; nest.Name = NestNames.Format(now.Year, await AllocateNumberAsync(now)); return nest; } + /// + /// The author a new nest starts with: the name the user last typed in Nest Info's Made By, + /// else their Windows user name. Only new nests get it; opening an existing nest's info + /// leaves a blank Made By blank. + /// + public static string DefaultMadeBy + { + get + { + var remembered = Settings.Default.MadeBy; + return string.IsNullOrWhiteSpace(remembered) ? Environment.UserName : remembered.Trim(); + } + } + private static Nest CreateDefaultNest(SetReleaseGroup release) { var nest = new Nest();