Skip to content
Snippets Groups Projects
Commit 779a04ec authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix task date validation

parent 382fffbd
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
<title>Task</title> <title>Task</title>
<afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit> <afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
<iconId>VAADIN:TASKS</iconId> <iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess> <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Tasks</titlePlural> <titlePlural>Tasks</titlePlural>
...@@ -73,7 +74,6 @@ ...@@ -73,7 +74,6 @@
<inputFormat>dd.MM.yyyy HH:mm</inputFormat> <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<groupable v="true" /> <groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
</entityField> </entityField>
<entityField> <entityField>
<name>MATURITY_DATE</name> <name>MATURITY_DATE</name>
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
<outputFormat>dd.MM.yyyy HH:mm</outputFormat> <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<inputFormat>dd.MM.yyyy HH:mm</inputFormat> <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
</entityField> </entityField>
<entityField> <entityField>
<name>TYPE</name> <name>TYPE</name>
......
import("system.neon");
import("system.result");
import("system.vars");
import("Date_lib");
import("Entity_lib");
var cStart = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.START_DATE"));
if (DateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.MATURITY_DATE")) === false)
result.string(DateUtils.getValidationFailString());
\ No newline at end of file
import("system.result"); import("system.result");
import("system.vars"); import("Date_lib");
import("Date_lib"); import("system.vars");
import("Entity_lib");
var startDate = vars.get("$field.START_DATE");
var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MATURITY_DATE")); var endDate = vars.get("$field.MATURITY_DATE");
if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.START_DATE"), cEnd) === false) if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
result.string(DateUtils.getValidationFailString()); result.string(DateUtils.getValidationFailString());
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment