From bfeaed4635bdd2ec2f28069b14415a72eeed6c42 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 15 Apr 2021 21:05:29 +0000
Subject: [PATCH]

---
 ayanova/src/api/gzform.js                     | 20 ++++++++++++++++---
 .../work-order-item-scheduled-users.vue       |  9 +++------
 ayanova/src/components/work-order-items.vue   |  3 ++-
 ayanova/src/views/inv-purchase-order.vue      |  3 ++-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 4295fc48..e75de4a8 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -685,7 +685,7 @@ export default {
   // (actual errors not returned just for row indicator,
   // user opens child edit form to see exact error)
   //
-  childRowHasError(vm, collectionName, rowIndex) {
+  childRowHasError(vm, path) {
     //Note: this just shows server errors, not local form validation errors
     //it's assumed user will fix in form or when they submit see the error come back
     //Note: this method is easily converted to return actual errors if it ever makes sense to do that but for now I'm ok with row TTM
@@ -702,17 +702,31 @@ export default {
       return null;
     }
 
+    path = path.toLowerCase();
     //Might be an error, check if collectionName is in error collection
     //this is what we're dealing with
     // { "code": "2200", "details": [ { "message": "LT:PurchaseOrderReceiptItemQuantityReceivedErrorInvalid", "target": "Items[0].QuantityReceived", "error": "2203" } ], "message": "ErrorAPI2200" }
-    let rowErrorTargetStart = `${collectionName}[${rowIndex}].`.toLowerCase();
+    //and this: target: "Items[3].scheduledUsers[1].EstimatedQuantity"
+
+    // let rowErrorTargetStart = `${collectionName}[${rowIndex}].`.toLowerCase();
+    // console.log("childRowHasError", {
+    //   rowErrorTargetStart: rowErrorTargetStart,
+    //   collectionName: collectionName,
+    //   rowIndex: rowIndex
+    // });
+
+    // {
+    //   "rowErrorTargetStart": "scheduledusers[1].",
+    //   "collectionName": "ScheduledUsers",
+    //   "rowIndex": 1
+    // }
 
     //filter in items that start with the row collection name and index provided
     return vm.formState.serverError.details.some(function(o) {
       if (!o.target) {
         return false;
       }
-      return o.target.toLowerCase().includes(rowErrorTargetStart);
+      return o.target.toLowerCase().includes(path);
     });
   },
   ///////////////////////////////
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 4edbb8e1..501f23b2 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -52,11 +52,6 @@
       </v-col>
     </template>
     <template v-if="activeItemIndex != null">
-      {{
-        `Items[${activeWoItemIndex}].scheduledUsers[
-              ${activeItemIndex}
-            ].estimatedQuantity`
-      }}
       <v-col cols="12" sm="6" lg="4" xl="3">
         <gz-decimal
           v-model="
@@ -187,7 +182,9 @@ export default {
       }
     },
     itemRowClasses: function(item) {
-      if (this.form().childRowHasError(this, "ScheduledUsers", item.index)) {
+      //"Items[3].scheduledUsers[1].
+      const path = `Items[${this.activeWoItemIndex}].ScheduledUsers[${item.index}].`;
+      if (this.form().childRowHasError(this, path)) {
         return "font-weight-black font-italic error--text";
       }
     }
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index a58c62d8..64101c1f 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -216,7 +216,8 @@ export default {
       }
     },
     itemRowClasses: function(item) {
-      if (this.form().childRowHasError(this, "Items", item.index)) {
+      const path = `Items[${item.index}].`;
+      if (this.form().childRowHasError(this, path)) {
         return "font-weight-black font-italic error--text";
       }
     }
diff --git a/ayanova/src/views/inv-purchase-order.vue b/ayanova/src/views/inv-purchase-order.vue
index f091853e..876c46b3 100644
--- a/ayanova/src/views/inv-purchase-order.vue
+++ b/ayanova/src/views/inv-purchase-order.vue
@@ -1322,7 +1322,8 @@ export default {
       this.requestSelectDialog = true;
     },
     poItemsRowClasses: function(item) {
-      if (this.form().childRowHasError(this, "Items", item.index)) {
+      const path = `Items[${item.index}].`;
+      if (this.form().childRowHasError(this, path)) {
         return "font-weight-black font-italic error--text";
       }
     },