1036518 - Kampagnen können angelegt, gelöscht und aufgelistet werden

Einer Kampagne können mehrere Schritte hinzugefügt werden. Ein KS kann im Detail betrachtet werden. Es gibt nun ein Entity für CampaignParticipants Kleinere benamungsfehler wurden behoben --> Inhalt nicht nur der des erwähnten Tickets. Das nächste mal dann.

1036518 - Kampagnen können angelegt, gelöscht und aufgelistet werden
Einer Kampagne können mehrere Schritte hinzugefügt werden. Ein KS kann im Detail betrachtet werden. Es gibt nun ein Entity für CampaignParticipants Kleinere benamungsfehler wurden behoben --> Inhalt nicht nur der des erwähnten Tickets. Das nächste mal dann.
18b74f1c · David Büchler · c3420ee5 · 18b74f1c · 18b74f1c · 18b74f1c
Commit 18b74f1c authored 6 years ago by David Büchler
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+<?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>
--- 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>

--- a/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignidparameter/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepidparameter/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/campaignstepid/valueProcess.js
--- a/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/date_edit/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/date_new/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/user_edit/valueProcess.js
+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
--- a/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js
+++ b/entity/CampaignStep_entity/entityfields/user_new/valueProcess.js
+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
--- a/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
+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
--- 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>

--- a/entity/Campaign_entity/entityfields/campaignid/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/campaignid/valueProcess.js
--- a/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
+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
--- a/neonContext/CampaignParticipant/CampaignParticipant.aod
+++ b/neonContext/CampaignParticipant/CampaignParticipant.aod
+<?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>
--- a/neonContext/CampaignSteps/CampaignSteps.aod
+++ b/neonContext/CampaignSteps/CampaignSteps.aod
+<?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>
--- 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>

--- 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>
--- a/neonView/CampaignParticipant_view/CampaignParticipant_view.aod
+++ b/neonView/CampaignParticipant_view/CampaignParticipant_view.aod
+<?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>
--- 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>