fixed set last report menu item making save icon appear available

ayanova/devdocs/todo.txt

@@ -243,7 +243,8 @@ TODO: 1 BETA DOCS:
   \_____|______|_____|______|_| \_|  |_|   
                                            
 
-- 1 bugbug?:open vendor, print report, go back it shows as savable all of a sudden despite no changes made in UI, also does not give dirty save prompt when leave it even though save icon is showing enabled bold
+
+
 - 1 fixed?? changed to attachment files path : for some reason user files path is blank in server settings under ops in ayanova app on linux desktop when using the single data path folder, check in windows
 
 - 1 todo: firefox schedule fix: https://github.com/vuetifyjs/vuetify/issues/14243#issuecomment-944907925
@@ -252,7 +253,7 @@ TODO: 1 BETA DOCS:
 - 1 translation cleanup, work order sb Orden de trabajo but is translated as Pedido?! (which is very generic and not work order, usually like a restaurant order or online shipping order sense for pedido)
 	I did a couple but realized it needs to be done one by one roundtripped carefully as it's used in alternative tenses and forms throughout
 
-
+- 1 todo: put reset link somewhere in UI so user can just click on it, maybe the login form?? Or the About form?
 
 - 2 todo: First print if it's downloading or will need to download chromium it should state there will be a delay while it attempts to download and install chromium render engine
 	or maybe trigger it on first boot?
@@ -841,7 +842,7 @@ BUILD 8.0.0-beta.0.9 CHANGES OF NOTE
 - opened up log files and server configuration even when server is locked to allow for troubleshooting ability with locked server
 - changed unlicensed mode at client from only showing a license option in menu to now showing a limited OPS section with view logs and view server config as options
 	this allows troubleshooting a not yet licensed server installation and also for when a license expires "unexpectedly"
-
+- fixed bug where printing a report would make the save icon show as available due to setting last report in menu
 
 
 

ayanova/src/api/gzform.js

@@ -914,7 +914,7 @@ export default {
   }, ////////////////////////////////////
   //  Set last report used in form settings
   //
-  setLastReport(formKey, reportSelected) {
+  setLastReportMenuItem(formKey, reportSelected, vm) {
     let fs = window.$gz.store.state.formSettings[formKey];
     if (fs == null) {
       fs = {};
@@ -925,6 +925,14 @@ export default {
       formKey: formKey,
       formSettings: fs
     });
+
+    window.$gz.eventBus.$emit("menu-upsert-last-report", {
+      title: reportSelected.name,
+      notrans: true,
+      icon: "$ayiFileAlt",
+      key: formKey + ":report:" + reportSelected.id,
+      vm: vm
+    });
   }, ////////////////////////////////////
   //  Add no selection item
   // Used by forms that need the option of an unselected

ayanova/src/api/gzmenu.js

@@ -200,25 +200,61 @@ export default {
       });
     }
   },
-  ///////////////////////////////
-  // CHANGE HANDLER
+  //Unused to date of beta 0.9
+  // ///////////////////////////////
+  // // CHANGE HANDLER
+  // //
+  // // Deal with a menu item update request
+  // // called from App.vue
+  // handleReplaceMenuItem(vm, newItem) {
+  //   if (!vm.appBar.menuItems || !newItem) {
+  //     return;
+  //   }
+  //   //Find the key that is in the collection and replace it
+  //   for (let i = 0; i < vm.appBar.menuItems.length; i++) {
+  //     if (vm.appBar.menuItems[i].key == newItem.key) {
+  //       //NOTE: since we are adding a new object, it has no reactivity in it so we need to use the Vue.Set to set it which
+  //       //automatically adds the setters and getters that trigger reactivity
+  //       //If it was set directly on the array it wouldn't update the UI
+  //       vm.$set(vm.appBar.menuItems, i, newItem);
+  //       return;
+  //     }
+  //   }
+  // },
+  //////////////////////////////////////////////
+  // LAST REPORT CHANGE HANDLER
+  // update / add last report menu item
   //
