From 6b4993e366e57ea9e13220ffb9176e295b37ca65 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 8 May 2021 13:40:27 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                      |  4 ++
 .../work-order-item-scheduled-users.vue       | 43 ++++++++-----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index d3ec03a5..161df23b 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -55,6 +55,8 @@ todo: workorders - need to set billing and service address from customers on mig
 
 ## CLIENT MISC ITEMS
 
+todo: custom required rules only apply to new records!!
+
 todo: Translation: "Physical" address seems wierd, rename to Street address or Delivery address or Service Address or whatever
 todo: broken rules can't save should color save button red in addition to disabled some forms can't see what's what
 todo: Any "Priority" type value in UI that has colors should use ayaFireAlt icon instead of round circle which is for minor status only
@@ -153,6 +155,8 @@ todo: cypress testing for load testing etc
 
 ## SERVER MISC ITEMS
 
+todo: custom required rules only apply to new records!!
+
 todo: Reports need to generate under a file name that is informative (this applies to every object)
 	This is because it will be a common case to need to email them to customers or other users or whatever and it is very helpful to know what it is by name alone.
 	i.e. a workorder should generate a report that can be saved as "Workorder_1" or whatever, 
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index ac6643a3..7c3c2131 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -417,12 +417,7 @@ export default {
   */
       let headers = [];
 
-      if (
-        this.form().showMe(
-          this,
-          "ScheduledUsers.WorkOrderItemScheduledUserStartDate"
-        )
-      ) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserStartDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserStartDate"),
           align: "right",
@@ -430,12 +425,7 @@ export default {
         });
       }
 
-      if (
-        this.form().showMe(
-          this,
-          "ScheduledUsers.WorkOrderItemScheduledUserStopDate"
-        )
-      ) {
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserStopDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserStopDate"),
           align: "right",
@@ -444,10 +434,7 @@ export default {
       }
 
       if (
-        this.form().showMe(
-          this,
-          "ScheduledUsers.WorkOrderItemScheduledUserEstimatedQuantity"
-        )
+        this.form().showMe(this, "WorkOrderItemScheduledUserEstimatedQuantity")
       ) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserEstimatedQuantity"),
@@ -456,17 +443,21 @@ export default {
         });
       }
 
-      headers.push({
-        text: this.$ay.t("WorkOrderItemScheduledUserUserID"),
-        align: "left",
-        value: "userViz"
-      });
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserUserID")) {
+        headers.push({
+          text: this.$ay.t("WorkOrderItemScheduledUserUserID"),
+          align: "left",
+          value: "userViz"
+        });
+      }
 
-      headers.push({
-        text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"),
-        align: "left",
-        value: "rateViz"
-      });
+      if (this.form().showMe(this, "WorkOrderItemScheduledUserServiceRateID")) {
+        headers.push({
+          text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"),
+          align: "left",
+          value: "rateViz"
+        });
+      }
 
       return headers;
     },