From aaa7641d210a73922a2ad7ad007de534dba2f0cf Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 25 May 2021 16:49:51 +0000 Subject: [PATCH] --- server/AyaNova/biz/TaskGroupBiz.cs | 2 +- server/AyaNova/models/TaskGroupItem.cs | 2 +- server/AyaNova/util/AySchema.cs | 2 +- server/AyaNova/util/Seeder.cs | 72 +++++++++++++++++++++++++- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index b6a55bb6..a6b8f0b8 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -13,7 +13,7 @@ using Newtonsoft.Json; namespace AyaNova.Biz { - // add list object for main list + internal class TaskGroupBiz : BizObject, IJobObject, ISearchAbleObject, IReportAbleObject, IExportAbleObject, IImportAbleObject { diff --git a/server/AyaNova/models/TaskGroupItem.cs b/server/AyaNova/models/TaskGroupItem.cs index 28331846..ec42f051 100644 --- a/server/AyaNova/models/TaskGroupItem.cs +++ b/server/AyaNova/models/TaskGroupItem.cs @@ -13,7 +13,7 @@ namespace AyaNova.Models [Required] public long TaskGroupId { get; set; } - public int DisplayOrder { get; set; } = 0; + public int Sequence { get; set; } = 0; [Required] public string Task { get; set; } diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index c96a65c4..691239f3 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -743,7 +743,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); //TASK await ExecQueryAsync("CREATE TABLE ataskgroupitem (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, taskgroupid BIGINT NOT NULL REFERENCES ataskgroup ON DELETE CASCADE, " - + "displayorder INTEGER NOT NULL DEFAULT 0, name TEXT NOT NULL)"); + + "sequence INTEGER NOT NULL DEFAULT 0, name TEXT NOT NULL)"); //WORKORDER STATUS await ExecQueryAsync("CREATE TABLE aworkorderstatus (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, " diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index 7f71baf4..0aecb55f 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -705,6 +705,10 @@ namespace AyaNova.Util } } + + //////////////////////////////// + //HEADOFFICE + // { long HeadOfficeIdForCustomer = 0; @@ -1090,7 +1094,8 @@ namespace AyaNova.Util ///////////////////////////////////////////////////// - //WorkorderItemStatus + //WORKORDERITEMSTATUS + // { { @@ -1160,7 +1165,8 @@ namespace AyaNova.Util ///////////////////////////////////////////////////// - //WorkOrderItemPriority + //WORKORDERITEMPRIORITY + // { { @@ -1276,9 +1282,71 @@ namespace AyaNova.Util } + ///////////////////////////////////////////////////// + //TASKGROUP + // + { + + { + TaskGroup t = new TaskGroup(); + t.Name = "Clean and inspect Class 7C"; + t.Active = true; + t.Notes = Fake.Lorem.Sentence(); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Open unit" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Test tinclavic seals" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Inspect triple-bonded polysium for cracks" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Verify thickness of zybanium shield" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Close unit" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Clean unit and confirm power up" }); + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + TaskGroupBiz biz = TaskGroupBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(t); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating TaskGroup\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + { + TaskGroup t = new TaskGroup(); + t.Name = "Aerostat monitor standard refurb"; + t.Active = true; + t.Notes = Fake.Lorem.Sentence(); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Power down unit" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Open seals" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Replace central core" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Test point B, verify +.25" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Replace seals" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Confirm power up" }); + + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + TaskGroupBiz biz = TaskGroupBiz.GetBiz(ct); + var NewObject = await biz.CreateAsync(t); + + if (NewObject == null) + { + var err = $"Seeder::SeedKnownObjects error creating TaskGroup\r\n{biz.GetErrorsAsString()}"; + log.LogError(err); + throw new System.Exception(err); + } + } + } + + } + ///////////////////////////////////////////////////// //TAX CODES + // { {