From 3ac2fff6d0d8e7925c3b48d5cfa9b4c13ab80114 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 19 Apr 2021 14:31:24 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                             |  8 ++++----
 ayanova/src/api/gzform.js                            | 12 ++++++++++++
 .../components/work-order-item-scheduled-users.vue   | 10 +++++-----
 ayanova/src/components/work-order-items.vue          |  8 ++++----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 99023297..2914d11c 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -142,6 +142,8 @@ todo: Error at the devops server just looking at gold contract:
 
 
 What up with this and can it be blocked from logging / something simpler logged instead?
+	I don't think it's happening at the linux server, it seems to be a comm issue from my ws??
+	bittorrent interferes with it like it does with my browsing, maybe not the cause though, just a data point
 2021-03-17 05:19:27.0750|ERROR|JobsBiz|Server::ProcessJobsAsync unexpected error during processing=>System.Threading.Tasks.TaskCanceledException: The request was canceled due to the configured HttpClient.Timeout of 100 seconds elapsing.
  ---> System.TimeoutException: The operation was canceled.
  ---> System.OperationCanceledException: The operation was canceled.
@@ -236,14 +238,12 @@ todo: many biz objects are not using new PUT methodology
 
 
 
-CURRENTLY DOING: need to test save / delete and error handling on delete (in particular, already tested save), then can proceed
+CURRENTLY DOING: 
 
 
 OVERALL	
 
-	- test partial save (### and delete ###) with fail at each level (make up a fail if have to at server)
-	- Double check full delete still works
-	- make a new wo from scratch and test thoroughly
+	
 	- double check mobile format view is still ok with errors and all
 	- Error messages should display correctly both in alert box and in each item's controls
 	- Decide on and implement "MARKED FOR DELETE" text that shows in sub items, it's just scaffolded in right now
diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 5c9c7cda..6e7d1ff7 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -1029,5 +1029,17 @@ export default {
     setTimeout(function() {
       vm.$router.go(-1);
     }, 2000);
+  },
+  ////////////////////////////////////////
+  // Standard data table row error class
+  //
+  tableRowErrorClass() {
+    return "font-weight-black font-italic error--text ";
+  },
+  ////////////////////////////////////////
+  // Standard data table deleted class
+  //
+  tableRowDeletedClass() {
+    return "text-decoration-line-through ";
   }
 };
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index d90bc240..b355b261 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -65,7 +65,7 @@
             value.items[activeWoItemIndex].scheduledUsers[activeItemIndex]
               .estimatedQuantity
           "
-          :readonly="formState.readOnly"
+          :readonly="formState.readOnly || isDeleted"
           :disabled="isDeleted"
           :label="$ay.t('WorkOrderItemScheduledUserEstimatedQuantity')"
           ref="scheduledUsers.EstimatedQuantity"
@@ -197,11 +197,11 @@ export default {
         `Items[${this.activeWoItemIndex}].ScheduledUsers[${item.index}].`
       );
 
-      if (hasError) {
-        ret = "font-weight-black font-italic error--text ";
-      }
       if (isDeleted) {
-        ret += "text-decoration-line-through text--disabled";
+        ret += this.form().tableRowDeletedClass();
+      }
+      if (hasError) {
+        ret += this.form().tableRowErrorClass();
       }
       return ret;
     }
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 61bf8379..f025f921 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -237,11 +237,11 @@ export default {
         `Items[${item.index}].`
       );
 
-      if (hasError) {
-        ret = "font-weight-black font-italic error--text ";
-      }
       if (isDeleted) {
-        ret += "text-decoration-line-through text--disabled";
+        ret += this.form().tableRowDeletedClass();
+      }
+      if (hasError) {
+        ret += this.form().tableRowErrorClass();
       }
       return ret;
     }