Edit Views werden nun als small im Preview angezeigt

360 Grad ansicht funktioniert nun; es wird an dieser Stelle auf die Kampagne verlinkt
Übersetzungen eingefügt

entity/360Degree_entity/entityfields/context_name/valueProcess.js

+import("system.logging");
 import("system.translate");
 import("system.vars");
 import("system.result");
-
+logging.log(" -> " + vars.getString("$field.TARGET_CONTEXT"));
 result.string(translate.text(vars.getString("$field.TARGET_CONTEXT")));
\ No newline at end of file

entity/360Degree_entity/entityfields/icon/valueProcess.js

@@ -14,4 +14,7 @@ switch (context)
     case "Contract":
         result.string("VAADIN:FILE_TEXT");
         break;           
+    case "Campaign":
+        result.string("NEON:GROUP_APPOINTMENT");
+        break;       
 }
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js

-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

entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js

@@ -5,5 +5,4 @@ import("system.result");
 
 var campaignStepId = vars.get("$field.CAMPAIGNSTEP_ID");
 var campaignStepName = CampaignUtils.getCampaignStepNameById(campaignStepId);
-
 result.string(campaignStepName);
\ No newline at end of file

entity/CampaignAddParticipants_entity/entityfields/campaignstepconsumer/children/campaignid_param/valueProcess.js

+import("system.logging");
 import("system.vars");
 import("system.result");
-
+logging.log("parameter campaignid -> " + vars.getString("$field.CAMPAIGN_ID"));
 result.string(vars.getString("$field.CAMPAIGN_ID"));
\ No newline at end of file

entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js

@@ -4,9 +4,10 @@ import("system.result");
 import("system.util");
 import("system.db");
 
+logging.log("CampaignAnalysis_RecordContainer");
 var ret = [];
 
-var campaignstepid = "86a6f7cc-5a1d-4e68-a05d-c99a355365df";//TODO: Refresh problem - vars.get("$param.campaignStepId_param");
+var campaignstepid = "b80588dd-4287-4fd7-85c1-7b86118ac4ff";//TODO: Refresh problem - vars.get("$param.campaignStepId_param");
 var newParticipants = JSON.parse(vars.get("$param.campaignParticipants_param")).length;
 
 var query = "select MAXPARTICIPANTS, count(CAMPAIGNPARTICIPANTID) from CAMPAIGNSTEP "

entity/CampaignParticipant_entity/CampaignParticipant_entity.aod

@@ -106,6 +106,7 @@
       <title>Participant</title>
       <consumer>AnyContacts</consumer>
       <linkedContextProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>

entity/CampaignStep_entity/CampaignStep_entity.aod

@@ -3,6 +3,7 @@
   <name>CampaignStep_entity</name>
   <title>Campaign Step</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>NEON:GROUP_APPOINTMENT</icon>
   <titleProcess>%aditoprj%/entity/CampaignStep_entity/titleProcess.js</titleProcess>
   <recordContainer>db</recordContainer>
   <entityFields>

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -2955,6 +2955,15 @@
     <entry>
       <key>Campaign status</key>
     </entry>
+    <entry>
+      <key>Set campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participant to Campaign</key>
+    </entry>
+    <entry>
+      <key>Steps</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -607,6 +607,10 @@
       <key>Campaign Step</key>
       <value>Kampagnen Stufe</value>
     </entry>
+    <entry>
+      <key>CampaignStep</key>
+      <value>Kampagnen Stufe</value>
+    </entry>
     <entry>
       <key>Commodity group 1</key>
       <value>Warengruppe 1</value>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -2986,6 +2986,15 @@
     <entry>
       <key>Campaign status</key>
     </entry>
+    <entry>
+      <key>Set campaign step</key>
+    </entry>
+    <entry>
+      <key>Add participant to Campaign</key>
+    </entry>
+    <entry>
+      <key>Steps</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

neonView/CampaignAddParticipantsEdit_view/CampaignAddParticipantsEdit_view.aod

@@ -2,6 +2,7 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
   <name>CampaignAddParticipantsEdit_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
   <layout>
     <boxLayout>
       <name>layout</name>

neonView/CampaignEdit_view/CampaignEdit_view.aod

@@ -4,6 +4,7 @@
   <title>Campaign</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:GROUP</icon>
+  <isSmall v="true" />
   <layout>
     <boxLayout>
       <name>layout</name>

neonView/CampaignParticipantEdit_view/CampaignParticipantEdit_view.aod

@@ -3,6 +3,7 @@
   <name>CampaignParticipantEdit_view</name>
   <title>Add participant to Campaign</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
   <layout>
     <boxLayout>
       <name>layout</name>

neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod

@@ -3,6 +3,7 @@
   <name>CampaignStepEdit_view</name>
   <title>Neuer Kampagnenschritt</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isSmall v="true" />
   <layout>
     <boxLayout>
       <name>layout</name>

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>

process/Context_lib/process.js

@@ -344,15 +344,16 @@ ContextUtils.getSelectMap  = function()
                                             "PRODUCTNAME"
                                             ], "", false))
             ,"Task": ContextSelector.create("TASK", "TASKID", "SUBJECT")
-            ,"Campaign": ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID")
+            ,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID")
                          .setTitleExpression(maskingUtils.concat([
                                                 maskingUtils.cast("CAMPAIGN.NAME", SQLTYPES.VARCHAR, 10),
                                                 "' - '",
                                                 maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
                                             ], "", false))
                          .setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
-                         .setJoinExpression("join CAMPAIGN on CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID " +
-                                            "join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID")
+                         .setJoinExpression("join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
+                                            "join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
+                        .setCreationDateField("CAMPAIGNSTEP.DATE_START")
                         .setStateField("CAMPAIGN.STATE")
                         .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])