From c81b55c000dd76eb0278f0a873a7703775619453 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 12 Jun 2020 17:32:37 +0000 Subject: [PATCH] --- ayanova/src/api/gzform.js | 35 +++++++++++++++++++++++++++++++ ayanova/src/views/adm-license.vue | 22 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js index 73f83c03..f9f3bf85 100644 --- a/ayanova/src/api/gzform.js +++ b/ayanova/src/api/gzform.js @@ -827,5 +827,40 @@ export default { listArray = []; } listArray.unshift({ name: "-", id: 0 }); + }, + //////////////////////////////////// + // Get validity of referenced control + // + controlIsValid(vm, ref) { + if (vm.$refs[ref]) { + return vm.$refs[ref].valid; + } + return false; + }, + //////////////////////////////////////// + // All controls are valid? + // + controlsAreAllValid(vm, refs) { + //if any are not valid return false + for (let i = 0; i < refs.length; i++) { + let item = refs[i]; + if (vm.$refs[item]) { + if (!vm.$refs[item].valid) { + return false; + } + } + } + return true; + + // let allValid = true; + // refs.every(function gzformCheckControlsAreValid(item) { + // if (vm.$refs[item]) { + // if (!vm.$refs[item].valid) { + // allValid = false; + // return false; + // } + // } + // }); + // return allValid; } }; diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue index a5351850..d3412ddd 100644 --- a/ayanova/src/views/adm-license.vue +++ b/ayanova/src/views/adm-license.vue @@ -66,8 +66,16 @@ " ref="requestemail" @input="fieldValueChanged('requestemail')" + :hint="$ay.t('LicenseEmailVerficationHint')" + :persistent-hint="true" > + + {{ sendRequestDisabled() }} + $ay.t('SendRequest') + @@ -221,6 +229,17 @@ export default { return "ok"; } }, + sendRequestDisabled() { + //this is required because no rules are broken until entry starts so button is enabled + if (this.request.Company == null) { + return true; + } + return !this.form().controlsAreAllValid(this, [ + "requestcompany", + "requestcontact", + "requestemail" + ]); + }, translation() { return window.$gz.translation; }, @@ -443,7 +462,8 @@ function fetchTranslatedText(vm) { "LicenseCompanyName", "LicenseContactName", "LicenseEmail", - "RequestEvaluationLicense" + "RequestEvaluationLicense", + "LicenseEmailVerficationHint" ]); }