diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js index 09512470cd7e3765e942fc746223eca44cc45e99..a8754300a5ed02b50adf50695d4eef4f5b43aab8 100644 --- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js +++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js @@ -3,6 +3,7 @@ import("system.vars"); import("system.neon"); import("Campaign_lib"); -var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID")); +var stepId; +CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID")); neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId); \ No newline at end of file diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 19cea84b44382052e07acf06cc8d93a57f082801..e26c5f83d6da803c7737f361b6e46536217fa0d6 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -17,8 +17,12 @@ </entityField> <entityField> <name>CAMPAIGN_ID</name> + <title>Campaign</title> + <consumer>CampaignConsumer</consumer> + <linkedContext>Campaign</linkedContext> <mandatory v="true" /> <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>EMPLOYEE_CONTACT_ID</name> @@ -224,6 +228,15 @@ <contentType>NUMBER</contentType> <outputFormat>#,##0.00</outputFormat> </entityField> + <entityConsumer> + <name>CampaignConsumer</name> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>Campaign_entity</entityName> + <fieldName>CampaignProvider</fieldName> + </dependency> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index 9293f8a8400eda41f7fbe21ed1dcf1a2fce983c0..679a410f39a4939d79274f4f3cc26b9b7280957a 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -138,6 +138,12 @@ <fieldName>Campaigns</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>92ec68f6-2ff5-4f15-9001-6297a6d5790d</name> + <entityName>CampaignStep_entity</entityName> + <fieldName>CampaignConsumer</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> </entityProvider> <entityConsumer> diff --git a/entity/Campaign_entity/recordcontainers/db/onDBInsert.js b/entity/Campaign_entity/recordcontainers/db/onDBInsert.js index 671b8177755d54e27c89f8f22b3592b9be2bcfc7..1792051b832d740de4c08365b71dd39d2e5a0873 100644 --- a/entity/Campaign_entity/recordcontainers/db/onDBInsert.js +++ b/entity/Campaign_entity/recordcontainers/db/onDBInsert.js @@ -23,7 +23,7 @@ var dateEnd = inThreeWeeks; var description = ""; var maxParticipants = 100; var state = $KeywordRegistry.campaignStepState$open(); -var sorting = 0; +var sorting = 1; var employeeContactId = vars.get("$field.EMPLOYEE_CONTACT_ID"); diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod index d9ab350b2ee6df71af1690c6db3775aeac3a2f17..2a7a0e7132908d6c823517aecade30db24875a9b 100644 --- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod +++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod @@ -19,6 +19,10 @@ <name>CampaignStepInfosGeneric</name> <entityField>#ENTITY</entityField> <fields> + <entityFieldLink> + <name>a5754668-2ba8-4c26-b8ab-f74e3c6c1085</name> + <entityField>CAMPAIGN_ID</entityField> + </entityFieldLink> <entityFieldLink> <name>4cbf0232-1dab-47f9-b62a-b539d5035c53</name> <entityField>DATE_START</entityField>