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

---
 ayanova/devdocs/todo.txt                  | 13 +++++++++++++
 ayanova/src/views/adm-global-settings.vue | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index c6930121..c4be1b06 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -218,6 +218,8 @@ todo: cypress testing for load testing etc
 
 ## SERVER MISC ITEMS
 
+todo: seeder is putting customer users in as techs in sample workorders (on scheduled user for sure at least)
+
 todo: notify on server boot?? (general notify to admin user or whatever?)
 	or on shutdown?
 
@@ -384,6 +386,17 @@ todo: many biz objects are not using new PUT methodology
 
 CURRENTLY DOING: 
 
+MISC WO ITEMS that came up
+	scheduled user conflict is triggering error properly on initial create and save but NOT when edited and saved
+		possible fuckiness with errors on update rather than initial save (hidden extra ID column?)
+		it *is* showing on woitem part that there is an error and it is showing in top for error alert box
+		but not showing for exact field or row in grid
+		This is likely occurring with other things, may not have tested this scenario of update and error properly
+		so replicate the fix whatever it is or look for the same issue
+		
+	Scheduled user selecting rate on new isn't populating rate-viz, (server is on save though)
+
+
 3720 3: BUMPABLE CASE I THINK  prevent double booking a tech (some kind of warning)		
 		availability feature??? maybe bump as a new availablity feature where user picks from a popup schedule for that tech?
 		if not maybe a alert from the workorder itself when they save saying double booked??
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 7f28dc80..a18d284d 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -89,6 +89,17 @@
             ></gz-duration-picker>
           </v-col>
 
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.allowScheduleConflicts"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GlobalAllowScheduleConflicts')"
+              ref="allowScheduleConflicts"
+              data-cy="allowScheduleConflicts"
+              @change="fieldValueChanged('allowScheduleConflicts')"
+            ></v-checkbox>
+          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-text-field
               v-model="obj.workLaborScheduleDefaultMinutes"
@@ -753,6 +764,7 @@ export default {
           taxPartSaleId: null,
           taxRateSaleId: null,
           workOrderCompleteByAge: "00:00:00",
+          allowScheduleConflicts: false,
           workOrderTravelDefaultMinutes: 0,
           workLaborScheduleDefaultMinutes: 0,
           customerDefaultWorkOrderReportId: null,
@@ -1036,7 +1048,8 @@ async function fetchTranslatedText(vm) {
     "CustomerSignature",
     "GlobalSignatureFooter",
     "GlobalSignatureHeader",
-    "GlobalSignatureTitle"
+    "GlobalSignatureTitle",
+    "GlobalAllowScheduleConflicts"
   ]);
 }
 </script>