diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod index 2f09c0518fb67d0a34c66fcbe7f956a460e6f240..0933b3602c6c24a38300e17406524eb690443411 100644 --- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod +++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod @@ -4,6 +4,7 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <title>Possible Values</title> <contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess> + <onValidation>%aditoprj%/entity/ClassificationScore_entity/onValidation.js</onValidation> <recordContainer>db</recordContainer> <entityFields> <entityProvider> @@ -28,6 +29,7 @@ <entityField> <name>SCORE</name> <title>Score</title> + <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation> </entityField> <entityProvider> <name>ClassificationScores</name> @@ -53,6 +55,10 @@ <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> + <entityField> + <name>MaxValue</name> + <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..9da24ed56ab23b3c689c0bf7e19a3914337fe58b --- /dev/null +++ b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js @@ -0,0 +1,20 @@ +import("system.logging"); +import("system.vars"); +import("system.result"); +import("system.db"); +import("Sql_lib"); + +if (!vars.get("$this.value")) +{ + var scoreType = vars.get("$param.Scoretype_param"); + + result.string(db.cell( + SqlCondition.begin() + .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# <> ?") + .and("CLASSIFICATIONTYPE.CLASSIFICATIONNUMBER = " + db.translateStatement(SqlCondition.begin() + .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# = ?") + .buildSql("(select CLASSIFICATIONNUMBER from CLASSIFICATIONTYPE", "1=2", ")"))) + .buildSql("select 100.0 - sum(maxScore) from ( \n\ + select max(SCORE) maxScore from CLASSIFICATIONTYPE \n\ + join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype", "1=2", "group by CLASSIFICATIONTYPE.scoretype) maxScores"))) +} \ No newline at end of file diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..be6e4157430034d74f2785dcd3c5198b8dfe6a17 100644 --- a/entity/ClassificationScore_entity/entityfields/score/onValidation.js +++ b/entity/ClassificationScore_entity/entityfields/score/onValidation.js @@ -0,0 +1,8 @@ +import("Entity_lib"); +import("system.translate"); +import("system.result"); +import("system.vars"); + +var max = parseFloat(vars.getString("$field.MaxValue")); +if (parseFloat(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SCORE"))) > max) + result.string(translate.withArguments("${HIGHER_THAN_MAX} max: %0", [max])); \ No newline at end of file diff --git a/entity/ClassificationScore_entity/onValidation.js b/entity/ClassificationScore_entity/onValidation.js new file mode 100644 index 0000000000000000000000000000000000000000..10a616168f1215f6ed3df9679a7e2e56b0aa1d2d --- /dev/null +++ b/entity/ClassificationScore_entity/onValidation.js @@ -0,0 +1,10 @@ +import("system.vars"); +import("system.logging"); + + +logging.log("aaaaaaaaaaaaaa") +logging.log(vars.get("$param.Scoretype_param")) +logging.log(vars.get("$sys.recordstate")) + +/*select CLASSIFICATIONTYPE.scoretype, max(score) from CLASSIFICATIONTYPE +join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype where CLASSIFICATIONNUMBER = 2 group by CLASSIFICATIONTYPE.scoretype;*/ \ No newline at end of file diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod index cfc568e196f27f4492a0784d857d1285ec987e7d..410357d231e67f03816954e976f0f2f762ad997b 100644 --- a/entity/Classification_entity/Classification_entity.aod +++ b/entity/Classification_entity/Classification_entity.aod @@ -159,7 +159,7 @@ </entityParameter> <entityField> <name>Info</name> - <title>Rating: </title> + <title>Rating</title> <contentType>HTML</contentType> <state>READONLY</state> <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/info/valueProcess.js</valueProcess> diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 69957fadc97dab55d2a51546e1b3d635d1cd3513..25a34db25a81ca80fa35d7c000cb517da43c9daf 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -75,6 +75,9 @@ <entry> <key>Office address</key> </entry> + <entry> + <key>${HIGHER_THAN_MAX} max: %0</key> + </entry> <entry> <key>Contact</key> </entry> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 00d47f10add2dc094186773ae4fd157562db7ab1..51533a49d4c36f1b0a45524071f906c1717bfdfd 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -4736,6 +4736,7 @@ </entry> <entry> <key>Scoretype</key> + <value>Bewertungstyp</value> </entry> <entry> <key>aaaaaaaaaaaaa</key> @@ -4755,6 +4756,7 @@ </entry> <entry> <key>Classification number</key> + <value>Klassifizierungsnummer</value> </entry> <entry> <key>dasgf</key> @@ -4763,6 +4765,33 @@ <key>Possible values</key> <value>Mögliche Werte</value> </entry> + <entry> + <key>ARCHIEVED</key> + </entry> + <entry> + <key>e</key> + </entry> + <entry> + <key>${HIGHER_THAN_MAX} max: %0</key> + <value>Der eingegebene Wert ist über dem Maximalwert %0.</value> + </entry> + <entry> + <key>huhu</key> + </entry> + <entry> + <key>Rating</key> + <value>Bewertung</value> + </entry> + <entry> + <key>sum</key> + <value>Summe</value> + </entry> + <entry> + <key>A: 75 < </key> + </entry> + <entry> + <key>Possible Values</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 433c18dfaa74bca2805fced915674480bb925229..a43bb221838f8fd42ab4d68c866d23d011808a09 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -3854,6 +3854,40 @@ <entry> <key>Possible values</key> </entry> + <entry> + <key>ARCHIVE</key> + </entry> + <entry> + <key>archieve</key> + </entry> + <entry> + <key>setUnread</key> + </entry> + <entry> + <key>setRead</key> + </entry> + <entry> + <key>e</key> + </entry> + <entry> + <key>${HIGHER_THAN_MAX} max: %0</key> + <value>The value is greater than the allowed max-value %0.</value> + </entry> + <entry> + <key>huhu</key> + </entry> + <entry> + <key>Rating</key> + </entry> + <entry> + <key>sum</key> + </entry> + <entry> + <key>A: 75 < </key> + </entry> + <entry> + <key>Possible Values</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language>