From b47dfe6793193775243236fed277ac0c55d3ae74 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 16 Apr 2021 18:02:05 +0000
Subject: [PATCH]

---
 .../components/work-order-item-scheduled-users.vue  |  8 ++++++++
 ayanova/src/components/work-order-items.vue         | 13 +++++++++++++
 ayanova/src/views/svc-workorder.vue                 |  7 ++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 97dda5e3..464aaebf 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -207,6 +207,14 @@ export default {
   },
   computed: {
     isDeleted: function() {
+      if (
+        this.value.items[this.activeWoItemIndex].scheduledUsers[
+          this.activeItemIndex
+        ] == null
+      ) {
+        this.setDefaultView();
+        return true;
+      }
       return (
         this.value.items[this.activeWoItemIndex].scheduledUsers[
           this.activeItemIndex
diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index 5ee50924..0eed5c45 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -149,7 +149,19 @@ export default {
       default: null,
       type: Object
     }
+    // ,    resetSelections: {
+    //   default: false,
+    //   type: Boolean
+    // }
   },
+  // watch: {
+  //   resetSelections: function(newValue, oldValue) {
+  //     if (newValue != oldValue) {
+  //       // this.activeItemIndex = null;
+  //       // this.selectedRow = [];
+  //     }
+  //   }
+  // },
   methods: {
     newItem() {
       let newIndex = this.value.items.length;
@@ -244,6 +256,7 @@ export default {
   },
   computed: {
     isDeleted: function() {
+      console.trace("woitems isDeleted:", this.activeItemIndex);
       return this.value.items[this.activeItemIndex].deleted === true;
     },
     headerList: function() {
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 6d227161..d29cab3a 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -30,6 +30,7 @@
       ></v-progress-circular>
     </template>
   </div>
+  <!-- :reset-selections="resetSelections" -->
 </template>
 
 <script>
@@ -166,6 +167,7 @@ export default {
       timeZoneName: window.$gz.locale.getResolvedTimeZoneName(),
       languageName: window.$gz.locale.getResolvedLanguage(),
       hour12: window.$gz.locale.getHour12(),
+      // resetSelections: false,
       selectLists: {
         wostatus: [],
         allowedwostatus: []
@@ -401,6 +403,9 @@ export default {
         //into a single error collection for display as normal
         //########################################################
 
+        // //first of all reset all selections (toggle) so that children aren't stuck with an active item that is going to be deleted
+        // this.resetSelections = !this.resetSelections;
+
         const isPost = vm.obj.id == 0;
 
         let err = {
@@ -788,8 +793,8 @@ async function deleteItems(vm, err) {
     } else {
       vm.obj.items.splice(i, 1);
     }
-    return err;
   }
+  return err;
 }
 
 async function saveItems(vm, err) {