From ba3a70a807b5359883fe9f1f97dc3eb20af829c5 Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Fri, 17 May 2019 14:11:27 +0200 Subject: [PATCH] change request: Entrydate of activity must no be in future --- entity/Activity_entity/Activity_entity.aod | 1 + .../entityfields/entrydate/onValidation.js | 9 +++++++++ language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++ language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++ language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++ 5 files changed, 20 insertions(+) create mode 100644 entity/Activity_entity/entityfields/entrydate/onValidation.js diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index 46af89c0617..a7d30c0916c 100644 --- a/entity/Activity_entity/Activity_entity.aod +++ b/entity/Activity_entity/Activity_entity.aod @@ -27,6 +27,7 @@ <inputFormat>dd.MM.yyyy</inputFormat> <mandatory v="true" /> <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess> + <onValidation>%aditoprj%/entity/Activity_entity/entityfields/entrydate/onValidation.js</onValidation> </entityField> <entityField> <name>ACTIVITYID</name> diff --git a/entity/Activity_entity/entityfields/entrydate/onValidation.js b/entity/Activity_entity/entityfields/entrydate/onValidation.js new file mode 100644 index 00000000000..63235b240b7 --- /dev/null +++ b/entity/Activity_entity/entityfields/entrydate/onValidation.js @@ -0,0 +1,9 @@ +import("system.datetime"); +import("system.translate"); +import("system.vars"); +import("system.result"); +import("Entity_lib"); + +var entryDate = ProcessHandlingUtils.getOnValidationValue(); +if (Number(datetime.clearTime(entryDate)) > Number(vars.get("$sys.today"))) + result.string(translate.text("Entrydate must not be in the future")); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 1c89a7f9d0d..03c9d73fbd9 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -3831,6 +3831,9 @@ <entry> <key>Write email</key> </entry> + <entry> + <key>Show tasks where I am editor</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index df756b30ab2..4682197cfd4 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -1594,6 +1594,10 @@ <key>Sent receipts</key> <value>Versendete Belege</value> </entry> + <entry> + <key>Entrydate must not be in the future</key> + <value>Eingangsdatum darf nicht in der Zukunft liegen</value> + </entry> <entry> <key>Copy receipt</key> <value>Beleg kopieren</value> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 85bd641cdb5..9590dc08a9f 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -3883,6 +3883,9 @@ <entry> <key>Write email</key> </entry> + <entry> + <key>Show tasks where I am editor</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> -- GitLab