Skip to content
Snippets Groups Projects
Commit 1564a949 authored by hjank's avatar hjank
Browse files

! in checkInformation(): extended "else" scope from "if selectedInfoID ==...

! in checkInformation(): extended "else" scope from "if selectedInfoID == null" till the end of all checking
# missing content error is now handled in checkInformation() which from now on returns only the selectedInfo
parent 36ed4f44
No related branches found
No related tags found
No related merge requests found
...@@ -24,93 +24,104 @@ function checkInformation() { ...@@ -24,93 +24,104 @@ function checkInformation() {
} else { } else {
// create a copy of the selected context info's JSON structure // create a copy of the selected context info's JSON structure
selectedContextInfo = $.extend(new ContextInformation(), contextList.getItem(selectedInfoID.id)); selectedContextInfo = $.extend(new ContextInformation(), contextList.getItem(selectedInfoID.id));
}
/* // only addable if context info doesn't exist already
for (var h=0; h<current_unit["contextInformations"].length; h++) {
if (selectedContextInfo["text"] == current_unit["contextInformations"][h]["name"]) {
alert(selectedContextInfo["text"] + " existiert bereits!");
// if already exist return with error code /* // only addable if context info doesn't exist already
return ["Error999", {}]; for (var h=0; h<current_unit["contextInformations"].length; h++) {
} if (selectedContextInfo["text"] == current_unit["contextInformations"][h]["name"]) {
}*/ alert(selectedContextInfo["text"] + " existiert bereits!");
// check selection bar "Operator" // if already exist return with error code
if ( selectedOperator["text"] == "\r" ) { return ["Error999", {}];
// if selection bar operator is empty, concatenate it in missing_content string }
missing_content += " - Operator\n"; }*/
} else {
// update JSON structure
selectedContextInfo.setOperators(selectedContextInfo.getOperators()[selectedOperator.id]);
}
// check and get context value // check selection bar "Operator"
var contextValue; if ( selectedOperator == null ) {
switch(selectedContextInfo.getType()) { // if selection bar operator is empty, concatenate it in missing_content string
case "FLOAT": missing_content += " - Operator\n";
case "INTEGER": } else {
case "STRING": // update JSON structure
var inputField = $("#inputContextValue"); selectedContextInfo.setChosenOperator(selectedContextInfo.getOperators()[selectedOperator.id]);
// if input field context value is empty, concatenate it in missing_content string }
if ( inputField[0].value == "" ) {
missing_content += " - Wert\n";
inputField.parent().addClass("has-error");
} else {
inputField.parent().removeClass("has-error");
contextValue = inputField[0].value;
}
break;
case "ENUM":
case "BOOLEAN":
var selected = $("#selectPossibleValues").select2("data");
// if selection bar context value is empty, concatenate it in missing_content string
if ( selected["text"] == "\r" ) {
missing_content += " - Wert\n";
}
contextValue = selectedContextInfo.getEnums()[selected.id];
break;
}
// update JSON structure
selectedContextInfo.setInputValue(contextValue);
// check and get parameters (if existent) // check and get context value
var selectedInfoParameters = selectedContextInfo.getParameters(); var contextValue;
for (var i in selectedInfoParameters) { switch(selectedContextInfo.getType()) {
var parameter = selectedInfoParameters[i];
var parameterElement = $("#parameter"+i);
var parameterDiv = parameterElement.parent();
var paramValue;
switch (parameter.getType()) {
case "FLOAT": case "FLOAT":
case "INTEGER": case "INTEGER":
case "STRING": case "STRING":
// if input field is empty, concatenate it in missing_content string var inputField = $("#inputContextValue");
if ( parameterElement[0].value == "" ) { // if input field context value is empty, concatenate it in missing_content string
missing_content += " - " + translate_parameter(parameter.getID()) + "\n"; if ( inputField[0].value == "" ) {
parameterDiv.addClass("has-error"); missing_content += " - Wert\n";
} inputField.parent().addClass("has-error");
else { } else {
parameterDiv.removeClass("has-error"); inputField.parent().removeClass("has-error");
paramValue = parameterElement[0].value; contextValue = inputField[0].value;
} }
break; break;
case "ENUM": case "ENUM":
case "BOOLEAN": case "BOOLEAN":
var selected = parameterElement.select2("data"); var selected = $("#selectPossibleValues").select2("data");
// if selection bar parameter is empty, concatenate it in missing_content string // if selection bar context value is empty, concatenate it in missing_content string
if (selected["text"] == "\r") { if ( selected["text"] == "\r" ) {
missing_content += " - " + translate_parameter(parameter.getID()) + "\n"; missing_content += " - Wert\n";
} }
else contextValue = selectedContextInfo.getEnums()[selected.id];
paramValue = parameter.getEnums()[selected.id];
break; break;
} }
// update JSON structure // update JSON structure
parameter.setInputValue(paramValue); selectedContextInfo.setChosenValue(contextValue);
// check and get parameters (if existent)
var selectedInfoParameters = selectedContextInfo.getParameters();
for (var i in selectedInfoParameters) {
var parameter = selectedInfoParameters[i];
var parameterElement = $("#parameter"+i);
var parameterDiv = parameterElement.parent();
var paramValue;
switch (parameter.getType()) {
case "FLOAT":
case "INTEGER":
case "STRING":
// if input field is empty, concatenate it in missing_content string
if ( parameterElement[0].value == "" ) {
missing_content += " - " + translate_parameter(parameter.getID()) + "\n";
parameterDiv.addClass("has-error");
}
else {
parameterDiv.removeClass("has-error");
paramValue = parameterElement[0].value;
}
break;
case "ENUM":
case "BOOLEAN":
var selected = parameterElement.select2("data");
// if selection bar parameter is empty, concatenate it in missing_content string
if (selected["text"] == "\r") {
missing_content += " - " + translate_parameter(parameter.getID()) + "\n";
}
else
paramValue = parameter.getEnums()[selected.id];
break;
}
// update JSON structure
parameter.setChosenValue(paramValue);
}
} }
// create return array // if content is missing do not accept adding of the context information
return {"errorMessage" : missing_content, if (missing_content == "Error999") {
"contextData" : selectedContextInfo}; return false;
} else {
// if something needed is missing
if (!!missing_content) {
alert("[Fehler] Bitte setzen Sie Werte in den folgenden Feldern:\n" + missing_content);
return false;
} else {
// return selected context info object
return selectedContextInfo;
}
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment