diff --git a/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml b/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml index 5b29140f9217ba97d26f811e0220b564f6ad6488..af9a3b5dd8774f9bac31fb21bbf4beac3047dfd4 100644 --- a/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml +++ b/.liquibase/Data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml @@ -39,6 +39,7 @@ <column name="USER_EDIT" type="NVARCHAR(50)" /> <column name="DATE_EDIT" type="DATE" /> <column name="PREDECESSORSTEP_ID" type="CHAR(36)" /> + <column name="STEP_MEDIUM" type="CHAR(36)" /> </createTable> </changeSet> </databaseChangeLog> \ No newline at end of file diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 32e31e96d5bff8abb488726c992823bbf826d853..7e839049a492c6cc1053b37a22ea2f3fc4eb027f 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -8672,6 +8672,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>STEP_MEDIUM</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 000100c0d6ab5a8301ba868675729d165f9f2ca5..85a4bb26aad8b74e7461abc347e8ba46066b4140 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -348,6 +348,25 @@ <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> + <entityField> + <name>STEP_MEDIUM</name> + <title>Medium</title> + <consumer>CampaignStepMedium</consumer> + </entityField> + <entityConsumer> + <name>CampaignStepMedium</name> + <dependency> + <name>dependency</name> + <entityName>KeywordEntry_entity</entityName> + <fieldName>SpecificContainerKeywords</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContainerName_param</name> + <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepmedium/children/containername_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> @@ -437,6 +456,10 @@ <name>PREDECESSORSTEP_ID.value</name> <recordfield>CAMPAIGNSTEP.PREDECESSORSTEP_ID</recordfield> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>STEP_MEDIUM.value</name> + <recordfield>CAMPAIGNSTEP.STEP_MEDIUM</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/CampaignStep_entity/entityfields/campaignstepmedium/children/containername_param/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignstepmedium/children/containername_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..a944db3259568d4c9b4453d682666704918a9b80 --- /dev/null +++ b/entity/CampaignStep_entity/entityfields/campaignstepmedium/children/containername_param/valueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string($KeywordRegistry.communicationMediumCampaign()); \ No newline at end of file diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod index aa26551f378a66f0f8627850828462d9b7c58885..d3a8cb9467c32513da7f209f1ebf259c8e3edbd0 100644 --- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod +++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod @@ -20,10 +20,10 @@ <name>CONTAINER</name> <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation> <title>Container</title> + <groupable v="true" /> <mandatory v="true" /> <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess> <textInputAllowed v="true" /> - <groupable v="true" /> <state>READONLY</state> <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess> </entityField> @@ -397,6 +397,12 @@ <fieldName>KeywordClassificationTypes</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>d79446e9-d983-4f7d-bce4-903bd2a69ada</name> + <entityName>CampaignStep_entity</entityName> + <fieldName>CampaignStepMedium</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> <children> <entityParameter> diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod index 20cbfd7dd1429ed22faa4f8c9ea298ae39291088..aeea8c61febbfbf77ba9f44812629487b58e1acd 100644 --- a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod +++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod @@ -52,6 +52,10 @@ <name>568fd355-f13f-4b40-801e-614790091fc5</name> <entityField>PREDECESSORSTEP_ID</entityField> </entityFieldLink> + <entityFieldLink> + <name>70f8cbeb-c3c2-400a-a9ea-3bab2eafa97a</name> + <entityField>STEP_MEDIUM</entityField> + </entityFieldLink> </fields> </genericViewTemplate> </children> diff --git a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod index a9ab180e53b4330cff6f740024f3585b2454c869..4a977717c0c4422e5a1769d121c3355771d1eb78 100644 --- a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod +++ b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod @@ -44,6 +44,10 @@ <name>9fa9d9f4-5851-4125-ba59-09aa2fb07f89</name> <entityField>STATE</entityField> </neonTableColumn> + <neonTableColumn> + <name>5599e14a-a1b9-4222-9e2f-d12922804486</name> + <entityField>STEP_MEDIUM</entityField> + </neonTableColumn> </columns> </tableViewTemplate> <ganttViewTemplate> diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod index d08ef3dfc477d11da7a0227415d35e4ad60a657b..b513e093b242473971424f5e558809999b4a98cd 100644 --- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod +++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod @@ -58,6 +58,10 @@ <name>0bffa6f8-cb18-47f8-a8f4-08cf9d718114</name> <entityField>CampaignStatus</entityField> </entityFieldLink> + <entityFieldLink> + <name>40873d2b-2449-4818-b608-cd336e96fae3</name> + <entityField>STEP_MEDIUM</entityField> + </entityFieldLink> </fields> </genericViewTemplate> <scoreCardViewTemplate>