From 2ac3c95816e37ad9fe70202c6137a9ce955b46a3 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 22 Jun 2021 22:34:18 +0000 Subject: [PATCH] --- .../AyaNova/Controllers/GlobalBizSettingsController.cs | 5 +++++ server/AyaNova/models/GlobalBizSettings.cs | 10 +++++----- server/AyaNova/util/AySchema.cs | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs index 290292fb..e0e4730c 100644 --- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs @@ -119,12 +119,17 @@ namespace AyaNova.Api.Controllers DefaultTaxRateSaleId = AyaNova.Util.ServerGlobalBizSettings.Cache.TaxRateSaleId, WorkOrderTravelDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.Cache.WorkOrderTravelDefaultMinutes, WorkLaborScheduleDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.Cache.WorkLaborScheduleDefaultMinutes, + SignatureTitle = AyaNova.Util.ServerGlobalBizSettings.Cache.SignatureTitle, + SignatureHeader = AyaNova.Util.ServerGlobalBizSettings.Cache.SignatureHeader, + SignatureFooter = AyaNova.Util.ServerGlobalBizSettings.Cache.SignatureFooter, + //used to drive UI in case of unlicensed or attention required LicenseStatus = AyaNova.Core.License.ActiveKey.Status, MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired, ServerDbId = AyaNova.Core.License.ServerDbId, Company = AyaNova.Core.License.ActiveKey.RegisteredTo + // , // TestTSDaysWMS=new TimeSpan(22,10,15,22,33), // TestTSHMS=new TimeSpan(5,16,33), diff --git a/server/AyaNova/models/GlobalBizSettings.cs b/server/AyaNova/models/GlobalBizSettings.cs index a7433ef6..ab392cf3 100644 --- a/server/AyaNova/models/GlobalBizSettings.cs +++ b/server/AyaNova/models/GlobalBizSettings.cs @@ -77,12 +77,13 @@ namespace AyaNova.Models public List CustomerAllowNotifyWOCreatedInTags { get; set; } = new List(); public List CustomerAllowNotifyWOCreatedOutTags { get; set; } = new List(); - public bool CustomerAllowNotifyWOCompleted { get; set; } + public bool CustomerAllowNotifyWOCompleted { get; set; } public List CustomerAllowNotifyWOCompletedInTags { get; set; } = new List(); public List CustomerAllowNotifyWOCompletedOutTags { get; set; } = new List(); - - + public string SignatureTitle { get; set; } + public string SignatureHeader { get; set; } + public string SignatureFooter { get; set; } public GlobalBizSettings() @@ -90,11 +91,10 @@ namespace AyaNova.Models Id = 1;//always 1 SearchCaseSensitiveOnly = false; UseInventory = true; - } } - //Used internally and at client end as extended rights atop roles system in relation only to Contact (customer type users) + //Used internally and at client end as extended rights atop roles system in relation only to Contact (customer type users) public record CustomerRightsRecord(bool CSR, bool WO, bool WOWIKI, bool UserSettings, bool NotifyServiceImminent, bool NotifyCSRAccepted, bool NotifyCSRRejected, bool NotifyWOCreated, bool NotifyWOCompleted); } /* diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 287504be..d28d0240 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 1; - internal const long EXPECTED_COLUMN_COUNT = 957; + internal const long EXPECTED_COLUMN_COUNT = 960; internal const long EXPECTED_INDEX_COUNT = 137; internal const long EXPECTED_CHECK_CONSTRAINTS = 415; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 118; @@ -255,6 +255,9 @@ namespace AyaNova.Util + "workordercompletebyage INTERVAL NOT NULL DEFAULT '00:00:00', " + "workordertraveldefaultminutes INTEGER NOT NULL DEFAULT 0, " + "worklaborscheduledefaultminutes INTEGER NOT NULL DEFAULT 0, " + + "signaturetitle TEXT, " + + "signatureheader TEXT, " + + "signaturefooter TEXT, " + "customerservicerequestinfohtml TEXT, " + "customerallowcsr BOOL DEFAULT FALSE, customerallowcsrintags VARCHAR(255) ARRAY, customerallowcsrouttags VARCHAR(255) ARRAY, "