merged origin/FixClassificationAdminSmallFixes into master

entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod

@@ -136,10 +136,12 @@
       <textInputAllowed v="true" />
       <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroupdisplayvalue/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroupdisplayvalue/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroupdisplayvalue/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>SCOREPOINTS</name>
       <title>Max Points</title>
+      <contentType>NUMBER</contentType>
       <mandatory v="true" />
       <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scorepoints/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scorepoints/stateProcess.js</stateProcess>

entity/ClassificationAdmin_entity/entityfields/classificationgroupdisplayvalue/onValueChange.js

+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    var sorting = newSelect("CLASSIFICATIONGROUP.SORTING")
+                                .from("CLASSIFICATIONGROUP")
+                                .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", vars.get("$this.value"))
+                                .cell();
+
+    if(sorting)
+    {
+        neon.setFieldValue("$field.SORTING", sorting)
+    }
+}
\ No newline at end of file

entity/ClassificationAdmin_entity/entityfields/sorting/stateProcess.js

@@ -9,7 +9,7 @@ var recordCategory = vars.get("$field.recordCategory");
 if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE())
     state = neon.COMPONENTSTATE_INVISIBLE;
 else if(recordCategory == $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS())
-    state = neon.COMPONENTSTATE_DISABLED;
+    state = neon.COMPONENTSTATE_EDITABLE;
 else
     state = neon.COMPONENTSTATE_EDITABLE;
     

entity/ClassificationAdmin_entity/entityfields/sorting/valueProcess.js

+import("Classification_lib");
 import("system.neon");
 import("system.vars");
 import("system.result");
@@ -33,7 +34,16 @@ var sorting = newSelect("CLASSIFICATIONGROUP.SORTING")
                             .from("CLASSIFICATIONGROUP")
                             .where("CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID", id)
                             .cell();
-if(sorting)
+var fieldValue = vars.get("$this.value");
+if((!fieldValue || fieldValue == "") && sorting)
+{
     result.string(sorting);
+}
+else if(fieldValue)
+{
+    result.string(fieldValue);
+}
 else
+{
     result.string("1");
+}

entity/ClassificationGrading_entity/entityfields/minpercent/onValidation.js

+import("system.translate");
 import("system.result");
 import("system.vars");
 
@@ -6,10 +7,16 @@ if(val)
 {
     var res;
     if(!Number.isInteger(Number(val)))
-        res = "Only Integers allowed";
+    {
+        res = translate.text("Only Integers allowed");
+    }
     else if(val < 0 || val > 100)
-        res = "The Value has to be in the 0-100% range";
-
+    {
+        res = translate.text("The Value has to be in the 0-100% range");
+    }
+    
     if(res)
+    {
         result.string(res);
+    }
 }
\ No newline at end of file

entity/ClassificationScore_entity/ClassificationScore_entity.aod

@@ -86,6 +86,7 @@
       <name>SCOREPERCENT</name>
       <title>Percent</title>
       <contentType>NUMBER</contentType>
+      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/scorepercent/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>scoreInPoints</name>

entity/ClassificationScore_entity/entityfields/scorepercent/onValidation.js

+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var val = vars.get("$this.value");
+if(val)
+{
+    if(val < 0 || val > 100)
+        result.string(translate.text("The Value has to be in the 0-100% range"));
+}
\ No newline at end of file

entity/Classification_entity/recordcontainers/jdito/contentProcess.js

@@ -534,8 +534,8 @@ function _buildTreeFromPersistetData()
             achievedGroupScoresObj[groupId] = 0
             classificationGroups.push(groupId)
         }
-        if(classificationScorePoints != undefined)
-            achievedGroupScoresObj[groupId] = eMath.addInt(Number(achievedGroupScoresObj[groupId]), Number(classificationScorePoints));
+        if(classificationScorePoints != undefined || classificationScorePoints != "")
+            achievedGroupScoresObj[groupId] = eMath.addDec(Number(achievedGroupScoresObj[groupId]), Number(classificationScorePoints));
         
         treeBuilt = true;
         resultSet.push([uid, typeId, classificationId, groupId, classificationGroupTitle, classificationTypeScoreType, 

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -10128,6 +10128,14 @@ Bitte Datumseingabe prüfen</value>
       <key>Filter set</key>
       <value>Filter gesetzt</value>
     </entry>
+    <entry>
+      <key>The Value has to be in the 0-100% range</key>
+      <value>Der Wert muss sich zwischen 0 und 100% liegen</value>
+    </entry>
+    <entry>
+      <key>Only Integers allowed</key>
+      <value>Nur ganze Zahlen erlaubt</value>
+    </entry>
     <entry>
       <key>Sent Offers</key>
     </entry>