ayanova/src/api/gzform.js

@@ -127,7 +127,7 @@ export default {
   // REQUIRED
   //
   required(vm, ref) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     var ctrl = getControl(vm, ref);
@@ -149,7 +149,7 @@ export default {
     //Update the form status
     this.setFormState({
       vm: vm,
-      formValid: false
+      valid: false
     });
     return err;
   },
@@ -157,7 +157,7 @@ export default {
   // MAXLENGTH
   //
   maxLength(vm, ref, max) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     var ctrl = getControl(vm, ref);
@@ -180,7 +180,7 @@ export default {
       //Update the form status
       this.setFormState({
         vm: vm,
-        formValid: false
+        valid: false
       });
       return err;
     } else {
@@ -191,7 +191,7 @@ export default {
   // MAX 255
   //
   max255(vm, ref) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     return this.maxLength(vm, ref, 255);
@@ -201,7 +201,7 @@ export default {
   // (start date must precede end date)
   //
   datePrecedence(vm, refStart, refEnd) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     var ctrlStart = getControl(vm, refStart);
@@ -238,7 +238,7 @@ export default {
       //Update the form status
       this.setFormState({
         vm: vm,
-        formValid: false
+        valid: false
       });
       return err;
     } else {
@@ -249,7 +249,7 @@ export default {
   // INTEGER IS VALID
   //
   integerValid(vm, ref) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     var ctrl = getControl(vm, ref);
@@ -274,7 +274,7 @@ export default {
     //Update the form status
     this.setFormState({
       vm: vm,
-      formValid: false
+      valid: false
     });
     return err;
   },
@@ -283,7 +283,7 @@ export default {
   // Basically anything that can be a number is valid
   //
   decimalValid(vm, ref) {
-    if (vm.formLoading) {
+    if (vm.formState.loading) {
       return false;
     }
     //TODO: Handle commas and spaces in numbers
@@ -311,7 +311,7 @@ export default {
     //Update the form status
     this.setFormState({
       vm: vm,
-      formValid: false
+      valid: false
     });
     return err;
   },
@@ -364,7 +364,7 @@ export default {
         //Update the form status
         this.setFormState({
           vm: vm,
-          formValid: false
+          valid: false
         });
         ret.push(err);
       }
@@ -394,7 +394,7 @@ export default {
           //Update the form status
           this.setFormState({
             vm: vm,
-            formValid: false
+            valid: false
           });
           return ret;
         }
@@ -419,7 +419,7 @@ export default {
     //Update the form status
     this.setFormState({
       vm: vm,
-      formValid: true
+      valid: true
     });
   },
   ///////////////////////////////
@@ -436,7 +436,7 @@ export default {
   //  This is required so that server errors can be cleared when input is changed
   //
   onChange(vm, ref) {
-    if (triggeringChange || vm.formLoading) {
+    if (triggeringChange || vm.formState.loading) {
       return;
     }
     //If ref appears in the servererrors details collection, remove each one
@@ -470,29 +470,29 @@ export default {
     //Update the form status
     this.setFormState({
       vm: vm,
-      formDirty: true,
-      formValid: vm.$refs.form.validate()
+      dirty: true,
+      valid: vm.$refs.form.validate()
     });
   },
   ////////////////////////////////////
   //  set calling form Valid state
   //
-  // {vm:vm,formDirty:bool | undefined,
-  //  formValid:bool | undefined,
-  //  formLoading:bool | undefined}
+  // {vm:vm,dirty:bool | undefined,
+  //  valid:bool | undefined,
+  //  loading:bool | undefined}
   //
-  setFormState(theState) {
+  setFormState(newState) {
     Vue.nextTick(function() {
-      if (theState.formValid != undefined) {
-        theState.vm.formValid = theState.formValid;
+      if (newState.valid != undefined) {
+        newState.vm.formState.valid = newState.valid;
       }
 
-      if (theState.formDirty != undefined) {
-        theState.vm.formDirty = theState.formDirty;
+      if (newState.dirty != undefined) {
+        newState.vm.formState.dirty = newState.dirty;
       }
 
-      if (theState.formLoading != undefined) {
-        theState.vm.formLoading = theState.formLoading;
+      if (newState.loading != undefined) {
+        newState.vm.formState.loading = newState.loading;
       }
     });
   }