From ccc4ee055231ccba0d160a0fdf5d72216ca03dd8 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 28 Jul 2021 22:00:49 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt             |  4 ++++
 ayanova/src/components/pm-header.vue | 24 +++++++++++++-----------
 ayanova/src/views/svc-pm.vue         | 18 ++++++++++--------
 ayanova/src/views/svc-quote.vue      |  3 ++-
 ayanova/src/views/svc-workorder.vue  |  3 ++-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index f423817e..06e54893 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -569,6 +569,10 @@ PM TODO:
 	PM and QUOTE BIZ - all the notifications are probably fucked as copied directly from wo
 		fix and add their own special ones
 
+	"Generate work order" sounds like the PM automatic generation system, is this confusing?
+		need to disambiguate these things because the word generate is used for pm generation to wo
+		but what we are really doing is creating a work order from something or copy to new WorkOrder / Quote / PM?
+
 New plan: a way to generate any form of order from any other even if indirectly:
 	Generate WO from quote	
 	Generate quote from wo	
diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index 6747bff5..941a7215 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -57,17 +57,6 @@
       </v-col>
 
       <!-- ##################################################################################### -->
-      <v-col cols="12" sm="6" lg="4" xl="3">
-        <v-checkbox
-          v-model="value.active"
-          :readonly="formState.readOnly"
-          :label="$ay.t('Active')"
-          ref="active"
-          data-cy="active"
-          :error-messages="form().serverErrors(this, 'active')"
-          @change="fieldValueChanged('active')"
-        ></v-checkbox>
-      </v-col>
 
       <v-col cols="12" sm="6" lg="4" xl="3">
         <v-row>
@@ -154,6 +143,7 @@
           :readonly="formState.readOnly"
           ref="nextServiceDate"
           data-cy="nextServiceDate"
+          :rules="[form().required(this, 'nextServiceDate')]"
           :error-messages="form().serverErrors(this, 'nextServiceDate')"
           @input="fieldValueChanged('nextServiceDate')"
         ></gz-date-time-picker>
@@ -171,6 +161,18 @@
         ></gz-date-time-picker>
       </v-col>
 
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <v-checkbox
+          v-model="value.active"
+          :readonly="formState.readOnly"
+          :label="$ay.t('Active')"
+          ref="active"
+          data-cy="active"
+          :error-messages="form().serverErrors(this, 'active')"
+          @change="fieldValueChanged('active')"
+        ></v-checkbox>
+      </v-col>
+
       <!-- ##################################################################################### -->
       <v-col
         v-if="
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index 58d077b0..5eaff884 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -205,19 +205,21 @@ export default {
         wiki: null,
         customFields: "{}",
         tags: [],
+        stopGeneratingDate: null,
+        excludeDaysOfWeek: 96,
+        active: true,
+        nextServiceDate: null,
+        repeatUnit: 7,
+        generateBeforeUnit: 4,
+        repeatInterval: 1,
+        generateBeforeInterval: 14,
+        generateDate: null,
         customerId: 0, //part of rule breaking, flip to null on new triggers broken rule
         projectId: null,
         contractId: null,
         internalReferenceNumber: null,
         customerReferenceNumber: null,
         customerContactName: null,
-        fromPMId: null,
-        fromPMId: null,
-        fromCSRId: null,
-        serviceDate: null,
-        completeByDate: null,
-        durationToCompleted: "00:00:00",
-        invoiceNumber: null,
         onsite: true,
         customerSignature: null,
         customerSignatureName: null,
@@ -1714,7 +1716,7 @@ function generateMenu(vm) {
     readOnly: vm.formState.readOnly,
     hideCoreBizStandardOptions: vm.obj.userIsRestrictedType,
     hideSearch: vm.obj.userIsRestrictedType,
-    icon: "$ayiPencilAlt",
+    icon: "$ayiBusinessTime",
     title: "PM",
     helpUrl: "svc-pms",
     formData: {
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index b4909835..be4ef67a 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -2149,7 +2149,8 @@ async function fetchTranslatedText(vm) {
     "RecentWorkOrders",
     "WorkOrderGenerateUnit",
     "ApplyUnitContract",
-    "CustomerServiceRequest"
+    "CustomerServiceRequest",
+    "NewStatus"
   ]);
 }
 
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index faaba5f0..0ac7265f 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -2351,7 +2351,8 @@ async function fetchTranslatedText(vm) {
     "WorkOrderFromPMID",
     "CustomerServiceRequest",
     "GenerateQuote",
-    "GeneratePM"
+    "GeneratePM",
+    "NewStatus"
   ]);
 }