From 8a68c2c0e4d293d41f5c81d85fc398c6ddac5091 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 25 May 2021 18:52:10 +0000 Subject: [PATCH] --- server/AyaNova/biz/TaskGroupBiz.cs | 1 + server/AyaNova/models/TaskGroupItem.cs | 2 +- server/AyaNova/util/AySchema.cs | 6 +++--- server/AyaNova/util/Seeder.cs | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index a6b8f0b8..4c9e7213 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -46,6 +46,7 @@ namespace AyaNova.Biz // internal async Task CreateAsync(TaskGroup newObject) { + await ValidateAsync(newObject, null); if (HasErrors) return null; diff --git a/server/AyaNova/models/TaskGroupItem.cs b/server/AyaNova/models/TaskGroupItem.cs index ec42f051..c515c804 100644 --- a/server/AyaNova/models/TaskGroupItem.cs +++ b/server/AyaNova/models/TaskGroupItem.cs @@ -15,7 +15,7 @@ namespace AyaNova.Models 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 645b6abf..dc2117b8 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -24,14 +24,14 @@ namespace AyaNova.Util internal const long EXPECTED_COLUMN_COUNT = 933; internal const long EXPECTED_INDEX_COUNT = 141; - internal const long EXPECTED_CHECK_CONSTRAINTS = 423; + internal const long EXPECTED_CHECK_CONSTRAINTS = 421; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 118; internal const long EXPECTED_VIEWS = 6; internal const long EXPECTED_ROUTINES = 2; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////////////////////////////// C933:I141:CC423:FC118:V6:R2 + ///////////////////////////////////////////////////////////////// C933:I141:CC421:FC118:V6:R2 /* @@ -743,7 +743,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); //TASKGROUPITEM await ExecQueryAsync("CREATE TABLE ataskgroupitem (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, taskgroupid BIGINT NOT NULL REFERENCES ataskgroup ON DELETE CASCADE, " - + "sequence INTEGER NOT NULL DEFAULT 0, task TEXT NOT NULL)"); + + "sequence INTEGER DEFAULT 0, task TEXT)"); //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 b59ab691..7139e032 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -1319,12 +1319,12 @@ namespace AyaNova.Util t.Name = "Aerostat monitor standard refurb"; t.Active = true; t.Notes = Fake.Lorem.Sentence(); - t.Items.Add(new TaskGroupItem() { Sequence = 0, Task = "Power down unit" }); + t.Items.Add(new TaskGroupItem() { Sequence = 1, Task = "Power down unit" }); t.Items.Add(new TaskGroupItem() { Sequence = 2, Task = "Open seals" }); - t.Items.Add(new TaskGroupItem() { Sequence = 4, Task = "Replace central core" }); - t.Items.Add(new TaskGroupItem() { Sequence = 6, Task = "Test point B, verify +.25" }); - t.Items.Add(new TaskGroupItem() { Sequence = 8, Task = "Replace seals" }); - t.Items.Add(new TaskGroupItem() { Sequence = 10, Task = "Confirm power up" }); + t.Items.Add(new TaskGroupItem() { Sequence = 3, Task = "Replace central core" }); + t.Items.Add(new TaskGroupItem() { Sequence = 4, Task = "Test point B, verify +.25" }); + t.Items.Add(new TaskGroupItem() { Sequence = 5, Task = "Replace seals" }); + t.Items.Add(new TaskGroupItem() { Sequence = 6, Task = "Confirm power up" }); using (AyContext ct = ServiceProviderProvider.DBContext)