From 7228a2059d51c88892d7835da3f9b5588928da1d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 14 May 2019 10:55:17 +0200
Subject: [PATCH] CampaignParticipant chart fixed
---
.../recordcontainers/jdito/contentProcess.js | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
index e210588e47d..0166a18e7c0 100644
--- a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
@@ -6,9 +6,19 @@ import("system.vars");
var campaignId = vars.get("$param.CampaignId_param");
-var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) "
- + "from CAMPAIGNSTEP left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID "
- + "left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID ";
+var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOGID) \n\
+ from CAMPAIGNSTEP \n\
+ left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID \n\
+ left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID \n\
+ and exists ( \n\
+ select 1 \n\
+ from CAMPAIGNPARTICIPANTLOG NEXTSTEPLOG \n\
+ join CAMPAIGNSTEP NEXTSTEP on NEXTSTEPLOG.CAMPAIGNSTEP_ID = NEXTSTEP.CAMPAIGNSTEPID \n\
+ where CAMPAIGNSTEP.CAMPAIGNSTEPID != NEXTSTEP.CAMPAIGNSTEPID \n\
+ and NEXTSTEPLOG.CAMPAIGNPARTICIPANT_ID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNPARTICIPANT_ID \n\
+ and NEXTSTEP.CAMPAIGN_ID = CAMPAIGNSTEP.CAMPAIGN_ID \n\
+ and NEXTSTEP.SORTING > CAMPAIGNSTEP.SORTING \n\
+ )";
var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING";
var sqlQuery = SqlCondition.begin()
--
GitLab