ayanova/src/api/gzvalidate.js

@@ -124,6 +124,9 @@ export default {
   // REQUIRED
   //
   required(vm, ref) {
+    if (vm.formLoading) {
+      return false;
+    }
     var ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return false;
@@ -140,12 +143,16 @@ export default {
     err = vm.$_.replace(err, "{0}", fieldName);
     //lodash replace only replaces first instance so need to do it twice
     err = vm.$_.replace(err, "{0}", fieldName);
+    vm.formValid = false;
     return err;
   },
   ///////////////////////////////
   // MAXLENGTH
   //
   maxLength(vm, ref, max) {
+    if (vm.formLoading) {
+      return false;
+    }
     var ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return false;
@@ -163,6 +170,7 @@ export default {
       var fieldName = getControlLabel(ctrl);
       err = vm.$_.replace(err, "{0}", fieldName);
       err = vm.$_.replace(err, "{1}", max);
+      vm.formValid = false;
       return err;
     } else {
       return false;
@@ -172,6 +180,9 @@ export default {
   // MAX 255
   //
   max255(vm, ref) {
+    if (vm.formLoading) {
+      return false;
+    }
     return this.maxLength(vm, ref, 255);
   },
   ///////////////////////////////
@@ -179,6 +190,9 @@ export default {
   // (start date must precede end date)
   //
   datePrecedence(vm, refStart, refEnd) {
+    if (vm.formLoading) {
+      return false;
+    }
     var ctrlStart = getControl(vm, refStart);
     if (typeof ctrlStart == "undefined") {
       return false;
@@ -210,6 +224,7 @@ export default {
     if (valueStart.isAfter(valueEnd)) {
       //   "ErrorStartDateAfterEndDate": "Start date must be earlier than stop / end date",
       var err = vm.$gzlocale.get("ErrorStartDateAfterEndDate");
+      vm.formValid = false;
       return err;
     } else {
       return false;
@@ -219,6 +234,9 @@ export default {
   // INTEGER IS VALID
   //
   integerValid(vm, ref) {
+    if (vm.formLoading) {
+      return false;
+    }
     var ctrl = getControl(vm, ref);
     if (typeof ctrl == "undefined") {
       return false;
@@ -238,7 +256,7 @@ export default {
 
     //   "ErrorFieldValueNotInteger": "Value must be an integer"
     var err = vm.$gzlocale.get("ErrorFieldValueNotInteger");
-
+    vm.formValid = false;
     return err;
   },
   ///////////////////////////////
@@ -246,6 +264,9 @@ export default {
   // Basically anything that can be a number is valid
   //
   decimalValid(vm, ref) {
+    if (vm.formLoading) {
+      return false;
+    }
     //TODO: Handle commas and spaces in numbers
     //as per vm.$gzlocale rules for numbers
 
@@ -268,7 +289,7 @@ export default {
 
     //    "ErrorFieldValueNotDecimal": "Value must be a number"
     var err = vm.$gzlocale.get("ErrorFieldValueNotDecimal");
-
+    vm.formValid = false;
     return err;
   },
   ///////////////////////////////
@@ -317,6 +338,7 @@ export default {
         if (vm.serverError.message) {
           err = err + "\r\n" + vm.serverError.message;
         }
+        vm.formValid = false;
         ret.push(err);
       }
       //DETAIL ERRORS
@@ -341,7 +363,7 @@ export default {
             }
             ret.push(fldErr);
           });
-
+          vm.formValid = false;
           return ret;
         }
       }
@@ -378,7 +400,7 @@ export default {
   //  This is required so that server errors can be cleared when input is changed
   //
   onChange(vm, ref) {
-    if (triggeringChange) {
+    if (triggeringChange || vm.formLoading) {
       return;
     }
     //If ref appears in the servererrors details collection, remove each one
@@ -409,6 +431,6 @@ export default {
       triggeringChange = false;
     }
     vm.formDirty = true;
-    vm.formValid = vm.$refs.form.validate();
+    //vm.formValid = vm.$refs.form.validate();
   }
 };