From 7fc2e33f1054ced84796697ff7b01f5f729ffe76 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 22 Mar 2019 21:20:43 +0000 Subject: [PATCH] --- ayanova/src/api/gzvalidate.js | 34 ++++++--------------- ayanova/src/views/inventory-widget-edit.vue | 11 +++---- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/ayanova/src/api/gzvalidate.js b/ayanova/src/api/gzvalidate.js index c54b989b..6b87e23f 100644 --- a/ayanova/src/api/gzvalidate.js +++ b/ayanova/src/api/gzvalidate.js @@ -1,4 +1,4 @@ -/* Xeslint-disable */ +/* eslint-disable */ /////////////////////////////// // GZVALIDATE // @@ -23,15 +23,8 @@ function isEmpty(o) { // function getControl(v, ref) { var ctrl = v.$refs[ref]; - if (errorHandler.developmentModeShowErrorsImmediately) { - if (isEmpty(ctrl)) { - throw "GZValidate:getControl - the control has no label " + ctrl; - } - } else { - if (isEmpty(ctrl)) { - return null; - } - } + + return ctrl; } //////////////////////////////////// @@ -65,7 +58,7 @@ export default { // Required(v, ref) { var ctrl = getControl(v, ref); - if (!ctrl) { + if(typeof ctrl == 'undefined'){ return false; } @@ -87,7 +80,7 @@ export default { // MaxLength(v, ref, max) { var ctrl = getControl(v, ref); - if (!ctrl) { + if(typeof ctrl == 'undefined'){ return false; } @@ -148,32 +141,25 @@ export default { // AFTER After(v, refStart, refEnd) { var ctrlStart = getControl(v, refStart); - if (!ctrlStart) { + if(typeof ctrlStart == 'undefined'){ return false; } var ctrlEnd = getControl(v, refEnd); - if (!ctrlEnd) { + if(typeof ctrlEnd == 'undefined'){ return false; } var valueStart = getControlValue(ctrlStart); - if (!isEmpty(valueStart)) { + if (isEmpty(valueStart)) { return false; } var valueEnd = getControlValue(ctrlEnd); - if (!isEmpty(valueEnd)) { + if (isEmpty(valueEnd)) { return false; } - - if (_.isEmpty(valueStart)) { - return false; - } - if (_.isEmpty(valueEnd)) { - return false; - } - + valueStart = dayjs(valueStart); valueEnd = dayjs(valueEnd); diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index 623be9f0..1ea58357 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -8,7 +8,7 @@ v-model="obj.name" :counter="255" :label="this.$gzlocale.get('WidgetName')" - :rules="[this.$gzv.Max255(this,'WidgetName')]" + :rules="[this.$gzv.Max255(this,'name')]" ref="name" > @@ -17,7 +17,7 @@ v-model="obj.serial" :counter="10" :label="this.$gzlocale.get('WidgetSerial')" - :rules="[this.$gzv.MaxLength(this,'WidgetSerial',10)]" + :rules="[this.$gzv.MaxLength(this,'serial',10)]" ref="serial" > @@ -27,7 +27,6 @@ :counter="10" :label="this.$gzlocale.get('WidgetCount')" ref="count" - name="count" :rules="[this.$gzv.Required(this,'count')]" required > @@ -47,7 +46,7 @@ @@ -56,14 +55,14 @@ :label="this.$gzlocale.get('WidgetEndDate')" :rules="[this.$gzv.After(this,'startDate','endDate')]" v-model="obj.endDate" - name="endDate" + ref="endDate" >