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

campaign step date validation fix

parent 4cf70624
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
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());
......@@ -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
import("system.neon");
import("system.result");
import("system.vars");
import("Date_lib");
import("Entity_lib");
import("system.vars");
var cEnd = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.DATE_END"));
var startDate = vars.get("$field.DATE_START");
var endDate = vars.get("$field.DATE_END");
if (DateUtils.validateBeginnBeforeEnd(vars.get("$field.DATE_START"), cEnd) === false)
if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
result.string(DateUtils.getValidationFailString());
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