Skip to content
Snippets Groups Projects
Commit ad685c89 authored by Armand Bahi's avatar Armand Bahi
Browse files

Merge branch 'next_version' into 'next_app_vmap'

Next version

See merge request Development/vitis_apps/sources/vitis!16
parents 85bb73a6 4a400f14
No related branches found
No related tags found
No related merge requests found
......@@ -875,52 +875,53 @@ vitisApp.on('appInitCtrlLoaded', function () {
if (typeof (sValue) !== "undefined" && (sValue.toString()) !== "") {
if (goog.isDefAndNotNull(oFormElement["comparator"])) {
if (goog.isDefAndNotNull(oFormElement["comparator"]["formater"])) {
sValue = oFormElement["comparator"]["formater"].replace(/<VALUE_TO_REPLACE>/g, sValue);
}
//
var aOperators = [];
for (var j = 0;j < oFormElement["comparator"].length;j++){
oFilter["operators"].push({
"column": (goog.isDefAndNotNull(oFormElement["attrToCompare"]) ? oFormElement["attrToCompare"][j] : oFormElement["name"]),
"compare_operator": oFormElement["comparator"][j],
if(goog.isObject(oFormElement["comparator"][j])){
var oOperator = {};
if (goog.isDefAndNotNull(oFormElement["comparator"][j]["formater"])) {
sValue = oFormElement["comparator"][j]["formater"].replace(/<VALUE_TO_REPLACE>/g, sValue);
}
if(goog.isArray(oFormElement["comparator"][j]["compare_operator"])){
oOperator["relation"] = (goog.isDefAndNotNull(oFormElement["comparator"][j]["relation"]) ? oFormElement["comparator"][j]["relation"] : "AND");
oOperator["operators"] = [];
for (var k = 0; k < oFormElement["comparator"][j]["compare_operator"].length; k++){
oOperator["operators"].push({
"column": (goog.isArray(oFormElement["comparator"][j]["column"]) ? oFormElement["comparator"][j]["column"][k] : oFormElement["name"]),
"compare_operator": oFormElement["comparator"][j]["compare_operator"][k],
"value": sValue
});
}
/*
oFormElement["comparator"]["value"] = sValue;
oFilter["operators"].push(oFormElement["comparator"]);
for (var j = 0; j < oFormElement["comparator"].length; j++) {
var sFormElement = "";
if (goog.isDefAndNotNull(oFormElement["attrToCompare"])) {
sFormElement = (goog.isDefAndNotNull(oFormElement["attrToCompare"][j]) ? oFormElement["attrToCompare"][j] : oFormElement["name"]);
}else{
sFormElement = oFormElement["name"];
oOperator["column"] = (goog.isDefAndNotNull(oFormElement["comparator"][j]["column"]) ? oFormElement["comparator"][j]["column"] : oFormElement["name"]);
oOperator["compare_operator"] = oFormElement["comparator"][j]["compare_operator"];
oOperator["value"] = sValue;
}
var bIsNotNumber = true;
if (goog.isDefAndNotNull(oFormElement["NaNForced"])) {
bIsNotNumber = (goog.isDefAndNotNull(oFormElement["NaNForced"][j]) ? oFormElement["NaNForced"][j] : isNaN(sValue));
} else {
bIsNotNumber = isNaN(sValue);
if(goog.isDefAndNotNull(oFormElement["comparator"][j]["compare_operator_options"])){
oOperator["compare_operator_options"] = oFormElement["comparator"][j]["compare_operator_options"];
}
switch (oFormElement["comparator"][j]) {
case 'LIKE' :
oFilter.push('lower("' + sFormElement + '") LIKE lower(\'%' + sValue + '%\')');
break;
case 'SQL' :
oFilter.push(sFormElement.replace(/<VALUE_TO_REPLACE>/g, sValue));
break;
// ajouter d'autre comparateur si besoin ex: BETWEEN ______ AND ______
default:
// = < <= > >= basique
if (bIsNotNumber) {
sValue = "'" + sValue + "'";
aOperators.push(oOperator);
}else{
// deprecated branch
console.warn("This use of compare attribute is deprecated in json form")
aOperators.push({
"column": (goog.isDefAndNotNull(oFormElement["attrToCompare"]) ? oFormElement["attrToCompare"][j] : oFormElement["name"]),
"compare_operator": oFormElement["comparator"][j],
"value": sValue
});
}
oFilter.push(sFormElement + oFormElement["comparator"][j] + sValue);
break;
}
if(goog.isDefAndNotNull(oFormElement["comparator_relation"])){
oFilter["operators"].push({
"relation": oFormElement["comparator_relation"],
"operators": aOperators
});
}else{
oFilter["operators"] = oFilter["operators"].concat(aOperators);
}
*/
} else {
if (oFormElement["type"] == "text") {
oFilter["operators"].push({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment