From 54383ed363049b4500557611c5f158e7375d797b Mon Sep 17 00:00:00 2001
From: "a.riedl" <a.riedl@adito.de>
Date: Thu, 18 Feb 2021 14:27:58 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Crowd-Development=20/=20Veranstaltu?=
=?UTF-8?q?ngsmanagement][TicketNr.:=201062887][Veranstaltunsmanagment=20-?=
=?UTF-8?q?=20Basisfunktionalit=C3=A4t=20auf=20Grundlage=20Campaign=20hers?=
=?UTF-8?q?tellen]=20-=20after=20merge=20Todos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Data_alias/basic/2020.1.1/changelog.xml | 4 ---
.../Event/addCampaignEventKeywords.xml} | 33 ++++++++++++++++---
.../Event/addEventToCampaign.xml} | 8 ++---
.../Event/addMemberRoleKeyword.xml} | 8 +++--
.../Event/alterMember.xml} | 3 +-
.../basic/2021.0.0/Event/changelog.xml | 7 ++++
.../Data_alias/basic/2021.0.0/changelog.xml | 1 +
.liquibase/Data_alias/changelog.xml | 2 +-
.../AnyContact_entity/AnyContact_entity.aod | 32 ++----------------
.../CampaignAddParticipants_entity.aod | 24 +++++---------
entity/Campaign_entity/Campaign_entity.aod | 2 +-
.../status/displayValueProcess.js | 6 ++++
.../entityfields/status/valueProcess.js | 2 +-
process/Campaign_lib/process.js | 1 +
process/KeywordRegistry_basic/process.js | 8 +++--
15 files changed, 71 insertions(+), 70 deletions(-)
rename .liquibase/Data_alias/basic/{2020.1.1/init_Campaign_Keyword.xml => 2021.0.0/Event/addCampaignEventKeywords.xml} (67%)
rename .liquibase/Data_alias/basic/{2020.1.1/change_Campaign.xml => 2021.0.0/Event/addEventToCampaign.xml} (65%)
rename .liquibase/Data_alias/basic/{2020.1.1/add_MemberRoleKeyword.xml => 2021.0.0/Event/addMemberRoleKeyword.xml} (82%)
rename .liquibase/Data_alias/basic/{2020.1.1/alter_member.xml => 2021.0.0/Event/alterMember.xml} (63%)
create mode 100644 .liquibase/Data_alias/basic/2021.0.0/Event/changelog.xml
create mode 100644 entity/Campaign_entity/entityfields/status/displayValueProcess.js
diff --git a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
index 38122d35ca..f5686ce22c 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.1/changelog.xml
@@ -2,8 +2,4 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="AlterTablesToDatetime.xml"/>
- <include relativeToChangelogFile="true" file="change_Campaign.xml"/>
- <include relativeToChangelogFile="true" file="init_Campaign_Keyword.xml"/>
- <include relativeToChangelogFile="true" file="alter_member.xml"/>
- <include relativeToChangelogFile="true" file="add_MemberRoleKeyword.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/init_Campaign_Keyword.xml b/.liquibase/Data_alias/basic/2021.0.0/Event/addCampaignEventKeywords.xml
similarity index 67%
rename from .liquibase/Data_alias/basic/2020.1.1/init_Campaign_Keyword.xml
rename to .liquibase/Data_alias/basic/2021.0.0/Event/addCampaignEventKeywords.xml
index ce5c796feb..e229b58391 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/init_Campaign_Keyword.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/Event/addCampaignEventKeywords.xml
@@ -1,14 +1,22 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="a.riedl" id="075f14fa-67a6-4841-8d6b-c85b7b576e82">
+
+ <insert tableName="AB_KEYWORD_CATEGORY">
+ <column name="AB_KEYWORD_CATEGORYID" value="aa725d7c-6707-44cb-8b9d-89f00b036e45"/>
+ <column name="NAME" value="CampaignType"/>
+ <column name="SORTINGBY" valueNumeric="0"/>
+ <column name="SORTINGDIRECTION" value="ASC"/>
+ </insert>
+
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="694bd22f-40b3-4545-bd74-354d6c82b202"/>
<column name="KEYID" value="CAMPAIGN"/>
<column name="TITLE" value="Campaign"/>
<column name="CONTAINER" value="CampaignType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="aa725d7c-6707-44cb-8b9d-89f00b036e45"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -18,17 +26,28 @@
<column name="KEYID" value="EVENT"/>
<column name="TITLE" value="Event"/>
<column name="CONTAINER" value="CampaignType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="aa725d7c-6707-44cb-8b9d-89f00b036e45"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
+
<changeSet id="c7366ea1-c62d-4f9c-a6e1-a580a80bdc5b" author="a.riedl">
+
+ <insert tableName="AB_KEYWORD_CATEGORY">
+ <column name="AB_KEYWORD_CATEGORYID" value="a3a157f4-9bf2-44bb-8359-76766cc789d1"/>
+ <column name="NAME" value="EventType"/>
+ <column name="SORTINGBY" valueNumeric="0"/>
+ <column name="SORTINGDIRECTION" value="ASC"/>
+ </insert>
+
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6d154ce1-b581-4df5-9cd9-adaccc884fdf"/>
<column name="KEYID" value="FAIR"/>
<column name="TITLE" value="Fair"/>
<column name="CONTAINER" value="EventType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="a3a157f4-9bf2-44bb-8359-76766cc789d1"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -38,6 +57,7 @@
<column name="KEYID" value="TRAINING"/>
<column name="TITLE" value="advanced training"/>
<column name="CONTAINER" value="EventType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="a3a157f4-9bf2-44bb-8359-76766cc789d1"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -45,21 +65,24 @@
</changeSet>
<changeSet id="9842b17d-790a-483c-8d36-f74720009c7f" author="a.riedl">
<insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="4dc5022c-b1f4-4bc5-8527-bf0097a0ddaf"/>
+ <column name="AB_KEYWORD_ENTRYID" value="867f23a3-9335-4e7b-8cc0-21d05d9af6ea"/>
<column name="KEYID" value="OTHER"/>
<column name="TITLE" value="other"/>
<column name="CONTAINER" value="EventType"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="a3a157f4-9bf2-44bb-8359-76766cc789d1"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
+
<changeSet id="0e5681f5-8140-4489-b9de-1656777b66ac" author="a.riedl">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="6dbf5ebe-604a-4b67-b664-09f2af048570"/>
<column name="NAME" value="Event"/>
<column name="KIND" value="BOOL_VALUE"/>
<column name="CONTAINER" value="MemberRole"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="b3765719-9d07-41c4-a813-18bc9056db1a"/>
</insert>
</changeSet>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.1/change_Campaign.xml b/.liquibase/Data_alias/basic/2021.0.0/Event/addEventToCampaign.xml
similarity index 65%
rename from .liquibase/Data_alias/basic/2020.1.1/change_Campaign.xml
rename to .liquibase/Data_alias/basic/2021.0.0/Event/addEventToCampaign.xml
index 019e4a8263..f69e5e5825 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/change_Campaign.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/Event/addEventToCampaign.xml
@@ -1,7 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="a.riedl" id="936e2da5-8aaf-4644-912e-d69a96d3ea6b">
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="A.Riedl" id="710d2053-4387-4bc3-8412-5e373f569bb4">
<addColumn tableName="CAMPAIGN">
<column name="TYPE" type="varchar(36)"/>
<column name="CAMPAIGNCODE" type="Integer"/>
@@ -14,5 +13,4 @@
<column name="CAMPAIGNCODE"/>
</createIndex>
</changeSet>
-
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.1/add_MemberRoleKeyword.xml b/.liquibase/Data_alias/basic/2021.0.0/Event/addMemberRoleKeyword.xml
similarity index 82%
rename from .liquibase/Data_alias/basic/2020.1.1/add_MemberRoleKeyword.xml
rename to .liquibase/Data_alias/basic/2021.0.0/Event/addMemberRoleKeyword.xml
index 318dcf7f8e..41636a90b6 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/add_MemberRoleKeyword.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/Event/addMemberRoleKeyword.xml
@@ -1,12 +1,14 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet id="5d43fb21-4b28-4256-a6e1-bac454f84c2b" author="a.riedl">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="af00e6ba-d7d4-4ebf-8d38-892b4df701c8"/>
<column name="KEYID" value="MEMROLEEVENTPLANER"/>
<column name="TITLE" value="Event Planer"/>
<column name="CONTAINER" value="MEMBERROLE"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="a3a157f4-9bf2-44bb-8359-76766cc789d1"/>
<column name="SORTING" valueNumeric="7"/>
<column name="ISACTIVE" valueNumeric="1"/>
</insert>
@@ -16,11 +18,11 @@
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6dbf5ebe-604a-4b67-b664-09f2af048570"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
- <insert tableName="ab_keyword_attributerelation">
+ <insert tableName="ab_keyword_attributerelation">
<column name="AB_KEYWORD_ENTRY_ID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="df993a29-661c-44db-a328-2a33e59ad6f4"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6dbf5ebe-604a-4b67-b664-09f2af048570"/>
<column name="BOOL_VALUE" valueNumeric="1"/>
</insert>
</changeSet>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.1/alter_member.xml b/.liquibase/Data_alias/basic/2021.0.0/Event/alterMember.xml
similarity index 63%
rename from .liquibase/Data_alias/basic/2020.1.1/alter_member.xml
rename to .liquibase/Data_alias/basic/2021.0.0/Event/alterMember.xml
index 952f746477..3e1e7667e5 100644
--- a/.liquibase/Data_alias/basic/2020.1.1/alter_member.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/Event/alterMember.xml
@@ -1,6 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="a.riedl" id="dbbc5a73-9c7a-49df-b445-3a36b8553c97">
<addColumn tableName="OBJECTMEMBER">
<column name="ONSITE" type="TINYINT"/>
diff --git a/.liquibase/Data_alias/basic/2021.0.0/Event/changelog.xml b/.liquibase/Data_alias/basic/2021.0.0/Event/changelog.xml
new file mode 100644
index 0000000000..357ddb570b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.0/Event/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="addCampaignEventKeywords.xml" relativeToChangelogFile="true"/>
+ <include file="addEventToCampaign.xml" relativeToChangelogFile="true"/>
+ <include file="addMemberRoleKeyword.xml" relativeToChangelogFile="true"/>
+ <include file="alterMember.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
index 21d9b6123c..369b1fbe26 100644
--- a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
@@ -15,4 +15,5 @@
<include relativeToChangelogFile="true" file="KeywordMigration/changelog.xml"/>
<include relativeToChangelogFile="true" file="addDateNewToSalesproject.xml"/>
<include relativeToChangelogFile="true" file="EwsContactSync/create_ab_synccontact.xml"/>
+ <include relativeToChangelogFile="true" file="Event/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 12d0865aeb..7324a01f07 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -22,5 +22,5 @@
<include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
- <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+ <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index cc2fc5ac9d..b41d02b4f3 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -5,8 +5,8 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
- <afterUiInit>%aditoprj%/entity/AnyContact_entity/afterUiInit.js</afterUiInit><initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
- iner>db</recordContainer>
+ <initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
+ <recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
@@ -79,24 +79,6 @@
</entityDependency>
</dependencies>
</entityProvider>
- <entityProvider>
- <name>ContactsByIds</name>
- <documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>OrgAndPersDuplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
<entityParameter>
<name>ContactIds_param</name>
<expose v="true" />
@@ -218,17 +200,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="true" />
- </entityParameter>
<entityParameter>
<name>OnlyPers_param</name>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/onlypers_param/valueProcess.js</valueProcess>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 56e1bb13c0..8324c5b4b9 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -62,6 +62,11 @@
</entityConsumer>
<entityConsumer>
<name>CampaignStepConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -69,11 +74,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
@@ -158,7 +158,8 @@
<useAggregates v="true" />
</entityProvider>
</entityFields>
- <re <jDitoRecordContainer>
+ <recordContainers>
+ <jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
@@ -169,16 +170,7 @@
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
-<jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <recordFieldMappings>
- <jDitoRecordFieldMapping>
- <name>UID.value</name>
- </jDitoRecordFieldMapping>
- </recordFieldMappings>
- </jDitoRecordContainer>
-<datalessRecordC <datalessRecorontainer>
+ <datalessRecordContainer>
<name>datalessConfig</name>
<alias>Data_alias</alias>
</datalessRecordContainer>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index da163c5ad2..8c048c598b 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -5,7 +5,6 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Campaign_entity/documentation.adoc</documentation>
<icon>VAADIN:GROUP</icon>
- <title>Campaign</title>
<siblings>
<element>CampaignStep_entity</element>
<element>CampaignCost_entity</element>
@@ -151,6 +150,7 @@
<groupable v="true" />
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>KeywordStates</name>
diff --git a/entity/Campaign_entity/entityfields/status/displayValueProcess.js b/entity/Campaign_entity/entityfields/status/displayValueProcess.js
new file mode 100644
index 0000000000..2b82fe77f1
--- /dev/null
+++ b/entity/Campaign_entity/entityfields/status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.campaignState(), vars.get("$field.STATUS")));
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/status/valueProcess.js b/entity/Campaign_entity/entityfields/status/valueProcess.js
index c3b6c3a036..9c9c88e60d 100644
--- a/entity/Campaign_entity/entityfields/status/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/status/valueProcess.js
@@ -4,4 +4,4 @@ import("system.vars");
import("system.result");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
- result.string($KeywordRegistry.campaignState$planning);
\ No newline at end of file
+ result.string($KeywordRegistry.campaignState$planning());
\ No newline at end of file
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 09cdb43266..041782da43 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.util");
import("system.translate");
import("system.vars");
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index ce1e3f245e..59ae38c2a9 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -319,7 +319,8 @@ $KeywordRegistry.campaignType$Event = function(){return "EVENT";};
$KeywordRegistry.eventType = function(){return "EventType";};
$KeywordRegistry.eventType$fair = function(){return "FAIR";};
$KeywordRegistry.eventType$other = function(){return "OTHER";};
-$KeywordRegistry.eventType$training = function(){return "TRAINING";};$KeywordRegistry.notificationState = function(){ return "NotificationState";};
+$KeywordRegistry.eventType$training = function(){return "TRAINING";};
+$KeywordRegistry.notificationState = function(){ return "NotificationState";};
$KeywordRegistry.notificationState$unseen = function(){return "UNSEEN";};
$KeywordRegistry.notificationState$seen = function(){return "SEEN";};
@@ -344,7 +345,8 @@ $KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
$KeywordRegistry.visitPlanEntryStatusAppointment = function(){return "VisitPlanEntryStatusAppointment";};
$KeywordRegistry.visitPlanEntryStatusAppointment$requested = function(){return "VISITSTATUSAPPOINTMENTREQUESTED";};
-$KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};$KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
+$KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};
+$KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};
$KeywordRegistry.notificationPriority = function(){ return "NotificationPriority";};
$KeywordRegistry.notificationPriority$none = function(){ return "NONE";};
@@ -353,7 +355,7 @@ $KeywordRegistry.notificationPriority$normal = function(){ return "NORMAL";};
$KeywordRegistry.notificationPriority$hight = function(){ return "HIGH";};
$KeywordRegistry.notificationPriority$max = function(){ return "MAX";};
-$KeywordRegistry.visitPlanEntryStatusAppointment$confirmed = function(){return "VISITSTATUSAPPOINTMENTCONFIRMED";};$KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
+$KeywordRegistry.knowledgePublishLevel$public = function(){return "PUBLIC";}
$KeywordRegistry.checklistEntryType = function(){return "ChecklistEntryType";}
$KeywordRegistry.checklistEntryType$manual = function(){return "MANUAL";}
--
GitLab