From e1bc340c504cb20aa7d1c15e251c8e9b52bbc12d Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 24 May 2021 22:04:29 +0000
Subject: [PATCH]

---
 .../src/components/work-order-item-tasks.vue  | 36 ++++++++++---------
 ayanova/src/components/work-order-items.vue   | 17 ++++++++-
 ayanova/src/views/svc-workorder.vue           |  6 +++-
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index de203ced..ccaa6fbb 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -6,7 +6,7 @@
           <template v-slot:activator="{ on, attrs }">
             <div class="text-h6">
               <v-icon large color="primary" class="mr-2">$ayiTasks</v-icon>
-              {{ $ay.t("WorkOrderItemTaskList") }}
+              {{ $ay.t("WorkOrderItemTasks") }}
               <v-btn v-if="!parentDeleted" large icon v-bind="attrs" v-on="on">
                 <v-icon small color="primary">$ayiEllipsisV</v-icon>
               </v-btn>
@@ -473,22 +473,24 @@ export default {
       return headers;
     },
     itemList: function() {
-      return this.value.items[this.activeWoItemIndex].tasks.map((x, i) => {
-        return {
-          index: i,
-          id: x.id,
-          sequence: x.sequence,
-          task: x.task,
-          completedByUserViz: x.completedByUserViz,
-          statusViz: x.statusViz,
-          completedDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-            x.completedDate,
-            this.pvm.timeZoneName,
-            this.pvm.languageName,
-            this.pvm.hour12
-          )
-        };
-      });
+      return this.value.items[this.activeWoItemIndex].tasks
+        .map((x, i) => {
+          return {
+            index: i,
+            id: x.id,
+            sequence: x.sequence,
+            task: x.task,
+            completedByUserViz: x.completedByUserViz,
+            statusViz: x.statusViz,
+            completedDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+              x.completedDate,
+              this.pvm.timeZoneName,
+              this.pvm.languageName,
+              this.pvm.hour12
+            )
+          };
+        })
+        .sort((a, b) => a.sequence - b.sequence);
     },
     formState: function() {
       return this.pvm.formState;
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 11997e37..175074bd 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -368,6 +368,19 @@
             @change="$emit('change')"
           />
         </v-col>
+        <v-col cols="12">
+          <GzWoItemTasks
+            v-if="
+              pvm.subRights.tasks.visible &&
+                form().showMe(this, 'WorkOrderItemTaskList')
+            "
+            v-model="value"
+            :pvm="pvm"
+            :active-wo-item-index="activeItemIndex"
+            data-cy="woItemTasks"
+            @change="$emit('change')"
+          />
+        </v-col>
         <v-col cols="12">
           <GzWoItemLabors
             v-if="
@@ -419,13 +432,15 @@ import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-user
 import GzWoItemLabors from "../components/work-order-item-labors.vue";
 import GzWoItemTravels from "../components/work-order-item-travels.vue";
 import GzWoItemExpenses from "../components/work-order-item-expenses.vue";
+import GzWoItemTasks from "../components/work-order-item-tasks.vue";
 
 export default {
   components: {
     GzWoItemScheduledUsers,
     GzWoItemExpenses,
     GzWoItemLabors,
-    GzWoItemTravels
+    GzWoItemTravels,
+    GzWoItemTasks
   },
   created() {
     this.setDefaultView();
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 3e5777ae..6d2d296c 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1456,7 +1456,11 @@ async function fetchTranslatedText(vm) {
     "WorkOrderItemTravelNoChargeQuantity",
     "WorkOrderItemTravelTaxRateSaleID",
     "WorkOrderItemTravelPrice",
-
+    "WorkOrderItemTaskTaskID",
+    "WorkOrderItemTaskWorkOrderItemTaskCompletionType",
+    "WorkOrderItemTaskUser",
+    "WorkOrderItemTaskCompletedDate",
+    "WorkOrderItemTasks",
     "SaveRecordToProceed",
     "Cost",
     "ListPrice",