From b1c476b07c319fc8de9d2a0b0c001857c23de06c Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Wed, 10 Apr 2019 08:39:20 +0200
Subject: [PATCH] Zwischenstand Erste Integration in 360 Grad Neues
Descriptionfeld Neue Aktion zum Stufe zu Updaten, funktioniert noch nicht.
---
aliasDefinition/Data_alias/Data_alias.aod | 14 +++++++
entity/360Degree_entity/360Degree_entity.aod | 9 +++++
.../newcampaignparticipant/onActionProcess.js | 9 +++++
.../newcampaignparticipant/stateProcess.js | 15 ++++++++
.../children/objecttype_param/valueProcess.js | 2 +-
.../children/objecttype_param/valueProcess.js | 2 +-
.../CampaignAddParticipants_entity.aod | 18 +++++++++
.../afterOperatingState.js | 2 +
.../campaign_id/displayValueProcess.js | 10 +++++
.../entityfields/campaign_id/valueProcess.js | 8 ++++
.../campaignstep_id/valueProcess.js | 9 +++++
.../recordcontainers/jdito/onInsert.js | 3 ++
.../recordcontainers/jdito/onUpdate.js | 38 +++++++++++++++++++
.../CampaignParticipant_entity.aod | 19 ++++++++++
.../contact_id/displayValueProcess.js | 3 ++
.../onActionProcess.js | 12 ++++++
.../CampaignStep_entity.aod | 9 +++++
entity/Campaign_entity/Campaign_entity.aod | 3 +-
.../CampaignParticipantFilter_view.aod | 1 +
.../CampaignStepEdit_view.aod | 6 ++-
.../CampaignStepPreview_view.aod | 1 +
.../Data_alias/basic/2019.2/changelog.xml | 1 +
.../create_campaignStep.xml | 1 +
.../_____PREFERENCES_PROJECT.aod | 2 +-
process/Campaign_lib/Campaign_lib.aod | 2 +-
process/Campaign_lib/process.js | 31 ++++++++++++++-
26 files changed, 223 insertions(+), 7 deletions(-)
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js
create mode 100644 entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
create mode 100644 entity/CampaignAddParticipants_entity/afterOperatingState.js
create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js
create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js
create mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
create mode 100644 entity/CampaignAddParticipants_entity/recordcontainers/jdito/onUpdate.js
create mode 100644 entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index fb634569f2..ef3197cd46 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6494,6 +6494,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="500" />
+ <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/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 66b17d986f..6a7428cd5b 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -121,6 +121,15 @@
<iconIdProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/iconIdProcess.js</iconIdProcess>
<stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js</stateProcess>
</entityActionField>
+ <entityActionField>
+ <name>newCampaignParticipant</name>
+ <fieldType>ACTION</fieldType>
+ <title>Add to campaign</title>
+ <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js</onActionProcess>
+ <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js</stateProcess>
+ <tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
+ </entityActionField>
</children>
</entityActionGroup>
<entityField>
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js
new file mode 100644
index 0000000000..6d99e6cb7b
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.vars");
+import("Campaign_lib");
+
+logging.log("ObjectType_param ->" + vars.get("$param.ObjectType_param"));
+logging.log("TARGET_CONTEXT ->" + vars.get("field.TARGET_CONTEXT"));
+logging.log("CONTEXT_NAME ->" + vars.get("field.CONTEXT_NAME"));
+logging.log("ObjectRowId_param -> " + vars.getString("$param.ObjectRowId_param"));
+//CampaignUtils.addParticipant(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
new file mode 100644
index 0000000000..2b00a9a7e3
--- /dev/null
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
+var found = false;
+contextList.forEach(function (context)
+{
+ if(context == "CampaignParticipant")
+ found = true;
+});
+if(found)
+ result.string(neon.COMPONENTSTATE_AUTO);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
index bb07a1ee2e..f2f54ecff3 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.object(["Salesproject", "Offer", "Contract"]);
\ No newline at end of file
+result.object(["Salesproject", "Offer", "Contract", "CampaignParticipant"]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 15de0e1ae4..8937eb967c 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.object(["Offer", "Contract"]);
\ No newline at end of file
+result.object(["Offer", "Contract", "CampaignParticipant"]);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 2bd6d6b593..d63bfbbe44 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -3,6 +3,7 @@
<name>CampaignAddParticipants_entity</name>
<title>Add participants to Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <afterOperatingState>%aditoprj%/entity/CampaignAddParticipants_entity/afterOperatingState.js</afterOperatingState>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -13,12 +14,18 @@
<title>Campaign</title>
<consumer>CampaignConsumer</consumer>
<mandatory v="true" />
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>CAMPAIGNSTEP_ID</name>
<title>Campaign Step</title>
<consumer>CampaignStepConsumer</consumer>
<mandatory v="true" />
+ <state>EDITABLE</state>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>campaignParticipantMessage</name>
@@ -59,6 +66,16 @@
<entityField>
<name>UID</name>
</entityField>
+ <entityParameter>
+ <name>currentCampaignId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>currentCampaignStepId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -66,6 +83,7 @@
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<recordFields>
<element>UID.value</element>
</recordFields>
diff --git a/entity/CampaignAddParticipants_entity/afterOperatingState.js b/entity/CampaignAddParticipants_entity/afterOperatingState.js
new file mode 100644
index 0000000000..0265fbd4f3
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/afterOperatingState.js
@@ -0,0 +1,2 @@
+import("system.logging");
+logging.log("hallo");
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js
new file mode 100644
index 0000000000..617c495254
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Campaign_lib");
+
+var campaignId = vars.get("$field.CAMPAIGN_ID");
+var campaignName = CampaignUtils.getCampaignNameById(campaignId);
+logging.log("CampaignAddParticipants: CAPMAIGN_ID displayValueProcess -> " + campaignName);
+result.string(campaignName);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js
new file mode 100644
index 0000000000..5deb886b88
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.exists("$param.currentCampaignId_param") && vars.get("$param.currentCampaignId_param"))
+{
+ result.string(vars.get("$param.currentCampaignId_param"));
+}
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
new file mode 100644
index 0000000000..dd3720d0cc
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.exists("$param.currentCampaignStepId_param") && vars.get("$param.currentCampaignStepId_param"))
+{
+ result.string(vars.get("$param.currentCampaignStepId_param"));
+}
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
index e8edf991ce..8315686b00 100644
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
@@ -1,8 +1,11 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("system.util");
import("Campaign_lib");
+logging.log("onInsert");
+
var campaignId = vars.getString("$field.CAMPAIGN_ID");
var campaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
var participants = JSON.parse(vars.getString("$param.campaignParticipants_param"));
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onUpdate.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000..0ac5d73051
--- /dev/null
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,38 @@
+import("Campaign_lib");
+import("system.vars");
+import("system.db");
+import("system.logging");
+
+logging.log("CampaignAddParticipants_entity_onUpdate");
+
+
+var campaignId = vars.getString("$field.CAMPAIGN_ID");
+var campaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
+var participants = JSON.parse(vars.getString("$param.campaignParticipants_param"));
+
+var colNamesCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnNames();
+var colTypesCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnTypes();
+let colsUpdate = [ "CAMPAIGNSTEP_ID",
+ "USER_EDIT",
+ "DATE_EDIT"
+ ];
+let colTypesUpdate = db.getColumnTypes("CAMPAIGNPARTICIPANT", colsUpdate);
+
+
+var dataArray = [];
+
+for (participant in participants)
+{
+ //var campaignParticipantId =
+ //var valsCampaignParticipantLog = new Array(campaignId, campaignStepId, participants[participant], , vars.get("$sys.user"), vars.get("$sys.date"));
+ let updatedValues = [campaignStepId,
+ vars.get("$sys.user"),
+ vars.get("$sys.date")];
+
+ let condition = "CAMPAIGNSTEP_ID = '" + campaignStepId + "' and CONTACT_ID = '" + participants[participant] + "'";
+
+ dataArray.push(["CAMPAIGNPARTICIPANT", colsUpdate, colTypesUpdate, updatedValues, condition]);
+ //dataArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, colTypesCampaignParticipantLog, valsCampaignParticipantLog]);
+}
+logging.log("dataArray" + JSON.stringify(dataArray));
+db.updates(dataArray);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index a049a87b4f..6b33d97ea8 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -63,6 +63,7 @@
<name>CAMPAIGN_ID</name>
<title>Campaign</title>
<consumer>CampaignsConsumer</consumer>
+ <state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js</onValueChange>
@@ -76,8 +77,14 @@
<name>CAMPAIGNSTEP_ID</name>
<title>Campaign Step</title>
<consumer>CampaignSteps</consumer>
+ <state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
</entityField>
<entityConsumer>
<name>CampaignsConsumer</name>
@@ -147,6 +154,18 @@
<name>CONTACTCONTEXT</name>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contactcontext/valueProcess.js</valueProcess>
</entityField>
+ <entityActionGroup>
+ <name>FilterViewActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>SetStepToParticipantSelection</name>
+ <fieldType>ACTION</fieldType>
+ <title>Set campaign step</title>
+ <onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ </entityActionField>
+ </children>
+ </entityActionGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js b/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js
index 85822946ab..e03fe3836f 100644
--- a/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,9 @@
+import("system.logging");
import("system.result");
import("system.vars");
import("Contact_lib");
import("system.neon");
+logging.log("contactid displayvalue -> " + vars.getString("$field.CONTACT_ID"));
+logging.log("getFullTitleById -> " + ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
new file mode 100644
index 0000000000..ce3dcbcf31
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.logging");
+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+
+if(vars.exists("$sys.selection")) //selektierte IDs als Array
+{
+ logging.log(vars.get("$sys.selection"));
+ logging.log(JSON.parse(vars.get("$sys.selection")));
+
+ CampaignUtils.openSetCampaignStepView(vars.get("$sys.selection"), vars.get("$param.CampaignId_param"), vars.get("$param.CampaignStepId_param"));
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 07b6defe07..5331e0ea56 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -177,6 +177,11 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstatus/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -250,6 +255,10 @@
<name>CAMPAIGNSTEPID.value</name>
<recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>CAMPAIGNSTEP.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 76cf93a876..b8686f82da 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -45,7 +45,8 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>Beschreibung</title>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>USER_NEW</name>
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 7f62d6f835..7245f8689f 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -12,6 +12,7 @@
<children>
<tableViewTemplate>
<name>ParticipantsTable</name>
+ <favoriteActionGroup2>FilterViewActionGroup</favoriteActionGroup2>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
index 5f599fdfef..a412cf6039 100644
--- a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
+++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
@@ -13,7 +13,7 @@
<name>StepGeneric</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
- <title>Neuer Kampagnenschritt</title>
+ <title>New campaign step</title>
<fields>
<entityFieldLink>
<name>db2e792a-b224-4c93-99ef-96c54c5c703f</name>
@@ -39,6 +39,10 @@
<name>2447348f-4ed9-4b8c-8b0e-94e663fd781d</name>
<entityField>MAXPARTICIPANTS</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>981cf207-6e9b-428e-bd81-0d76b4b2f180</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
index a1e37221a7..cbf63b52c3 100644
--- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -12,6 +12,7 @@
<name>CampaignStepCard</name>
<titleField>NAME</titleField>
<subtitleField>STATE</subtitleField>
+ <descriptionField>DESCRIPTION</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
index 6009d8e602..6eb13f1b9f 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/Data_alias/basic/2019.2/changelog.xml
@@ -136,3 +136,4 @@
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipantLog.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignState.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStepState.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml b/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml
index 408160e05b..377cb13f6c 100644
--- a/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml
+++ b/others/db_changes/data_alias/basic/2019.2/CampaignManagement/create_campaignStep.xml
@@ -14,6 +14,7 @@
<column name="NAME" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
+ <column name="DESCRIPTION" type="NVARCHAR(500)" />
<column name="DATE_START" type="DATE">
<constraints nullable="false"/>
</column>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index d95444c38d..918e08b8a4 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-Basic - neon - 2019</projectName>
+ <projectName>xRM-Basic_current</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/Campaign_lib/Campaign_lib.aod b/process/Campaign_lib/Campaign_lib.aod
index e32f63d60b..6cff8443c7 100644
--- a/process/Campaign_lib/Campaign_lib.aod
+++ b/process/Campaign_lib/Campaign_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>Campaign_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Campaign_lib/process.js</process>
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index c484213432..342178d932 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("system.neon");
@@ -45,6 +46,18 @@ CampaignUtils.getCampaignNameById = function(pCampaignId)
return _CampaignUtils._loadSingleValueFromDb(selectQuery, conditionField, pCampaignId, defaultValue);
}
+/**
+ * todo
+ */
+CampaignUtils.getCampaignStepNameById = function(pCampaignStepId)
+{
+ let selectQuery = "select CAMPAIGNSTEP.NAME from CAMPAIGNSTEP";
+ let conditionField = "CAMPAIGNSTEP.CAMPAIGNSTEPID";
+ let defaultValue = "";
+
+ return _CampaignUtils._loadSingleValueFromDb(selectQuery, conditionField, pCampaignStepId, defaultValue);
+}
+
/**
* todo
*/
@@ -101,6 +114,22 @@ CampaignUtils.getParticipantLogInsertColumnTypes = function()
return db.getColumnTypes("CAMPAIGNPARTICIPANTLOG", CampaignUtils.getParticipantLogInsertColumnNames());
}
+/**
+ * todo
+ */
+CampaignUtils.openSetCampaignStepView = function(pParticipantIds, pCampaignId, pCampaignStepId)
+{
+ var params = {};
+
+ params["campaignParticipants_param"] = pParticipantIds;
+ params["currentCampaignId_param"] = pCampaignId;
+ params["currentCampaignStepId_param"] = pCampaignStepId;
+
+
+
+ neon.openContext("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", JSON.parse(pParticipantIds), neon.OPERATINGSTATE_EDIT, params);
+}
+
/**
* Methods for campaignmanagement.
* Do not create an instance of this!
@@ -127,7 +156,7 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityP
{
params[pEntityParam] = pRowIds;
}
-
+ logging.log("pRowsIds" + pRowIds);
neon.openContext(pContext, pView, null, neon.OPERATINGSTATE_NEW, params);
}
--
GitLab