From f3338f9e0839fa6991b3c1d55e48acf5e2905cc5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 16 Sep 2021 23:52:41 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-about.vue      | 12 ++++++---
 ayanova/src/views/home-schedule.vue | 41 ++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index e51cfbd7..be8d9afe 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -70,7 +70,9 @@
           <v-divider class="mt-6"></v-divider>
           <v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
           <div>
-            <span class="ml-6 text-body-1">{{ $ay.t("RegisteredUser") }}: </span>
+            <span class="ml-6 text-body-1"
+              >{{ $ay.t("RegisteredUser") }}:
+            </span>
             <span class="text-body-2">{{
               serverInfo.license.license.licensedTo
             }}</span>
@@ -88,13 +90,17 @@
             }}</span>
           </div>
           <div>
-            <span class="ml-6 text-body-1">{{ $ay.t("LicenseExpiration") }}: </span>
+            <span class="ml-6 text-body-1"
+              >{{ $ay.t("LicenseExpiration") }}:
+            </span>
             <span class="text-body-2">{{
               serverInfo.license.license.licenseExpiration
             }}</span>
           </div>
           <div>
-            <span class="ml-6 text-body-1">{{ $ay.t("SupportedUntil") }}: </span>
+            <span class="ml-6 text-body-1"
+              >{{ $ay.t("SupportedUntil") }}:
+            </span>
             <span class="text-body-2">{{
               serverInfo.license.license.maintenanceExpiration
             }}</span>
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index f5992cec..c2122c80 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -122,21 +122,36 @@
                 wotags = w.Tags,
                 woitemtags = w.Items[0].Tags -->
               <div>
-                <span class="text-h6">{{ $ay.t("WorkOrder") }}: </span>
-                <span class="text-body-1"
+                <span class="text-h6">{{ $ay.t("WorkOrder") }}:</span>
+                <span class="text-body-1 ml-2"
                   >{{ evInfo.serial }}&nbsp; {{ evInfo.customerViz }}</span
                 >
               </div>
               <div>
-                <span class="text-h6">{{ $ay.t("DashboardScheduled") }}: </span>
+                <span class="text-h6">{{ $ay.t("DashboardScheduled") }}:</span>
                 <span class="text-body-1"
                   >{{ $ay.dt(evInfo.startDate) }}&nbsp;&mdash;&nbsp;{{
                     $ay.dt(evInfo.stopDate)
                   }}</span
                 >
               </div>
+              <div>
+                <span class="text-h6"
+                  >{{
+                    $ay.t("WorkOrderItemScheduledUserEstimatedQuantity")
+                  }}:</span
+                >
+                <span class="text-body-1">{{ evInfo.qty }}</span>
+              </div>
+              <div>
+                <span class="text-h6"
+                  >{{ $ay.t("WorkOrderItemScheduledUserServiceRateID") }}:</span
+                >
+                <span class="text-body-1">{{ evInfo.rate }}</span>
+              </div>
+
               <div v-if="evInfo.haswostatus">
-                <span class="text-h6">{{ $ay.t("WorkOrderStatus") }}: </span>
+                <span class="text-h6">{{ $ay.t("WorkOrderStatus") }}:</span>
                 <span class="text-body-1">{{ evInfo.wostatus }}</span>
                 <v-icon :color="evInfo.wostatuscolor" class="ml-4"
                   >$ayiFlag</v-icon
@@ -157,8 +172,8 @@
 
               <div>
                 <span class="text-h6"
-                  >{{ $ay.t("WorkOrderItemSummary") }}:
-                </span>
+                  >{{ $ay.t("WorkOrderItemSummary") }}:</span
+                >
                 <span class="text-body-1">
                   <v-icon class="mr-3" :color="evInfo.woitemstatuscolor"
                     >$ayiCircle</v-icon
@@ -168,15 +183,15 @@
 
               <div>
                 <span class="text-h6"
-                  >{{ $ay.t("WorkOrderItemPriorityID") }}:
-                </span>
+                  >{{ $ay.t("WorkOrderItemPriorityID") }}:</span
+                >
                 <span class="text-body-1">
                   <v-icon class="mr-3" :color="evInfo.woitemprioritycolor"
                     >$ayiFireAlt</v-icon
                   >{{ evInfo.woitempriority }}</span
                 >
               </div>
-
+              TODO: TAGS
               {{ selectedEvent }}
               {{ evInfo }}
             </div>
@@ -318,7 +333,7 @@ export default {
       selectedElement: null,
       selectedOpen: false,
       events: [],
-      evInfo: null,
+      evInfo: {},
       formState: {
         ready: false,
         dirty: false,
@@ -400,7 +415,7 @@ export default {
     async showevInfo({ nativeEvent, event }) {
       //console.log("showevInfo:event ", JSON.stringify(event));
       let route = null;
-      this.evInfo = null;
+      this.evInfo = {};
 
       switch (event.type) {
         case window.$gz.type.WorkOrderItemScheduledUser:
@@ -669,7 +684,9 @@ async function fetchTranslatedText(vm) {
     "DashboardScheduled",
     "WorkOrderItemPriorityID",
     "WorkOrderItemSummary",
-    "WorkOrderStatus"
+    "WorkOrderStatus",
+    "WorkOrderItemScheduledUserEstimatedQuantity",
+    "WorkOrderItemScheduledUserServiceRateID"
   ]);
 }
 </script>