classification BooelanIndicator Fix

entity/ClassificationAdmin_entity/entityfields/field/onValueChange.js

@@ -61,20 +61,20 @@ if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$thi
     }
     else if (_checkIfInAttributeArray(ClassificationUtils.getEntityAttributes(objectType), field)["inArray"])
     {
-        let arrayAtPosition = _checkIfInAttributeArray(ClassificationUtils.getEntityAttributes(objectType), field)["attributeArrayAtPosition"];
+        var attribute = _checkIfInAttributeArray(ClassificationUtils.getEntityAttributes(objectType), field)["attributeArrayAtPosition"];
         neon.setFieldValue("$field.INDICATORTYPE", $ClassificationIndicatorTypes.ATTRIBUTE());
-        if ((arrayAtPosition["contentType"] == AttributeTypes.TEXT() && arrayAtPosition["hasDropDownValues"] === true)
-                || attributeArray[position]["contentType"] == AttributeTypes.BOOLEAN()
-                || attributeArray[position]["contentType"] == AttributeTypes.COMBO()
-                || attributeArray[position]["contentType"] == AttributeTypes.KEYWORD())
+        if ((attribute["contentType"] == AttributeTypes.TEXT() && attribute["hasDropDownValues"] === true)
+                || attribute["contentType"] == AttributeTypes.BOOLEAN()
+                || attribute["contentType"] == AttributeTypes.COMBO()
+                || attribute["contentType"] == AttributeTypes.KEYWORD())
         {
             neon.setFieldValue("$field.FIELDTYPE", $ClassificationFieldTypes.DROPDOWN());
         }
-        else if (arrayAtPosition["contentType"] == AttributeTypes.NUMBER())
+        else if (attribute["contentType"] == AttributeTypes.NUMBER())
         {
             neon.setFieldValue("$field.FIELDTYPE", $ClassificationFieldTypes.NUMBER());
         }
-        else if (arrayAtPosition["contentType"] == AttributeTypes.INTEGER())
+        else if (attribute["contentType"] == AttributeTypes.INTEGER())
         {
             neon.setFieldValue("$field.FIELDTYPE", $ClassificationFieldTypes.INTEGER());
         }

entity/ClassificationType_entity/entityfields/classificationscores/onValidation.js

@@ -42,7 +42,7 @@ function _getValidationString (pFilter, pField, pValidationString, pIndicatorTyp
         pValidationString += translate.text("only use simple filters") + "\n\
 ";
     }
-    else if(pFilter["filter"]["childs"][0]["name"] != pField || (pIndicatorType == $ClassificationIndicatorTypes.ATTRIBUTE() && pField.includes(pFilter["filter"]["childs"][0]["name"])))
+    else if((pFilter["filter"]["childs"][0]["name"] != pField && pIndicatorType != $ClassificationIndicatorTypes.ATTRIBUTE()) || (pIndicatorType == $ClassificationIndicatorTypes.ATTRIBUTE() && pField.includes(pFilter["filter"]["childs"][0]["name"])))
     {
         pValidationString += translate.text("only filter using the specified indicatorfield")+ "\n\
 ";

process/ClassificationUpdate_lib/process.js

@@ -781,7 +781,7 @@ ClassificationUpdateHelper._handleAttributes = function(pClassificationTypes, at
                         var currentValue = JSON.parse(filter)["filter"]["childs"][0]["key"];
                         for (var attributeValue in currentAttributes[attribute])
                         {
-                            if (currentAttributes[attribute][attributeValue] == currentValue)
+                            if (currentAttributes[attribute][attributeValue] == currentValue || currentAttributes[attribute][attributeValue] == parseInt(currentValue))
                             {
                                     pAchievedScoresObject[pUid][classificationTypes[type]["classificationGroupId"]][type] = {};
                                     pAchievedScoresObject[pUid][classificationTypes[type]["classificationGroupId"]][type]["points"] = classificationTypes[type]["values"][filter]*classificationTypes[type]["points"] / 100;