From b1b8c5ee258cf0e48cdcce2206d754c7a94da87e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 20 May 2019 16:45:36 +0200
Subject: [PATCH] campaign step date validation fix
---
entity/CampaignStep_entity/CampaignStep_entity.aod | 3 +--
.../entityfields/date_end/onValidation.js | 10 ----------
.../entityfields/date_start/onValidation.js | 10 ----------
.../entityfields/date_start/valueProcess.js | 4 +---
entity/CampaignStep_entity/onValidation.js | 9 +++++++++
5 files changed, 11 insertions(+), 25 deletions(-)
delete mode 100644 entity/CampaignStep_entity/entityfields/date_end/onValidation.js
delete mode 100644 entity/CampaignStep_entity/entityfields/date_start/onValidation.js
create mode 100644 entity/CampaignStep_entity/onValidation.js
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 7aa1787d28..e3c0579097 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -5,6 +5,7 @@
<icon>NEON:GROUP_APPOINTMENT</icon>
<title>Campaign Step</title>
<contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
+ <onValidation>%aditoprj%/entity/CampaignStep_entity/onValidation.js</onValidation>
<imageProcess>%aditoprj%/entity/CampaignStep_entity/imageProcess.js</imageProcess>
<titlePlural>Steps</titlePlural>
<recordContainer>db</recordContainer>
@@ -57,7 +58,6 @@
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
- <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValidation.js</onValidation>
</entityField>
<entityField>
<name>DATE_END</name>
@@ -68,7 +68,6 @@
<inputFormat>dd.MM.yyyy</inputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/onValidation.js</onValidation>
</entityField>
<entityField>
<name>STATE</name>
diff --git a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
deleted file mode 100644
index dd820dcf23..0000000000
--- a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Entity_lib");
-
-var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DATE_END"));
-
-if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.DATE_START"), cEnd) === false)
- result.string(DateUtils.getValidationFailString());
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValidation.js b/entity/CampaignStep_entity/entityfields/date_start/onValidation.js
deleted file mode 100644
index d3e654ed2d..0000000000
--- a/entity/CampaignStep_entity/entityfields/date_start/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.DATE_START"));
-
-if (DateUtils.validateBeginnBeforeEnd(cStart, vars.get("$field.DATE_END")) === false)
- result.string(DateUtils.getValidationFailString());
diff --git a/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js b/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
index 4c1e2142a2..db8ea5d571 100644
--- a/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js
@@ -6,6 +6,4 @@ import("system.result");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
result.string(DateUtils.getTodayUTC());
-}
-else
- result.string(vars.get("$this.value"));
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/onValidation.js b/entity/CampaignStep_entity/onValidation.js
new file mode 100644
index 0000000000..7a18bd24c2
--- /dev/null
+++ b/entity/CampaignStep_entity/onValidation.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Date_lib");
+import("system.vars");
+
+var startDate = vars.get("$field.DATE_START");
+var endDate = vars.get("$field.DATE_END");
+
+if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
+ result.string(DateUtils.getValidationFailString());
--
GitLab