diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index b476c1e2ecdd5a7cc7a2bb6aca80374bf93915fc..81d2c2dc6bd5532d791dbe6e2c630c2bd3419939 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -30,6 +30,7 @@
<icon>VAADIN:GROUP</icon>
<node name="Group4" kind="123" title="">
<node name="Campaign" kind="10077" />
+ <node name="CampaignParticipant" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 8b7d10d62ffd8f27ad21bba9187807f8eac141df..db914af7a8a95e6030084bbd9fb39ac3c2464468 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -33,6 +33,23 @@
<entityField>
<name>CAMPAIGNPARTICIPANT_ID</name>
</entityField>
+ <entityField>
+ <name>SELECTEDCAMPAIGN</name>
+ <consumer>CampaignsConsumer</consumer>
+ </entityField>
+ <entityField>
+ <name>CAMPAIGNSTEP</name>
+ </entityField>
+ <entityConsumer>
+ <name>CampaignsConsumer</name>
+ <title>Campaign</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignsProvider</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..42ea3ef828ff969d88c3c4752232117c7f7e7e89
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
@@ -0,0 +1,4 @@
+import("system.neon");
+
+
+neon.setFieldValue("$field.SYSTEMTEMPLATE", templateId);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 6303abe1cdc8b244dcefedf6e4b6b080f5cc1f0a..1dcfdf534bcd7efe0e47f4bbfc4bae646a396b55 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -104,6 +104,19 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityProvider>
+ <name>CampaignsProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7cb37ad1-a0a9-41bc-9a9e-7207317cd812</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>CampaignsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/neonContext/CampaignParticipant/CampaignParticipant.aod b/neonContext/CampaignParticipant/CampaignParticipant.aod
index 0f608080c870675962a9ffeb47156f979fcc11b4..c28e2655663fb34786b2c69924cb8946e2993509 100644
--- a/neonContext/CampaignParticipant/CampaignParticipant.aod
+++ b/neonContext/CampaignParticipant/CampaignParticipant.aod
@@ -2,12 +2,17 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>CampaignParticipant</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>CampaignParticipant_view</filterview>
+ <filterview>CampaignParticipantFilter_view</filterview>
+ <editview>CapmaignParticipantEdit_view</editview>
<entity>CampaignParticipant_entity</entity>
<references>
<neonViewReference>
<name>2937d001-c1c8-40a0-9eac-f575fcc7c251</name>
- <view>CampaignParticipant_view</view>
+ <view>CampaignParticipantFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e52a3270-3a6c-48be-bf91-8b6118ccf57c</name>
+ <view>CapmaignParticipantEdit_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/CampaignParticipant_view/CampaignParticipant_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
similarity index 94%
rename from neonView/CampaignParticipant_view/CampaignParticipant_view.aod
rename to neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 3b7cd70594f1fa1d9abd75d807ff062bbc573ec5..3c0c5dea0c0cadc3af2035c040fe7a7cda4de3b3 100644
--- a/neonView/CampaignParticipant_view/CampaignParticipant_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>CampaignParticipant_view</name>
+ <name>CampaignParticipantFilter_view</name>
<title>Kontakteasdasd</title>
<description>asd</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/neonView/CampaignStepMain_view/CampaignStepMain_view.aod b/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
index dcfbfe2ae31ef75c3b06280c324351acc20d06e0..c03a9bca2a7a126150b9ac724f8ab49855b73271 100644
--- a/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
+++ b/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
@@ -17,7 +17,7 @@
<neonViewReference>
<name>f1a098ae-1516-49bc-9982-8f96ec0dbe2b</name>
<entityField>CampaignParticipantsConsumer</entityField>
- <view>CampaignParticipant_view</view>
+ <view>CampaignParticipantFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>dd0cb348-669f-431a-ba71-65e9a651c922</name>
diff --git a/neonView/CapmaignParticipantEdit_view/CapmaignParticipantEdit_view.aod b/neonView/CapmaignParticipantEdit_view/CapmaignParticipantEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3088726b0b8a5a09e3a4318ab17dd50cd86f82f9
--- /dev/null
+++ b/neonView/CapmaignParticipantEdit_view/CapmaignParticipantEdit_view.aod
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>CapmaignParticipantEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <fields>
+ <entityFieldLink>
+ <name>8de3502d-5464-4d4e-9c96-8bc65723a291</name>
+ <entityField>SELECTEDCAMPAIGN</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8ab0619d-7bc8-4371-b67f-a59639bc3cef</name>
+ <entityField>CAMPAIGNSTEP</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 35430f5089fee2c2b0e5c87d3278c5f9d34a897c..e9e58d59a26d3df831b4f50a02fb4dc67df36afa 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic 2019_1_3</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>