From 38820ccb5be53fd6345b7079f92f89d65e118280 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 6 Apr 2021 23:56:07 +0000
Subject: [PATCH]

---
 .../work-order-item-scheduled-users.vue       | 50 +++++++++++--------
 ayanova/src/views/svc-workorder.vue           |  7 ++-
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 3fa2eecc..2f8ae1ba 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -67,6 +67,7 @@
     <div v-if="pvm.hasSelectedWoItem">
       {{ value.items[pvm.selectedItemIndex].scheduledUsers }}
     </div> -->
+    {{ value.items[pvm.selectedItemIndex].scheduledUsers }}
   </div>
 </template>
 <script>
@@ -166,7 +167,7 @@ IN ORDER: start, stop, quantity, user, rate
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserEstimatedQuantity"),
           align: "right",
-          value: "quantity"
+          value: "estimatedQuantity"
         });
       }
 
@@ -186,27 +187,32 @@ IN ORDER: start, stop, quantity, user, rate
       return headers;
     },
     itemList: function() {
-      return this.value.items.map((x, i) => {
-        return {
-          index: i,
-          id: x.id,
-          startDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-            x.startDate,
-            this.pvm.timeZoneName,
-            this.pvm.languageName,
-            this.pvm.hour12
-          ),
-
-          stopDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-            x.stopDate,
-            this.pvm.timeZoneName,
-            this.pvm.languageName,
-            this.pvm.hour12
-          ),
-          userViz: x.userViz,
-          rateViz: x.rateViz
-        };
-      });
+      return this.value.items[this.pvm.selectedItemIndex].scheduledUsers.map(
+        (x, i) => {
+          return {
+            index: i,
+            id: x.id,
+            startDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+              x.startDate,
+              this.pvm.timeZoneName,
+              this.pvm.languageName,
+              this.pvm.hour12
+            ),
+            stopDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+              x.stopDate,
+              this.pvm.timeZoneName,
+              this.pvm.languageName,
+              this.pvm.hour12
+            ),
+            estimatedQuantity: window.$gz.locale.decimalLocalized(
+              x.estimatedQuantity,
+              this.pvm.languageName
+            ),
+            userViz: x.userViz,
+            rateViz: x.rateViz
+          };
+        }
+      );
     },
     formState: function() {
       return this.pvm.formState;
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index f8fa90ed..e9ded253 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -847,7 +847,12 @@ async function fetchTranslatedText(vm) {
     "WorkOrderItemWorkOrderStatusID",
     "WorkOrderItemRequestDate",
     "WorkOrderItemPriorityID",
-    "WorkOrderItemWarrantyService"
+    "WorkOrderItemWarrantyService",
+    "WorkOrderItemScheduledUserStartDate",
+    "WorkOrderItemScheduledUserStopDate",
+    "WorkOrderItemScheduledUserEstimatedQuantity",
+    "WorkOrderItemScheduledUserUserID",
+    "WorkOrderItemScheduledUserServiceRateID"
   ]);
 }