From 6d291e1aa2b0a89051a9709b47461876397a7113 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 1 Jun 2021 22:22:00 +0000
Subject: [PATCH]

---
 .../AyaNova/Controllers/GlobalBizSettingsController.cs |  3 +++
 server/AyaNova/models/GlobalBizSettings.cs             |  7 +++++++
 server/AyaNova/util/AySchema.cs                        |  6 ++++--
 server/AyaNova/util/ServerGlobalBizSettings.cs         | 10 +++++++---
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
index 1e996cb1..1a9f7062 100644
--- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs
+++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
@@ -117,6 +117,9 @@ namespace AyaNova.Api.Controllers
                 DefaultTaxPartSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxPartSaleId,
                 DefaultTaxPartPurchaseId = AyaNova.Util.ServerGlobalBizSettings.TaxPartPurchaseId,
                 DefaultTaxRateSaleId = AyaNova.Util.ServerGlobalBizSettings.TaxRateSaleId,
+                WorkOrderTravelDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkOrderTravelDefaultMinutes,
+                WorkLaborScheduleDefaultMinutes = AyaNova.Util.ServerGlobalBizSettings.WorkLaborScheduleDefaultMinutes,
+
                 //used to drive UI in case of unlicensed or attention required
                 LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
                 MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
diff --git a/server/AyaNova/models/GlobalBizSettings.cs b/server/AyaNova/models/GlobalBizSettings.cs
index 4d19a739..44a3ee3e 100644
--- a/server/AyaNova/models/GlobalBizSettings.cs
+++ b/server/AyaNova/models/GlobalBizSettings.cs
@@ -29,6 +29,13 @@ namespace AyaNova.Models
         public long? TaxPartSaleId { get; set; }
         public long? TaxRateSaleId { get; set; }
 
+
+		//DEFAULT WO MINUTES
+		[Required]
+		public int WorkLaborScheduleDefaultMinutes {get;set;}
+		[Required]
+		public int WorkOrderTravelDefaultMinutes {get;set;}
+
         [Required]
         public TimeSpan WorkOrderCompleteByAge { get; set; } = TimeSpan.Zero;//was workorderclosebyage
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index c9e7b13b..25e9cfeb 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -253,7 +253,9 @@ namespace AyaNova.Util
                 await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
                                      + "searchcasesensitiveonly BOOL DEFAULT FALSE, "
                                      + "useinventory BOOL DEFAULT TRUE, "
-                                     + "workordercompletebyage  INTERVAL NOT NULL DEFAULT '00:00:00'"
+                                     + "workordercompletebyage  INTERVAL NOT NULL DEFAULT '00:00:00', "
+                                     + "workordertraveldefaultminutes INTEGER NOT NULL DEFAULT 0, "
+                                     + "worklaborscheduledefaultminutes INTEGER NOT NULL DEFAULT 0 "
                                      + ")");
 
                 //create global ops BACKUP settings table
@@ -512,7 +514,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
 
                 //Global tax code defaults
                 await ExecQueryAsync("ALTER TABLE aglobalbizsettings ADD column taxpartpurchaseid BIGINT REFERENCES ataxcode, "
-                    +"ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
+                    + "ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
 
                 //MEMO                
                 await ExecQueryAsync("CREATE TABLE amemo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "
diff --git a/server/AyaNova/util/ServerGlobalBizSettings.cs b/server/AyaNova/util/ServerGlobalBizSettings.cs
index c9468ed9..0e60c961 100644
--- a/server/AyaNova/util/ServerGlobalBizSettings.cs
+++ b/server/AyaNova/util/ServerGlobalBizSettings.cs
@@ -15,12 +15,13 @@ namespace AyaNova.Util
     {
 
         internal static bool SearchCaseSensitiveOnly { get; set; }
-        internal static bool UseInventory { get; set; }      
+        internal static bool UseInventory { get; set; }
         internal static long? TaxPartPurchaseId { get; set; }
         internal static long? TaxPartSaleId { get; set; }
         internal static long? TaxRateSaleId { get; set; }
         internal static TimeSpan WorkOrderCompleteByAge { get; set; }
-
+        internal static int WorkLaborScheduleDefaultMinutes { get; set; }
+        internal static int WorkOrderTravelDefaultMinutes { get; set; }
 
         /// <summary>
         /// Populate and / or create the settings
@@ -46,7 +47,10 @@ namespace AyaNova.Util
             TaxPartPurchaseId = global.TaxPartPurchaseId;
             TaxPartSaleId = global.TaxPartSaleId;
             TaxRateSaleId = global.TaxRateSaleId;
-            WorkOrderCompleteByAge=global.WorkOrderCompleteByAge;
+            WorkOrderCompleteByAge = global.WorkOrderCompleteByAge;
+            WorkLaborScheduleDefaultMinutes = global.WorkLaborScheduleDefaultMinutes;
+            WorkOrderTravelDefaultMinutes = global.WorkOrderTravelDefaultMinutes;
+
         }