This commit is contained in:
2019-04-05 20:20:54 +00:00
parent 1d9cf69b02
commit 2c57e9f97f

View File

@@ -76,48 +76,48 @@ function getControlLabel(ctrl) {
return ctrl.label; return ctrl.label;
} }
//////////////////////////////////// // ////////////////////////////////////
// DEBUG / DEVELOPMENT LOGGING // // DEBUG / DEVELOPMENT LOGGING
// // //
function logControl(caller, ctrl, ref) { // function logControl(caller, ctrl, ref) {
if (ref != "xcount") { // if (ref != "xcount") {
return; // return;
} // }
var hasChanged = false; // var hasChanged = false;
if (ctrl.internalChange) { // if (ctrl.internalChange) {
hasChanged = true; // hasChanged = true;
} else { // } else {
if (ctrl.initialValue && ctrl.lazyValue) { // if (ctrl.initialValue && ctrl.lazyValue) {
if (ctrl.initialValue != ctrl.lazyValue) { // if (ctrl.initialValue != ctrl.lazyValue) {
hasChange = true; // hasChange = true;
} // }
} // }
} // }
var v = // var v =
"CTRL=" + // "CTRL=" +
ref + // ref +
", CALLER [" + // ", CALLER [" +
caller + // caller +
"], " + // "], " +
", internalChange=" + // ", internalChange=" +
ctrl.internalChange + // ctrl.internalChange +
", lazyValue=" + // ", lazyValue=" +
ctrl.lazyValue + // ctrl.lazyValue +
", initialValue=" + // ", initialValue=" +
ctrl.initialValue + // ctrl.initialValue +
", loading=" + // ", loading=" +
ctrl.loading + // ctrl.loading +
", isDirty=" + // ", isDirty=" +
ctrl.isDirty + // ctrl.isDirty +
", isResetting=" + // ", isResetting=" +
ctrl.isResetting + // ctrl.isResetting +
", HAS CHANGED =" + // ", HAS CHANGED =" +
hasChanged; // hasChanged;
console.log(v); // console.log(v);
} // }
export default { export default {
/////////////////////////////// ///////////////////////////////
@@ -130,7 +130,7 @@ export default {
} }
//DEBUG //DEBUG
logControl("Required", ctrl, ref); //logControl("Required", ctrl, ref);
var value = getControlValue(ctrl); var value = getControlValue(ctrl);
if (!isEmpty(value)) { if (!isEmpty(value)) {
@@ -155,7 +155,7 @@ export default {
} }
//DEBUG //DEBUG
logControl("MaxLength", ctrl, ref); // logControl("MaxLength", ctrl, ref);
var value = getControlValue(ctrl); var value = getControlValue(ctrl);
if (isEmpty(value)) { if (isEmpty(value)) {
@@ -194,8 +194,8 @@ export default {
} }
//DEBUG //DEBUG
logControl("After", ctrlStart, refStart); // logControl("After", ctrlStart, refStart);
logControl("After", ctrlEnd, refEnd); // logControl("After", ctrlEnd, refEnd);
var valueStart = getControlValue(ctrlStart); var valueStart = getControlValue(ctrlStart);
if (isEmpty(valueStart)) { if (isEmpty(valueStart)) {
@@ -233,7 +233,7 @@ export default {
} }
//DEBUG //DEBUG
logControl("Integer", ctrl, ref); //logControl("Integer", ctrl, ref);
var value = getControlValue(ctrl); var value = getControlValue(ctrl);
if (isEmpty(value)) { if (isEmpty(value)) {
@@ -262,7 +262,7 @@ export default {
} }
//DEBUG //DEBUG
logControl("Decimal", ctrl, ref); //logControl("Decimal", ctrl, ref);
var value = getControlValue(ctrl); var value = getControlValue(ctrl);
if (isEmpty(value)) { if (isEmpty(value)) {
@@ -333,14 +333,18 @@ export default {
return !o.target; return !o.target;
}); });
} else { } else {
errorsForField = v.$_.filter(v.serverError.details, { errorsForField = v.$_.filter(v.serverError.details, function(o) {
target: ref if (!o.target) {
return false;
}
//server error fields are capitalized
return o.target.toLowerCase() == ref;
}); });
} }
if (errorsForField.length > 0) { if (errorsForField.length > 0) {
//DEBUG //DEBUG
logControl("ServerErrors", getControl(v, ref), ref); //logControl("ServerErrors", getControl(v, ref), ref);
//iterate the errorsForField object and add each to return array of errors //iterate the errorsForField object and add each to return array of errors
v.$_.each(errorsForField, function(ve) { v.$_.each(errorsForField, function(ve) {