diff --git a/src/main/resources/public/js/fuzzyRule.js b/src/main/resources/public/js/fuzzyRule.js index ac8385d..3536ea6 100644 --- a/src/main/resources/public/js/fuzzyRule.js +++ b/src/main/resources/public/js/fuzzyRule.js @@ -89,12 +89,25 @@ function createRule() { let inpVal = $('.selectpicker.inputVal').children(':selected').map(function () { return $(this).text(); }).get(); + let out = $('.selectpicker.outVar').children(':selected').map(function () { + return $(this).text(); + }).get(); + let outVal = $('.selectpicker.outVal').children(':selected').map(function () { + return $(this).text(); + }).get(); for (let i = 0; i < inp.length; i++) { if (i > 0) { ruleString += ' and '; } ruleString += inp[i] + " is " + inpVal[i]; } + ruleString += " then "; + for (let i = 0; i < out.length; i++) { + if (i > 0) { + ruleString += ' and '; + } + ruleString += out[i] + " is " + outVal[i]; + } $('#ruleContent').val(ruleString); } @@ -149,14 +162,14 @@ function fuzzyTermsValueChanged() { createRule(); } -function createVariableSelect(projectId, variableVal) { - let variablesElement = $(""); +function createVariableSelect(cls, projectId, variableVal) { + let variablesElement = $(""); fillVariables(projectId, variablesElement, variableVal); return variablesElement; } -function createFuzzyTermsSelect(variablesElement, termVal) { - let fuzzyTermsElement = $(""); +function createFuzzyTermsSelect(cls, variablesElement, termVal) { + let fuzzyTermsElement = $(""); if ($(variablesElement).val()) { fillFuzzyTerms(variablesElement, fuzzyTermsElement, termVal); } @@ -180,8 +193,8 @@ function addAntecedent(parentElement, projectId, variableVal, termVal) { } else { $(rowElement).append(""); } - let variablesElement = createVariableSelect(projectId, variableVal); - let fuzzyTermsElement = createFuzzyTermsSelect(variablesElement, termVal); + let variablesElement = createVariableSelect('inputVar', projectId, variableVal); + let fuzzyTermsElement = createFuzzyTermsSelect('inputVal', variablesElement, termVal); $(variablesElement).on("change", function () { variableValueChanged(variablesElement, fuzzyTermsElement) }); @@ -204,8 +217,8 @@ function addConsequent(parentElement, projectId, variableVal, termVal) { } else { $(rowElement).append(""); } - let variablesElement = createVariableSelect(projectId, variableVal); - let fuzzyTermsElement = createFuzzyTermsSelect(variablesElement, termVal); + let variablesElement = createVariableSelect('outVar', projectId, variableVal); + let fuzzyTermsElement = createFuzzyTermsSelect('outVal', variablesElement, termVal); $(variablesElement).on("change", function () { variableValueChanged(variablesElement, fuzzyTermsElement) });