From 1d3b24c35c8d902b4c6750c01f4b05f93b90fa77 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 26 Apr 2019 13:31:23 +0200
Subject: [PATCH] =?UTF-8?q?SORTING=20einer=20Stufe=20wird=20initial=20nun?=
=?UTF-8?q?=20korrekt=20berechnet=20und=20beginnt=20mit=201=20Im=20Preview?=
=?UTF-8?q?=20der=20Kampagnenstufe=20wird=20nun=20ein=20Verweis=20auf=20di?=
=?UTF-8?q?e=20Kampagne=20angezeigt,=20so=20kann=20schneller=20zur=C3=BCck?=
=?UTF-8?q?=20gesprungen=20werden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/campaign_id/onValueChange.js | 3 ++-
entity/CampaignStep_entity/CampaignStep_entity.aod | 13 +++++++++++++
entity/Campaign_entity/Campaign_entity.aod | 6 ++++++
.../recordcontainers/db/onDBInsert.js | 2 +-
.../CampaignStepPreview_view.aod | 4 ++++
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
index 09512470cd7..a8754300a5e 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
@@ -3,6 +3,7 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
-var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
+var stepId;
+CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 19cea84b443..e26c5f83d6d 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -17,8 +17,12 @@
</entityField>
<entityField>
<name>CAMPAIGN_ID</name>
+ <title>Campaign</title>
+ <consumer>CampaignConsumer</consumer>
+ <linkedContext>Campaign</linkedContext>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>EMPLOYEE_CONTACT_ID</name>
@@ -224,6 +228,15 @@
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
</entityField>
+ <entityConsumer>
+ <name>CampaignConsumer</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignProvider</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 9293f8a8400..679a410f39a 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -138,6 +138,12 @@
<fieldName>Campaigns</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>92ec68f6-2ff5-4f15-9001-6297a6d5790d</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
diff --git a/entity/Campaign_entity/recordcontainers/db/onDBInsert.js b/entity/Campaign_entity/recordcontainers/db/onDBInsert.js
index 671b8177755..1792051b832 100644
--- a/entity/Campaign_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Campaign_entity/recordcontainers/db/onDBInsert.js
@@ -23,7 +23,7 @@ var dateEnd = inThreeWeeks;
var description = "";
var maxParticipants = 100;
var state = $KeywordRegistry.campaignStepState$open();
-var sorting = 0;
+var sorting = 1;
var employeeContactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
diff --git a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
index d9ab350b2ee..2a7a0e71329 100644
--- a/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
+++ b/neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod
@@ -19,6 +19,10 @@
<name>CampaignStepInfosGeneric</name>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>a5754668-2ba8-4c26-b8ab-f74e3c6c1085</name>
+ <entityField>CAMPAIGN_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>4cbf0232-1dab-47f9-b62a-b539d5035c53</name>
<entityField>DATE_START</entityField>
--
GitLab