From 779a04ec7ca0baa52a62dc465af32b7d9650455b Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 20 May 2019 15:04:02 +0200
Subject: [PATCH] fix task date validation
---
entity/Task_entity/Task_entity.aod | 3 +--
.../entityfields/maturity_date/onValidation.js | 9 ---------
.../entityfields/start_date/onValidation.js | 10 ----------
entity/Task_entity/onValidation.js | 9 +++++++++
4 files changed, 10 insertions(+), 21 deletions(-)
delete mode 100644 entity/Task_entity/entityfields/maturity_date/onValidation.js
delete mode 100644 entity/Task_entity/entityfields/start_date/onValidation.js
create mode 100644 entity/Task_entity/onValidation.js
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 6fc3eb7145..731bf761e4 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -5,6 +5,7 @@
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
<title>Task</title>
<afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
+ <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
<iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Tasks</titlePlural>
@@ -73,7 +74,6 @@
<inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
</entityField>
<entityField>
<name>MATURITY_DATE</name>
@@ -83,7 +83,6 @@
<outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
</entityField>
<entityField>
<name>TYPE</name>
diff --git a/entity/Task_entity/entityfields/maturity_date/onValidation.js b/entity/Task_entity/entityfields/maturity_date/onValidation.js
deleted file mode 100644
index dec89edbf1..0000000000
--- a/entity/Task_entity/entityfields/maturity_date/onValidation.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MATURITY_DATE"));
-
-if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.START_DATE"), cEnd) === false)
- result.string(DateUtils.getValidationFailString());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/start_date/onValidation.js b/entity/Task_entity/entityfields/start_date/onValidation.js
deleted file mode 100644
index afad30d552..0000000000
--- a/entity/Task_entity/entityfields/start_date/onValidation.js
+++ /dev/null
@@ -1,10 +0,0 @@
-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
diff --git a/entity/Task_entity/onValidation.js b/entity/Task_entity/onValidation.js
new file mode 100644
index 0000000000..497ca1efd9
--- /dev/null
+++ b/entity/Task_entity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Date_lib");
+import("system.vars");
+
+var startDate = vars.get("$field.START_DATE");
+var endDate = vars.get("$field.MATURITY_DATE");
+
+if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
+ result.string(DateUtils.getValidationFailString());
\ No newline at end of file
--
GitLab