From 977ba9e09973b5743bc13ede06ade7179c7b81d6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 29 Jul 2021 18:15:39 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/FormFieldReference.cs | 5 ++++- server/AyaNova/models/PM.cs | 4 ++++ server/AyaNova/util/AySchema.cs | 5 +++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b77f3b95..fcc80a75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 36466e77..3c286fbe 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -1399,7 +1399,10 @@ namespace AyaNova.Biz //PM List l = new List(); - //Several mandatory fields in PM header not listed here + //Several mandatory fields in PM header not listed here + + l.Add(new FormField { TKey = "CopyAttachments", FieldKey = "CopyAttachments" }); + l.Add(new FormField { TKey = "CopyWiki", FieldKey = "CopyWiki" }); l.Add(new FormField { TKey = "WorkOrderSummary", FieldKey = "WorkOrderSummary" }); l.Add(new FormField { TKey = "Address", FieldKey = "Address" }); diff --git a/server/AyaNova/models/PM.cs b/server/AyaNova/models/PM.cs index 8f4b8daf..83c2512a 100644 --- a/server/AyaNova/models/PM.cs +++ b/server/AyaNova/models/PM.cs @@ -22,6 +22,10 @@ namespace AyaNova.Models public List Tags { get; set; } = new List(); //---- + [Required] + public bool CopyWiki { get; set; } + [Required] + public bool CopyAttachments { get; set; } public DateTime? StopGeneratingDate { get; set; } [Required] public DaysOfWeek ExcludeDaysOfWeek { get; set; }//bit field flags set diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index f45058fa..b65bb46b 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -1016,8 +1016,9 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT NOT NULL REFERENCES acustomer (id), " + "projectid BIGINT REFERENCES aproject, contractid BIGINT NULL, internalreferencenumber text, " + "customerreferencenumber text, customercontactname text, createddate TIMESTAMP NOT NULL, onsite BOOL NOT NULL, " - + "stopgeneratingdate TIMESTAMP, nextservicedate TIMESTAMP NOT NULL, generatedate TIMESTAMP NOT NULL, excludedaysofweek INTEGER NOT NULL, active BOOL NOT NULL, " - + "repeatunit INTEGER NOT NULL, generatebeforeunit INTEGER NOT NULL, repeatinterval INTEGER NOT NULL, generatebeforeinterval INTEGER NOT NULL, " + + "stopgeneratingdate TIMESTAMP, nextservicedate TIMESTAMP NOT NULL, generatedate TIMESTAMP NOT NULL, excludedaysofweek INTEGER NOT NULL," + + "active BOOL NOT NULL, repeatunit INTEGER NOT NULL, generatebeforeunit INTEGER NOT NULL, repeatinterval INTEGER NOT NULL, " + + "generatebeforeinterval INTEGER NOT NULL, copywiki BOOL NOT NULL, copyattachments BOOL NOT NULL, " + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6) " + ")");