From 577eda86767dc79178fb129dc8dcddf81a11403f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 24 Jan 2022 22:58:10 +0000
Subject: [PATCH]

---
 .../work-order-item-scheduled-users.vue       | 20 +++++++++----------
 .../src/components/work-order-item-units.vue  |  2 +-
 ayanova/src/components/work-order-items.vue   | 12 +++++------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 5bd8a06b..5c3861eb 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -102,7 +102,7 @@
         >
 
         <v-col
-          v-if="form().showMe(this, 'StartDate')"
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserStartDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -135,7 +135,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'StopDate')"
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserStopDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -214,7 +214,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ScheduledUserID')"
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserUserID')"
           cols="12"
           sm="6"
           lg="4"
@@ -240,7 +240,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserId`
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
               )
             "
             @input="
@@ -253,7 +253,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ScheduledUserServiceRateID')"
+          v-if="form().showMe(this, 'WorkOrderItemScheduledUserServiceRateID')"
           cols="12"
           sm="6"
           lg="4"
@@ -279,7 +279,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserserviceRateId`
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId`
               )
             "
             @input="
@@ -343,7 +343,7 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "StartDate")) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserStartDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserStartDate"),
           align: "right",
@@ -351,7 +351,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "StopDate")) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserStopDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserStopDate"),
           align: "right",
@@ -366,7 +366,7 @@ export default {
         value: "estimatedQuantity"
       });
 
-      if (this.form().showMe(this, "ScheduledUserID")) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserUserID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserUserID"),
           align: "left",
@@ -374,7 +374,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ScheduledUserServiceRateID")) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserServiceRateID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"),
           align: "left",
diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index 5890d1e7..6d7c6ffa 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -181,7 +181,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].units[${activeItemIndex}].workOrderItemUnitNotes`
+                `Items[${activeWoItemIndex}].units[${activeItemIndex}].notes`
               )
             "
             data-cy="unitUnitNotes"
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 87eee1e3..4dd91fc6 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -306,7 +306,7 @@
           ></v-text-field>
         </v-col>
 
-        <v-col v-if="form().showMe(this, 'TechNotes')" cols="12">
+        <v-col v-if="form().showMe(this, 'WorkOrderItemTechNotes')" cols="12">
           <v-textarea
             :ref="`items[${activeItemIndex}].techNotes`"
             v-model="value.items[activeItemIndex].techNotes"
@@ -324,7 +324,8 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'RequestDate') && !value.userIsRestrictedType
+            form().showMe(this, 'WorkOrderItemRequestDate') &&
+              !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -496,10 +497,7 @@
             :readonly="formState.readOnly"
             data-cy="tags"
             :error-messages="
-              form().serverErrors(
-                this,
-                `items[${activeItemIndex}].workOrderItemTags`
-              )
+              form().serverErrors(this, `items[${activeItemIndex}].tags`)
             "
             @input="fieldValueChanged('tags')"
           ></gz-tag-picker>
@@ -802,7 +800,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "RequestDate") &&
+        this.form().showMe(this, "WorkOrderItemRequestDate") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({