From a0d1f80fefc159e58e20374d6238f2c4a0ce3612 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Tue, 11 Jun 2019 16:39:09 +0200
Subject: [PATCH] campaign step medium
---
.../create_campaignStep.xml | 1 +
aliasDefinition/Data_alias/Data_alias.aod | 14 +++++++++++
.../CampaignStep_entity.aod | 23 +++++++++++++++++++
.../containername_param/valueProcess.js | 5 ++++
.../KeywordEntry_entity.aod | 8 ++++++-
.../CampaignStepEdit_view.aod | 4 ++++
.../CampaignStepFilter_view.aod | 4 ++++
.../CampaignStepPreview_view.aod | 4 ++++
8 files changed, 62 insertions(+), 1 deletion(-)
create mode 100644 entity/CampaignStep_entity/entityfields/campaignstepmedium/children/containername_param/valueProcess.js
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 5b29140f92..af9a3b5dd8 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 32e31e96d5..7e839049a4 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 000100c0d6..85a4bb26aa 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 0000000000..a944db3259
--- /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 aa26551f37..d3a8cb9467 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 20cbfd7dd1..aeea8c61fe 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 a9ab180e53..4a977717c0 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 d08ef3dfc4..b513e093b2 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>
--
GitLab