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

---
 ayanova/devdocs/todo.txt                                  | 2 --
 ayanova/src/components/work-order-item-expenses.vue       | 8 ++++++--
 ayanova/src/components/work-order-item-labors.vue         | 4 ++--
 .../src/components/work-order-item-scheduled-users.vue    | 8 ++++++--
 ayanova/src/components/work-order-item-travels.vue        | 8 ++++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 119f5035..cf528992 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -458,8 +458,6 @@ Subcontractor / tech limited modifications
 
 
 
-
-
 todo: units on work order are not limited to customer on work order??
 todo: looks like wont' need subrights system, need to disentangle and remove it from workorder
 todo: Status on work order doesn't seem to be preventing "Who can select" by role properly
diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue
index 2ab7f0ad..dde6cf0f 100644
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -509,8 +509,12 @@ export default {
         chargeTaxCodeId: null,
         taxCodeViz: null,
         reimburseUser: false,
-        userId: null,
-        userViz: null,
+        userId: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userId
+          : null,
+        userViz: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userName
+          : null,
         chargeToCustomer: false,
         isDirty: true,
         workOrderItemId: this.value.items[this.activeWoItemIndex].id,
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 1b9d745d..27721b0b 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -523,7 +523,7 @@ export default {
       this.value.items[this.activeWoItemIndex].labors.push({
         id: 0,
         concurrency: 0,
-        userId: this.value.userIsRestrictedType
+        userId: this.$store.getters.isScheduleableUser
           ? this.$store.state.userId
           : null,
         serviceStartDate: null,
@@ -538,7 +538,7 @@ export default {
         isDirty: true,
         workOrderItemId: this.value.items[this.activeWoItemIndex].id,
         uid: Date.now(),
-        userViz: this.value.userIsRestrictedType
+        userViz: this.$store.getters.isScheduleableUser
           ? this.$store.state.userName
           : null,
         serviceRateViz: null,
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 7819d063..f89367e6 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -386,7 +386,9 @@ export default {
       this.value.items[this.activeWoItemIndex].scheduledUsers.push({
         id: 0,
         concurrency: 0,
-        userId: null,
+        userId: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userId
+          : null,
         estimatedQuantity: 0,
         startDate: null,
         stopDate: null,
@@ -394,7 +396,9 @@ export default {
         isDirty: true,
         workOrderItemId: this.value.items[this.activeWoItemIndex].id,
         uid: Date.now(),
-        userViz: null,
+        userViz: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userName
+          : null,
         serviceRateViz: null
       });
       this.$emit("change");
diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue
index e5452b77..2120405d 100644
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -500,7 +500,9 @@ export default {
       this.value.items[this.activeWoItemIndex].travels.push({
         id: 0,
         concurrency: 0,
-        userId: null,
+        userId: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userId
+          : null,
         travelStartDate: null,
         travelStopDate: null,
         travelRateId: null,
@@ -513,7 +515,9 @@ export default {
         isDirty: true,
         workOrderItemId: this.value.items[this.activeWoItemIndex].id,
         uid: Date.now(),
-        userViz: null,
+        userViz: this.$store.getters.isScheduleableUser
+          ? this.$store.state.userName
+          : null,
         travelRateViz: null,
         taxCodeViz: null
       });