This commit is contained in:
2020-03-06 20:08:50 +00:00
parent 7318a33350
commit 17bf519cb0
79 changed files with 331 additions and 309 deletions

View File

@@ -7,8 +7,8 @@
// dirty and change tracking
// and also general error display in forms
//probably should be broken up more
// All locale keys for validation *MUST* be fetched prior to this being used as it assumes all keys are fetched first
// Add any new keys used to the block in locale.js=>commonKeysEditForm
// All translation keys for validation *MUST* be fetched prior to this being used as it assumes all keys are fetched first
// Add any new keys used to the block in translation.js=>commonKeysEditForm
import Vue from "vue";
var triggeringChange = false;
@@ -161,7 +161,7 @@ export default {
}
// "ErrorRequiredFieldEmpty": "{0} is a required field. Please enter a value for {0}",
var err = window.$gz.locale.get("ErrorRequiredFieldEmpty");
var err = window.$gz.translation.get("ErrorRequiredFieldEmpty");
var fieldName = getControlLabel(ctrl);
err = window.$gz._.replace(err, "{0}", fieldName);
//lodash replace only replaces first instance so need to do it twice
@@ -193,7 +193,7 @@ export default {
if (value.length > max) {
//get the localized rule text
// "ErrorFieldLengthExceeded": "{0} can not exceed {1} characters.",
var err = window.$gz.locale.get("ErrorFieldLengthExceeded");
var err = window.$gz.translation.get("ErrorFieldLengthExceeded");
var fieldName = getControlLabel(ctrl);
err = window.$gz._.replace(err, "{0}", fieldName);
err = window.$gz._.replace(err, "{1}", max);
@@ -255,7 +255,7 @@ export default {
if (valueStart > valueEnd) {
// "ErrorStartDateAfterEndDate": "Start date must be earlier than stop / end date",
var err = window.$gz.locale.get("ErrorStartDateAfterEndDate");
var err = window.$gz.translation.get("ErrorStartDateAfterEndDate");
//Update the form status
this.setFormState({
vm: vm,
@@ -287,7 +287,7 @@ export default {
var valueSecond = getControlValue(ctrlSecond);
if (valueFirst != valueSecond) {
var err = window.$gz.locale.get("ErrorNoMatch");
var err = window.$gz.translation.get("ErrorNoMatch");
//Update the form status
this.setFormState({
vm: vm,
@@ -323,7 +323,7 @@ export default {
}
// "ErrorFieldValueNotInteger": "Value must be an integer"
var err = window.$gz.locale.get("ErrorFieldValueNotInteger");
var err = window.$gz.translation.get("ErrorFieldValueNotInteger");
//Update the form status
this.setFormState({
vm: vm,
@@ -340,7 +340,7 @@ export default {
return false;
}
//TODO: Handle commas and spaces in numbers
//as per window.$gz.locale rules for numbers
//as per window.$gz.translation rules for numbers
var ctrl = getControl(vm, ref);
if (typeof ctrl == "undefined") {
@@ -360,7 +360,7 @@ export default {
}
// "ErrorFieldValueNotDecimal": "Value must be a number"
var err = window.$gz.locale.get("ErrorFieldValueNotDecimal");
var err = window.$gz.translation.get("ErrorFieldValueNotDecimal");
//Update the form status
this.setFormState({
vm: vm,
@@ -407,7 +407,7 @@ export default {
}
// "ErrorRequiredFieldEmpty": "{0} is a required field. Please enter a value for {0}",
var err = window.$gz.locale.get("ErrorRequiredFieldEmpty");
var err = window.$gz.translation.get("ErrorRequiredFieldEmpty");
var fieldName = getControlLabel(ctrl);
err = window.$gz._.replace(err, "{0}", fieldName);
//lodash replace only replaces first instance so need to do it twice
@@ -447,7 +447,7 @@ export default {
//It's empty and it's required so return error
// "ErrorRequiredFieldEmpty": "{0} is a required field. Please enter a value for {0}",
var err = window.$gz.locale.get("ErrorRequiredFieldEmpty");
var err = window.$gz.translation.get("ErrorRequiredFieldEmpty");
//var fieldName = getControlLabel(ctrl);
err = window.$gz._.replace(err, "{0}", fieldName);
//lodash replace only replaces first instance so need to do it twice
@@ -500,7 +500,9 @@ export default {
//GENERAL ERROR
if (ref == "errorbox") {
//Add any general errors to ret
var err = window.$gz.locale.get("ErrorAPI" + apiErrorCode.toString());
var err = window.$gz.translation.get(
"ErrorAPI" + apiErrorCode.toString()
);
if (vm.formState.serverError.message) {
err = err + "\r\n" + vm.formState.serverError.message;
}
@@ -524,7 +526,7 @@ export default {
var fldErr = "";
var fldErrorCode = parseInt(ve.error);
fldErr =
window.$gz.locale.get("ErrorAPI" + fldErrorCode.toString()) +
window.$gz.translation.get("ErrorAPI" + fldErrorCode.toString()) +
" [" +
ve.error +
"]";