-  // Deal with a menu item update request
-  // called from App.vue
-  handleReplaceMenuItem(vm, newItem) {
+  handleUpsertLastReport(vm, newItem) {
     if (!vm.appBar.menuItems || !newItem) {
       return;
     }
-    //Find the key that is in the collection and replace it
+
+    /*
+      window.$gz.eventBus.$emit("menu-upsert-last-report", {
+      title: reportSelected.name,
+      notrans: true,
+      icon: "$ayiFileAlt",
+      key: formKey + ":report:" + reportSelected.id,
+      vm: vm
+    });
+    */
+    //Find the last report key and update it if present
     for (let i = 0; i < vm.appBar.menuItems.length; i++) {
-      if (vm.appBar.menuItems[i].key == newItem.key) {
-        //NOTE: since we are adding a new object, it has no reactivity in it so we need to use the Vue.Set to set it which
-        //automatically adds the setters and getters that trigger reactivity
-        //If it was set directly on the array it wouldn't update the UI
-        vm.$set(vm.appBar.menuItems, i, newItem);
+      var key = vm.appBar.menuItems[i].key;
+      if (key && key.includes(":report:")) {
+        vm.appBar.menuItems[i].key = newItem.key;
+        vm.appBar.menuItems[i].title = newItem.title;
         return;
       }
     }
+    //No prior last report so slot it in under the report one
+    for (let i = 0; i < vm.appBar.menuItems.length; i++) {
+      var key = vm.appBar.menuItems[i].key;
+      if (key && key.endsWith(":report")) {
+        vm.appBar.menuItems.splice(i + 1, 0, newItem);
+      }
+    }
   },
   ///////////////////////////////
   // ENABLE / DISABLE HANDLER
@@ -355,11 +391,19 @@ export default {
       that.handleMenuChange(vm, ctx);
     });
 
-    window.$gz.eventBus.$on("menu-replace-item", function handleReplaceMenuItem(
-      newItem
-    ) {
-      that.handleReplaceMenuItem(vm, newItem);
-    });
+    //currently as of beta 0.9 unused anywhere
+    // window.$gz.eventBus.$on("menu-replace-item", function handleReplaceMenuItem(
+    //   newItem
+    // ) {
+    //   that.handleReplaceMenuItem(vm, newItem);
+    // });
+
+    window.$gz.eventBus.$on(
+      "menu-upsert-last-report",
+      function handleUpsertLastReport(newItem) {
+        that.handleUpsertLastReport(vm, newItem);
+      }
+    );
 
     window.$gz.eventBus.$on("menu-disable-item", function handleDisableMenuItem(
       key

ayanova/src/views/acc-service-bank.vue

@@ -352,8 +352,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/acc-service-banks.vue

@@ -121,8 +121,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/acc-service-rate.vue

@@ -513,8 +513,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/acc-service-rates.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/acc-tax-code.vue

@@ -476,8 +476,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/acc-tax-codes.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/acc-travel-rate.vue

@@ -499,8 +499,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/acc-travel-rates.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/adm-translation.vue

@@ -486,8 +486,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/adm-user.vue

@@ -858,8 +858,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "directnotify":
         if (m.vm.obj.id == 0) {

ayanova/src/views/adm-users.vue

@@ -79,8 +79,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "directnotify":

ayanova/src/views/cust-customer-note.vue

@@ -346,8 +346,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/cust-customer-notes.vue

@@ -102,8 +102,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/cust-customer.vue

@@ -1275,8 +1275,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({

ayanova/src/views/cust-customers.vue

@@ -112,8 +112,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/cust-head-office.vue

@@ -1187,8 +1187,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({

ayanova/src/views/cust-head-offices.vue

@@ -83,8 +83,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/cust-user.vue

@@ -850,8 +850,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "directnotify":
         //nav to direct notify with list of users appended to route

ayanova/src/views/cust-users.vue

@@ -73,8 +73,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "directnotify":

ayanova/src/views/customer-workorders.vue

@@ -97,8 +97,7 @@ async function clickHandler(menuItem) {
       //     if (res == null) {
       //       return;
       //     }
-      //     window.$gz.form.setLastReport(FORM_KEY, res);
-      //     generateMenu(m.vm);
+      //window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   }
       //   break;
 

ayanova/src/views/home-memo.vue

@@ -514,8 +514,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "reply":
         m.vm.replyForward(false);

ayanova/src/views/home-memos.vue

@@ -79,8 +79,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/home-reminder.vue

@@ -454,8 +454,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/home-reminders.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/home-review.vue

@@ -528,8 +528,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/home-reviews.vue

@@ -110,8 +110,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/home-schedule.vue

@@ -954,8 +954,7 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({

ayanova/src/views/inv-part-assemblies.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-part-assembly.vue

@@ -612,8 +612,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
 
       default:

ayanova/src/views/inv-part-inventory-transactions.vue

@@ -126,8 +126,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-part-inventory.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-part-requests.vue

@@ -112,8 +112,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-part-warehouse.vue

@@ -401,8 +401,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "PartByWarehouseInventoryList":
         m.vm.$router.push({

ayanova/src/views/inv-part-warehouses.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-part.vue

@@ -619,8 +619,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "PartSerialNumbersAvailable":
         m.vm.$router.push({

ayanova/src/views/inv-parts.vue

@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/inv-purchase-order.vue

@@ -1767,8 +1767,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/inv-purchase-orders.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-contract.vue

@@ -1783,8 +1783,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/svc-contracts.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-csr.vue

@@ -687,8 +687,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/svc-csrs.vue

@@ -84,8 +84,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-loaner.vue

@@ -741,8 +741,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({

ayanova/src/views/svc-loaners.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-meter-reading.vue

@@ -304,8 +304,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/svc-meter-readings.vue

@@ -86,8 +86,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-pm-item-expenses.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-labors.vue

@@ -116,8 +116,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-loans.vue

@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-outside-services.vue

@@ -81,8 +81,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-parts.vue

@@ -114,8 +114,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-scheduled-users.vue

@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-tasks.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-travels.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-item-units.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm-items.vue

@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "PMList":

ayanova/src/views/svc-pm.vue

@@ -1694,8 +1694,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({

ayanova/src/views/svc-pms.vue

@@ -174,8 +174,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":

ayanova/src/views/svc-project.vue

@@ -483,8 +483,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "WorkOrderList":
         m.vm.$router.push({

ayanova/src/views/svc-projects.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-quote-item-expenses.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-labors.vue

@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-loans.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-outside-services.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-parts.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-scheduled-users.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-tasks.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-travels.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-item-units.vue

@@ -113,8 +113,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote-items.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "QuoteList":

ayanova/src/views/svc-quote.vue

@@ -1748,8 +1748,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({

ayanova/src/views/svc-quotes.vue

@@ -176,8 +176,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":

ayanova/src/views/svc-schedule-user.vue

@@ -867,8 +867,8 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+      //
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({

ayanova/src/views/svc-schedule.vue

@@ -944,8 +944,8 @@ async function clickHandler(menuItem) {
       //   if (res == null) {
       //     return;
       //   }
-      //   window.$gz.form.setLastReport(FORM_KEY, res);
-      //   generateMenu(m.vm);
+
+      // window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
       //   break;
       case "WorkOrderItemScheduledUserList":
         m.vm.$router.push({

ayanova/src/views/svc-task-group.vue

@@ -547,8 +547,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/svc-unit-model.vue

@@ -552,8 +552,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       default:
         window.$gz.eventBus.$emit(

ayanova/src/views/svc-unit-models.vue

@@ -80,8 +80,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-unit.vue

@@ -1142,8 +1142,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({

ayanova/src/views/svc-units.vue

@@ -111,8 +111,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default:

ayanova/src/views/svc-workorder-item-expenses.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-labors.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-loans.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-outside-services.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 

ayanova/src/views/svc-workorder-item-part-requests.vue

@@ -82,8 +82,8 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-parts.vue

@@ -115,8 +115,8 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 

ayanova/src/views/svc-workorder-item-scheduled-users.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-tasks.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
 

ayanova/src/views/svc-workorder-item-travels.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-item-units.vue

@@ -115,8 +115,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder-items.vue

@@ -82,8 +82,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderList":

ayanova/src/views/svc-workorder.vue

@@ -1917,8 +1917,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({

ayanova/src/views/svc-workorders.vue

@@ -178,8 +178,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       case "WorkOrderItemList":

ayanova/src/views/vendor.vue

@@ -986,8 +986,7 @@ async function clickHandler(menuItem) {
         if (res == null) {
           return;
         }
-        window.$gz.form.setLastReport(FORM_KEY, res);
-        generateMenu(m.vm);
+        window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         break;
       case "geoview":
         window.$gz.util.viewGeoLocation({

ayanova/src/views/vendors.vue

@@ -78,8 +78,7 @@ async function clickHandler(menuItem) {
           if (res == null) {
             return;
           }
-          window.$gz.form.setLastReport(FORM_KEY, res);
-          generateMenu(m.vm);
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
         }
         break;
       default: