diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 3723efe444e99f25d4bf7e83568fa03c4f0aa53a..6a6eb3fc7f1ac69cfbc4adc248122e30326a8439 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -115,6 +115,12 @@ <entityField> <name>DATE_EDIT</name> <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js</valueProcess> + <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js</onValueChange> + <onValueChangeTypes> + <element>MASK</element> + <element>PROCESS</element> + <element>PROCESS_SETVALUE</element> + </onValueChangeTypes> </entityField> <entityProvider> <name>CampaignSteps</name> @@ -330,6 +336,7 @@ <textInputAllowed v="true" /> <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/stateProcess.js</stateProcess> <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/displayValueProcess.js</displayValueProcess> + <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js</onValueChange> <onValueChangeTypes> <element>MASK</element> <element>PROCESS</element> diff --git a/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js b/entity/CampaignStep_entity/entityfields/date_edit/onValueChange.js new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js b/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js new file mode 100644 index 0000000000000000000000000000000000000000..25cd7233af76fe0d4266ce618a97408b0fd90eab --- /dev/null +++ b/entity/CampaignStep_entity/entityfields/predecessorstep_id/onValueChange.js @@ -0,0 +1,25 @@ +import("system.eMath"); +import("system.db"); +import("system.datetime"); +import("system.neon"); +import("system.vars"); +import("system.result"); +import("Sql_lib") + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW ) +{ + var predecessorStepId = vars.get("$local.value"); + if (predecessorStepId) + { + var predecessorEndDate = newSelect("CAMPAIGNSTEP.DATE_END") + .from("CAMPAIGNSTEP") + .where("CAMPAIGNSTEP.CAMPAIGNSTEPID", predecessorStepId) + .cell(); + + if (predecessorEndDate) { + vars.set("$field.DATE_START", predecessorEndDate); + //special requirement was defined here: whenever the date comes from an predecessor the interval shall be 1 week (and may differ from the intial interval) + vars.set("$field.DATE_END", eMath.addInt(predecessorEndDate, datetime.ONE_WEEK)); + } + } +} \ No newline at end of file diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod index c19276fd5599232c4df946d0add164d551fd5d74..a9e88e8ef60e101b705ef60a614f9860deb8a919 100644 --- a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod +++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod @@ -28,6 +28,10 @@ <name>e16e3f66-7e80-4796-acca-6018e86e1b88</name> <entityField>EMPLOYEE_CONTACT_ID</entityField> </entityFieldLink> + <entityFieldLink> + <name>568fd355-f13f-4b40-801e-614790091fc5</name> + <entityField>PREDECESSORSTEP_ID</entityField> + </entityFieldLink> <entityFieldLink> <name>ea21096b-5885-4f5e-8bd6-c45275b25036</name> <entityField>DATE_START</entityField> @@ -48,10 +52,6 @@ <name>981cf207-6e9b-428e-bd81-0d76b4b2f180</name> <entityField>DESCRIPTION</entityField> </entityFieldLink> - <entityFieldLink> - <name>568fd355-f13f-4b40-801e-614790091fc5</name> - <entityField>PREDECESSORSTEP_ID</entityField> - </entityFieldLink> <entityFieldLink> <name>eff370e3-6805-46ad-ab7f-03d8a6392420</name> <entityField>STEPMEDIUM</entityField> diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod index 332238919764e29332191e2efd8813d0b6bf42f4..9e793070d553cd4e4e10a0f05d815859af186314 100644 --- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod +++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod @@ -20,7 +20,7 @@ <entityField>#ENTITY</entityField> </cardViewTemplate> <genericViewTemplate> - <name>CampaignStepInfosGeneric</name> + <name>Runtime</name> <editMode v="false" /> <showDrawer v="true" /> <drawerCaption>Runtime</drawerCaption> @@ -37,13 +37,19 @@ </fields> </genericViewTemplate> <genericViewTemplate> - <name>Predecessor</name> + <name>StepDetails</name> + <showDrawer v="true" /> + <drawerCaption>Details</drawerCaption> <entityField>#ENTITY</entityField> <fields> <entityFieldLink> - <name>c5c7eff5-da6d-4664-9bdc-1cae9dcec461</name> + <name>55a75b16-a80d-4f9c-b8ea-127302d1f913</name> <entityField>PREDECESSORSTEP_ID</entityField> </entityFieldLink> + <entityFieldLink> + <name>f7ddecfb-60bc-4a94-8905-7da729b32acd</name> + <entityField>STEPMEDIUM</entityField> + </entityFieldLink> </fields> </genericViewTemplate> <genericViewTemplate> @@ -61,19 +67,6 @@ </entityFieldLink> </fields> </genericViewTemplate> - <genericViewTemplate> - <name>Medium</name> - <editMode v="false" /> - <showDrawer v="false" /> - <drawerCaption></drawerCaption> - <entityField>#ENTITY</entityField> - <fields> - <entityFieldLink> - <name>723c67c3-d92e-424e-9350-3caa881a5ef0</name> - <entityField>STEPMEDIUM</entityField> - </entityFieldLink> - </fields> - </genericViewTemplate> <scoreCardViewTemplate> <name>KeyScoreInfos</name> <entityField>#ENTITY</entityField>