From 20417481e814ec5b591877db05ac9680126255b7 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 25 Apr 2019 11:11:16 +0200
Subject: [PATCH] =?UTF-8?q?Die=20erste=20Stufe=20einer=20Kampagne=20wird?=
=?UTF-8?q?=20nun=20beim=20Serien=20Hinzuf=C3=BCgen=20automatisch=20vorsel?=
=?UTF-8?q?ektiert=20Anzeigeproblem=20in=20der=20Scorecard=20behoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CampaignAddParticipants_entity.aod | 1 -
.../entityfields/campaign_id/onValueChange.js | 7 ++++++-
.../entityfields/campaignstep_id/valueProcess.js | 9 ---------
.../entityfields/campaign_id/onValueChange.js | 7 ++++++-
process/Campaign_lib/process.js | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index bb4ecb0ec2..2205303696 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -32,7 +32,6 @@
<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>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
index 2646a9a9ec..09512470cd 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValueChange.js
@@ -1,3 +1,8 @@
+import("system.logging");
+import("system.vars");
import("system.neon");
+import("Campaign_lib");
-//neon.setFieldValue("CAMPAIGNSTEP_ID", "")
\ No newline at end of file
+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/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
deleted file mode 100644
index f8c2b8082c..0000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-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/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index d232e9adbb..07814c86a4 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -1,3 +1,8 @@
+import("system.neon");
+import("system.logging");
+import("Campaign_lib");
import("system.vars");
-vars.set("$field.CAMPAIGNSTEP_ID", "");
\ No newline at end of file
+var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$field.CAMPAIGN_ID"));
+
+neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
\ No newline at end of file
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 12fa847b5a..ced1497caf 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -186,7 +186,7 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityP
_CampaignUtils._loadSingleValueFromDb = function(pSelectQuery, pConditionField, pConditionValue, pDefaultValue)
{
let res = pDefaultValue;
- if (pConditionValue)
+ if (pConditionValue != null && pConditionValue != "null" && pConditionValue != "")
{
res = db.cell(SqlCondition.begin()
.andPrepare(pConditionField, pConditionValue)
--
GitLab