From 18b74f1c225bce5e7b63597483122f835fc92b2d Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Mon, 25 Mar 2019 16:57:37 +0100
Subject: [PATCH] =?UTF-8?q?1036518=20-=20Kampagnen=20k=C3=B6nnen=20angeleg?=
=?UTF-8?q?t,=20gel=C3=B6scht=20und=20aufgelistet=20werden=20Einer=20Kampa?=
=?UTF-8?q?gne=20k=C3=B6nnen=20mehrere=20Schritte=20hinzugef=C3=BCgt=20wer?=
=?UTF-8?q?den.=20Ein=20KS=20kann=20im=20Detail=20betrachtet=20werden.=20E?=
=?UTF-8?q?s=20gibt=20nun=20ein=20Entity=20f=C3=BCr=20CampaignParticipants?=
=?UTF-8?q?=20Kleinere=20benamungsfehler=20wurden=20behoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--> Inhalt nicht nur der des erwähnten Tickets. Das nächste mal dann.
---
.../CampaignParticipant_entity.aod | 58 +++++++++++++++++
.../CampaignStep_entity.aod | 63 ++++++++++++++++---
.../entityfields/campaign_id/valueProcess.js | 6 ++
.../campaignidparameter/valueProcess.js | 6 ++
.../campaignstepidparameter/valueProcess.js | 6 ++
.../valueProcess.js | 0
.../entityfields/date_edit/valueProcess.js | 7 +++
.../entityfields/date_new/valueProcess.js | 7 +++
.../entityfields/user_edit/valueProcess.js | 7 +++
.../entityfields/user_new/valueProcess.js | 7 +++
.../recordcontainers/db/conditionProcess.js | 11 ++++
entity/Campaign_entity/Campaign_entity.aod | 23 +++++--
.../valueProcess.js | 0
.../children/campaignid_param/valueProcess.js | 2 +
.../CampaignParticipant.aod | 13 ++++
neonContext/CampaignSteps/CampaignSteps.aod | 33 ++++++++++
.../CampaignEdit_view/CampaignEdit_view.aod | 7 ++-
.../CampaignMain_view/CampaignMain_view.aod | 9 +--
.../CampaignParticipant_view.aod | 24 +++++++
.../CampaignPreview_view.aod | 3 +
.../CampaignStepAnalysis_view.aod | 24 +++++++
.../CampaignStepEdit_view.aod | 45 +++++++++++++
.../CampaignStepFilter_view.aod | 45 +++++++++++++
.../CampaignStepMain_view.aod | 28 +++++++++
.../CampaignStepPreview_view.aod | 18 ++++++
.../_____PREFERENCES_PROJECT.aod | 2 +-
26 files changed, 433 insertions(+), 21 deletions(-)
create mode 100644 entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
create mode 100644 entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js
rename entity/CampaignStep_entity/entityfields/{campaignstepid => campaignstep_id}/valueProcess.js (100%)
create mode 100644 entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/date_new/valueProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/CampaignStep_entity/entityfields/user_new/valueProcess.js
create mode 100644 entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
rename entity/Campaign_entity/entityfields/{campaignid => campaign_id}/valueProcess.js (100%)
create mode 100644 neonContext/CampaignParticipant/CampaignParticipant.aod
create mode 100644 neonContext/CampaignSteps/CampaignSteps.aod
create mode 100644 neonView/CampaignParticipant_view/CampaignParticipant_view.aod
create mode 100644 neonView/CampaignStepAnalysis_view/CampaignStepAnalysis_view.aod
create mode 100644 neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
create mode 100644 neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
create mode 100644 neonView/CampaignStepMain_view/CampaignStepMain_view.aod
create mode 100644 neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
new file mode 100644
index 00000000000..8b7d10d62ff
--- /dev/null
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>CampaignParticipant_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>CampaignParticipantsProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>1a727368-27ec-4149-95ee-62b8d1513ffb</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignParticipantsConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>CampaignStepIdParameter</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>CampaignIdParameter</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>CAMPAIGNPARTICIPANT_ID</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>ParticipantsDbRecordContainer</name>
+ <alias>Data_alias</alias>
+ <linkInformation>
+ <linkInformation>
+ <name>89397969-c622-4ce7-90bd-6b68b8d0d70d</name>
+ <tableName>CAMPAIGNPARTICIPANT</tableName>
+ <primaryKey>CAMPAIGNPARTICIPANTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGNPARTICIPANT_ID.value</name>
+ <recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 176cccac132..21312819fda 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -9,41 +9,58 @@
<name>#PROVIDER</name>
</entityProvider>
<entityField>
- <name>CAMPAIGNSTEPID</name>
- <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js</valueProcess>
+ <name>CAMPAIGNSTEP_ID</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CAMPAIGN_ID</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>EMPLOYEE_CONTACT_ID</name>
+ <title>Zuständiger</title>
</entityField>
<entityField>
<name>NAME</name>
+ <title>Name</title>
</entityField>
<entityField>
<name>DATE_START</name>
+ <title>Beginn</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>DATE_END</name>
+ <title>Ende</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>STATE</name>
+ <title>Status</title>
</entityField>
<entityField>
<name>SORTING</name>
+ <title>Reihenfolge</title>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
<name>CampaignSteps</name>
@@ -56,18 +73,50 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>campaignId_param</name>
+ <triggerRecalculation v="false" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>campaignId_param</name>
<expose v="true" />
- <triggerRecalculation v="true" />
+ <triggerRecalculation v="false" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>CampaignParticipantsConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>CampaignParticipantsProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CampaignIdParameter</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CampaignStepIdParameter</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>0199eaa2-5fc5-4f91-a1ec-a9bc77117f69</name>
@@ -82,10 +131,6 @@
<name>CAMPAIGN_ID.value</name>
<recordfield>CAMPAIGNSTEP.CAMPAIGN_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CAMPAIGNSTEPID.value</name>
- <recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>CAMPAIGNSTEP.DATE_EDIT</recordfield>
@@ -126,6 +171,10 @@
<name>USER_NEW.value</name>
<recordfield>CAMPAIGNSTEP.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGNSTEP_ID.value</name>
+ <recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
new file mode 100644
index 00000000000..a75d01ab7d6
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+
+loggin.log("______CampaignStep_Campaign_ID_valueProcess: -> " + vars.get("$param.campaignId_param"));
+if(vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+ result.string(vars.get("$param.campaignId_param"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js
new file mode 100644
index 00000000000..2322e402b17
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log("CampaignStep_ParameterValueProcess_CAMPAIGN_ID_" + vars.getString("$field.CAMPAIGN_ID"));
+result.string(vars.getString("$field.CAMPAIGN_ID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js
new file mode 100644
index 00000000000..a8a428395c2
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log("CampaignStep_ParameterValueProcess_CAMPAIGNSTEP_ID_" + vars.getString("$field.CAMPAIGNSTEP_ID"));
+result.string(vars.getString("$field.CAMPAIGNSTEP_ID"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignstep_id/valueProcess.js
similarity index 100%
rename from entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js
rename to entity/CampaignStep_entity/entityfields/campaignstep_id/valueProcess.js
diff --git a/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js b/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 00000000000..5e6ef059738
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js b/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 00000000000..a72892783bf
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js b/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 00000000000..6af880ae3e0
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js b/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 00000000000..e518bc75a94
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js b/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 00000000000..40541379951
--- /dev/null
+++ b/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,11 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+
+if(vars.exists("$param.campaignId_param") && vars.get("$param.campaignId_param"))
+{
+ logging.log("CampaignStepDBRC_conditionProcess: campaignId_param -> " + vars.get("$param.campaignId_param"));
+ result.string("CAMPAIGN_ID = '" + vars.getString("$param.campaignId_param") + "'");
+}
+else
+ result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 8da24d4bcaf..46d8b59f81e 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -10,26 +10,34 @@
<name>#PROVIDER</name>
</entityProvider>
<entityField>
- <name>CAMPAIGNID</name>
- <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignid/valueProcess.js</valueProcess>
+ <name>CAMPAIGN_ID</name>
+ <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>NAME</name>
+ <title>Name</title>
</entityField>
<entityField>
<name>DATE_START</name>
+ <title>Beginn</title>
<contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
<entityField>
<name>DATE_END</name>
+ <title>Ende</title>
<contentType>DATE</contentType>
+ <resolution>DAY</resolution>
</entityField>
<entityField>
<name>EMPLOYEE_CONTACT_ID</name>
+ <title>Zuständiger</title>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
+ <title>Beschreibung</title>
</entityField>
<entityField>
<name>USER_NEW</name>
@@ -61,6 +69,9 @@
<entityParameter>
<name>campaignId_param</name>
<valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <triggerRecalculation v="false" />
+ <mandatory v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -79,10 +90,6 @@
</linkInformation>
</linkInformation>
<recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CAMPAIGNID.value</name>
- <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>CAMPAIGN.DATE_EDIT</recordfield>
@@ -119,6 +126,10 @@
<name>USER_NEW.value</name>
<recordfield>CAMPAIGN.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGN_ID.value</name>
+ <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Campaign_entity/entityfields/campaignid/valueProcess.js b/entity/Campaign_entity/entityfields/campaign_id/valueProcess.js
similarity index 100%
rename from entity/Campaign_entity/entityfields/campaignid/valueProcess.js
rename to entity/Campaign_entity/entityfields/campaign_id/valueProcess.js
diff --git a/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js b/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
index 8a0c74b5a7f..01e82815db1 100644
--- a/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
@@ -1,4 +1,6 @@
+import("system.logging");
import("system.result");
import("system.vars");
+logging.log("CampaignEntity_ValueProcess__" + vars.getString("$field.CAMPAIGN_ID"));
result.string(vars.getString("$field.CAMPAIGN_ID"));
\ No newline at end of file
diff --git a/neonContext/CampaignParticipant/CampaignParticipant.aod b/neonContext/CampaignParticipant/CampaignParticipant.aod
new file mode 100644
index 00000000000..0f608080c87
--- /dev/null
+++ b/neonContext/CampaignParticipant/CampaignParticipant.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <entity>CampaignParticipant_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>2937d001-c1c8-40a0-9eac-f575fcc7c251</name>
+ <view>CampaignParticipant_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/CampaignSteps/CampaignSteps.aod b/neonContext/CampaignSteps/CampaignSteps.aod
new file mode 100644
index 00000000000..b4027a7cd02
--- /dev/null
+++ b/neonContext/CampaignSteps/CampaignSteps.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>CampaignSteps</name>
+ <title>Kampagnen Schritte</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>CampaignStepMain_view</mainview>
+ <filterview>CampaignStepFilter_view</filterview>
+ <editview>CampaignStepEdit_view</editview>
+ <preview>CampaignStepPreview_view</preview>
+ <entity>CampaignStep_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>9c8fa482-9c3b-4ea8-82b0-91979cc2936d</name>
+ <view>CampaignStepFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c11ece8f-3ddf-416f-8b22-eaa2dda085eb</name>
+ <view>CampaignStepEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3de647e9-f3fb-47c8-8ba8-093f3e00a41c</name>
+ <view>CampaignStepPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b0b74015-6ed3-4ad4-bd72-b4017fe85e54</name>
+ <view>CampaignStepMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>bd922414-bd4c-4313-8564-85f27156159e</name>
+ <view>CampaignStepAnalysis_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/CampaignEdit_view/CampaignEdit_view.aod b/neonView/CampaignEdit_view/CampaignEdit_view.aod
index d7b94e2ca31..4ee7a5c8e2c 100644
--- a/neonView/CampaignEdit_view/CampaignEdit_view.aod
+++ b/neonView/CampaignEdit_view/CampaignEdit_view.aod
@@ -12,10 +12,11 @@
<children>
<genericViewTemplate>
<name>Edit</name>
+ <editMode v="true" />
<showDrawer v="false" />
<drawerCaption></drawerCaption>
<entityField>#ENTITY</entityField>
- <title></title>
+ <title>Neue Kampagne</title>
<fields>
<entityFieldLink>
<name>8471feb0-7688-4c69-96b0-f731bb87718a</name>
@@ -26,8 +27,8 @@
<entityField>DATE_START</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>9753ff1a-77b8-41c7-9290-ef900dc9e6fe</name>
- <entityField>DATE_EDIT</entityField>
+ <name>6097ccbb-e0a5-43c0-af3f-258b03b35149</name>
+ <entityField>DATE_END</entityField>
</entityFieldLink>
<entityFieldLink>
<name>83a486a0-3297-4d6d-85bd-77f0f42b80d6</name>
diff --git a/neonView/CampaignMain_view/CampaignMain_view.aod b/neonView/CampaignMain_view/CampaignMain_view.aod
index 677b8f85598..dd7914ea825 100644
--- a/neonView/CampaignMain_view/CampaignMain_view.aod
+++ b/neonView/CampaignMain_view/CampaignMain_view.aod
@@ -15,9 +15,10 @@
<entityField>#ENTITY</entityField>
<view>CampaignPreview_view</view>
</neonViewReference>
- <tableViewTemplate>
- <name>Steps</name>
- <title>Campaign Steps</title>
- </tableViewTemplate>
+ <neonViewReference>
+ <name>ad66a5a6-65fb-45d5-bf62-45661fc16e30</name>
+ <entityField>CampaignSteps</entityField>
+ <view>CampaignStepFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/CampaignParticipant_view/CampaignParticipant_view.aod b/neonView/CampaignParticipant_view/CampaignParticipant_view.aod
new file mode 100644
index 00000000000..3b7cd70594f
--- /dev/null
+++ b/neonView/CampaignParticipant_view/CampaignParticipant_view.aod
@@ -0,0 +1,24 @@
+<?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>
+ <title>Kontakteasdasd</title>
+ <description>asd</description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>ParticipantsTable</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>acaebc0d-c0f0-4985-a50e-d289ab0077a8</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index 9988e3cb4ba..cf627fdfa81 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -13,6 +13,9 @@
<cardViewTemplate>
<name>Header</name>
<titleField>NAME</titleField>
+ <subtitleField></subtitleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <entityField>#ENTITY</entityField>
</cardViewTemplate>
</children>
</neonView>
diff --git a/neonView/CampaignStepAnalysis_view/CampaignStepAnalysis_view.aod b/neonView/CampaignStepAnalysis_view/CampaignStepAnalysis_view.aod
new file mode 100644
index 00000000000..1bcab23165e
--- /dev/null
+++ b/neonView/CampaignStepAnalysis_view/CampaignStepAnalysis_view.aod
@@ -0,0 +1,24 @@
+<?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>CampaignStepAnalysis_view</name>
+ <title>Auswertung</title>
+ <description>Charts als Ãœbersicht der Kosten des Kampagnenschrittes</description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>54</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79aa1ec7-815a-4494-9d1c-c8116ea8d952</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
new file mode 100644
index 00000000000..76f9e26f1dd
--- /dev/null
+++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
@@ -0,0 +1,45 @@
+<?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>CampaignStepEdit_view</name>
+ <title>Neuer Kampagnenschritt</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>StepGeneric</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <title>Neuer Kampagnenschritt</title>
+ <fields>
+ <entityFieldLink>
+ <name>db2e792a-b224-4c93-99ef-96c54c5c703f</name>
+ <entityField>NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e16e3f66-7e80-4796-acca-6018e86e1b88</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ea21096b-5885-4f5e-8bd6-c45275b25036</name>
+ <entityField>DATE_START</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>95e538ba-686b-4791-87f0-cd569b8cb456</name>
+ <entityField>DATE_END</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>80c1df2f-2458-4e4c-a6da-9ce56b17bbf0</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>730fed82-9f80-46f5-ab5d-f16a60666faa</name>
+ <entityField>SORTING</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
new file mode 100644
index 00000000000..0aeea8c5456
--- /dev/null
+++ b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
@@ -0,0 +1,45 @@
+<?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>CampaignStepFilter_view</name>
+ <title>Kampagnenschritte</title>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>StepsTable</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>5d52aaef-ec22-4c45-9ac7-eaec5d967283</name>
+ <entityField>SORTING</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d9ca59de-1441-494a-91f0-1cff91c575de</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3efaade9-c5f6-49d7-9eda-e954487dba99</name>
+ <entityField>EMPLOYEE_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0ffcc021-2b58-49f6-91d0-21f4029f744f</name>
+ <entityField>DATE_START</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2507d34f-3bc2-426c-9acc-d8ae146daee8</name>
+ <entityField>DATE_END</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9fa9d9f4-5851-4125-ba59-09aa2fb07f89</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepMain_view/CampaignStepMain_view.aod b/neonView/CampaignStepMain_view/CampaignStepMain_view.aod
new file mode 100644
index 00000000000..dcfbfe2ae31
--- /dev/null
+++ b/neonView/CampaignStepMain_view/CampaignStepMain_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>CampaignStepMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>3dfd5e35-275b-412f-8729-2a59e3a2c025</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>3dfd5e35-275b-412f-8729-2a59e3a2c025</name>
+ <entityField>#ENTITY</entityField>
+ <view>CampaignStepPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f1a098ae-1516-49bc-9982-8f96ec0dbe2b</name>
+ <entityField>CampaignParticipantsConsumer</entityField>
+ <view>CampaignParticipant_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dd0cb348-669f-431a-ba71-65e9a651c922</name>
+ <entityField>#ENTITY</entityField>
+ <view>CampaignStepAnalysis_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
new file mode 100644
index 00000000000..da9bb1bd3cf
--- /dev/null
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -0,0 +1,18 @@
+<?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>CampaignStepPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>CampaignStepCard</name>
+ <titleField>NAME</titleField>
+ <subtitleField>STATE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ </children>
+</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 35430f5089f..e9e58d59a26 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>
--
GitLab