From 2fee84f1663e3376101ba6fee43397866b7ca278 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 29 Jun 2021 15:05:23 +0000
Subject: [PATCH]

---
 ayanova/src/views/svc-contract.vue | 72 ++++++++++++------------------
 ayanova/src/views/svc-loaner.vue   | 65 +++++++++------------------
 2 files changed, 51 insertions(+), 86 deletions(-)

diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index 461bc617..d2c56e59 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -1332,29 +1332,39 @@ export default {
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
 
+      let setDirty = false;
+      let setValid = true;
+
       //id 0 means create a new record don't load one
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
         if (this.$route.params.obj) {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
-          window.$gz.form.setFormState({
-            vm: vm,
-            loading: false
-          });
         } else {
           await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
         }
       } else {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
+        //Might be a duplicate and contain another record
+        if (this.$route.params.obj) {
+          this.obj = this.$route.params.obj;
+          this.obj.concurrency = undefined;
+          this.obj.id = 0;
+          this.obj.serviceRateItems.forEach(z => (z.id = 0));
+          this.obj.travelRateItems.forEach(z => (z.id = 0));
+          this.obj.contractPartOverrideItems.forEach(z => (z.id = 0));
+          this.obj.contractServiceRateOverrideItems.forEach(z => (z.id = 0));
+          this.obj.contractTravelRateOverrideItems.forEach(z => (z.id = 0));
+
+          setDirty = true;
+        }
       }
+
       window.$gz.form.setFormState({
         vm: vm,
-        dirty: false,
-        valid: true
+        loading: false,
+        dirty: setDirty,
+        valid: setValid
       });
 
       generateMenu(vm);
@@ -1772,42 +1782,18 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
-    async duplicate() {
-      let vm = this;
-      if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-        return;
-      }
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: true
-      });
-      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
 
-      try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
-        if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          //Navigate to new record
-          this.$router.push({
-            name: "contract-edit",
-            params: {
-              recordid: res.data.id,
-              obj: res.data // Pass data object to new form
-            }
-          });
+    async duplicate() {
+      //Navigate to new record
+      this.$router.push({
+        name: "contract-edit",
+        params: {
+          recordid: 0,
+          obj: this.obj
         }
-      } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
+      });
     }
+
     //end methods
   }
 };
diff --git a/ayanova/src/views/svc-loaner.vue b/ayanova/src/views/svc-loaner.vue
index 8e9768fa..80e5fc68 100644
--- a/ayanova/src/views/svc-loaner.vue
+++ b/ayanova/src/views/svc-loaner.vue
@@ -443,29 +443,33 @@ export default {
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
 
+      let setDirty = false;
+      let setValid = true;
+
       //id 0 means create a new record don't load one
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
         if (this.$route.params.obj) {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
-          window.$gz.form.setFormState({
-            vm: vm,
-            loading: false
-          });
         } else {
           await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
         }
       } else {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
+        //Might be a duplicate and contain another record
+        if (this.$route.params.obj) {
+          this.obj = this.$route.params.obj;
+          this.obj.concurrency = undefined;
+          this.obj.id = 0;
+          setDirty = true;
+        }
       }
+
       window.$gz.form.setFormState({
         vm: vm,
-        dirty: false,
-        valid: true
+        loading: false,
+        dirty: setDirty,
+        valid: setValid
       });
 
       generateMenu(vm);
@@ -740,41 +744,16 @@ export default {
       }
     },
     async duplicate() {
-      let vm = this;
-      if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-        return;
-      }
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: true
-      });
-      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
-      try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
-        if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          //Navigate to new record
-          this.$router.push({
-            name: "loan-unit-edit",
-            params: {
-              recordid: res.data.id,
-              obj: res.data // Pass data object to new form
-            }
-          });
+      //Navigate to new record
+      this.$router.push({
+        name: "loan-unit-edit",
+        params: {
+          recordid: 0,
+          obj: this.obj
         }
-      } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
+      });
     }
+
     //end methods
   }
 };