From 7c92acd7acb6782401cfe1a298c1861d6b6adf9e Mon Sep 17 00:00:00 2001
From: "m.groppe" <m.groppe@adito.de>
Date: Mon, 12 Jul 2021 17:01:10 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Marketing][TicketNr.:=201044537?=
=?UTF-8?q?][Kampagne=20-=20Kontakt=20oder=20Firma=20zu=20Kampagne=20hinzu?=
=?UTF-8?q?f=C3=BCgen=20-=20alle=20Kampagnen=20angezeigt]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[Projekt: xRM-Marketing][TicketNr.: 1081911][Firma zu Kampagne hinzufügen]
[Projekt: xRM-Marketing][TicketNr.: 1082689][CampaignStep sollte in Preview nicht editable sein]
[Projekt: xRM-Marketing][TicketNr.: 1083583][Kampagne, Teilnehmer, Aktualisieren des Kampagnenschrittes]
[Projekt: xRM-Marketing][TicketNr.: 1083212][Kampagnenzähler zählt bei Bearbeitung hoch]
---
.../CampaignAddParticipants_entity.aod | 6 ++++++
.../addparticipants/onActionProcess.js | 8 +++++++-
.../children/onlyactive_param}/valueProcess.js | 2 +-
.../CampaignParticipant_entity.aod | 10 ++++++----
.../ignorecontactstates_param/valueProcess.js | 7 +++++++
entity/Campaign_entity/Campaign_entity.aod | 4 ++++
.../entityfields/campaigncode/valueProcess.js | 5 ++++-
.../recordcontainers/db/conditionProcess.js | 17 ++++++++++++++---
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++++----
.../CampaignStepParticipnatsPerStep_view.aod | 1 +
process/KeywordRegistry_basic/process.js | 1 +
11 files changed, 55 insertions(+), 14 deletions(-)
rename entity/{CampaignParticipant_entity/entityfields/anycontacts/children/onlypers_param => CampaignAddParticipants_entity/entityfields/campaignconsumer/children/onlyactive_param}/valueProcess.js (53%)
create mode 100644 entity/CampaignParticipant_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index f867fcdc40..c0178e47a9 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -60,6 +60,12 @@
<entityName>Campaign_entity</entityName>
<fieldName>Campaigns</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>OnlyActive_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignconsumer/children/onlyactive_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>CampaignStepConsumer</name>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
index ceeb7e8662..53f88a49de 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
@@ -26,7 +26,13 @@ if(contactIds != null && contactIds.length > 0)
neon.refreshAll();
if (!vars.exists("$param.currentCampaignId_param") || !vars.get("$param.currentCampaignId_param"))
- neon.openContext("Campaign", "CampaignMain_view", [campaignId], neon.OPERATINGSTATE_VIEW, null);
+{
+ neon.openContext("Campaign", "CampaignMain_view", [campaignId], neon.OPERATINGSTATE_VIEW, null);
+}
+else
+{
+ neon.closeImage(vars.get("$sys.currentimage"), true);
+}
diff --git a/entity/CampaignParticipant_entity/entityfields/anycontacts/children/onlypers_param/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignconsumer/children/onlyactive_param/valueProcess.js
similarity index 53%
rename from entity/CampaignParticipant_entity/entityfields/anycontacts/children/onlypers_param/valueProcess.js
rename to entity/CampaignAddParticipants_entity/entityfields/campaignconsumer/children/onlyactive_param/valueProcess.js
index 70aefbf842..d3ed7d447b 100644
--- a/entity/CampaignParticipant_entity/entityfields/anycontacts/children/onlypers_param/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignconsumer/children/onlyactive_param/valueProcess.js
@@ -1,2 +1,2 @@
import("system.result");
-result.string(true)
\ No newline at end of file
+result.string("true");
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 7f9346cc2d..f85dbe2011 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -19,6 +19,8 @@
</entityProvider>
<entityProvider>
<name>CampaignParticipantsProvider</name>
+ <targetContextField>CONTACTCONTEXT</targetContextField>
+ <targetIdField>CONTACT_ID</targetIdField>
<documentation>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<children>
@@ -127,14 +129,14 @@
<fieldName>ContactsByIds</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>OnlyPers_param</name>
- <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/anycontacts/children/onlypers_param/valueProcess.js</valueProcess>
- </entityParameter>
<entityParameter>
<name>WithPrivatePersons_param</name>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/anycontacts/children/withprivatepersons_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>IgnoreContactStates_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/CampaignParticipant_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js
new file mode 100644
index 0000000000..6d246bbd4d
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/anycontacts/children/ignorecontactstates_param/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string(JSON.stringify([
+ $KeywordRegistry.contactStatus$inactive(),
+ $KeywordRegistry.contactStatus$markToDelete()
+]));
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 7e0c6abd26..9ca492da02 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -606,6 +606,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>OnlyActive_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Campaign_entity/entityfields/campaigncode/valueProcess.js b/entity/Campaign_entity/entityfields/campaigncode/valueProcess.js
index 28366e4157..f501fca35f 100644
--- a/entity/Campaign_entity/entityfields/campaigncode/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/campaigncode/valueProcess.js
@@ -1,4 +1,7 @@
+import("system.vars");
import("system.result");
import("Campaign_lib");
+import("system.neon");
-result.string(CampaignUtils.getNextProjectNumber());
\ No newline at end of file
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+ result.string(CampaignUtils.getNextProjectNumber());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index e5c5faf2b6..2e845464f0 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -1,17 +1,28 @@
+import("KeywordRegistry_basic");
import("system.db");
import("system.neon");
import("system.result");
import("system.vars");
import("Employee_lib");
import("Sql_lib");
-
+import("Util_lib");
+import("system.SQLTYPES")
var recordState = vars.get("$sys.recordstate");
var cond = newWhere();
+var sqlHelper = new SqlMaskingUtils();
-
-if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
+if(Utils.toBoolean(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param")))
{
cond.and("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId());
}
+if(Utils.toBoolean(vars.get("$param.OnlyActive_param")))
+{
+ cond.and("CAMPAIGN.STATUS",$KeywordRegistry.campaignState$completed(),SqlBuilder.NOT_EQUAL());
+ cond.and(newSelect(sqlHelper.max("CAMPAIGNSTEP.DATE_END"))
+ .from("CAMPAIGNSTEP")
+ .where("CAMPAIGNSTEP.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ ,vars.get("$sys.date"),SqlBuilder.GREATER_OR_EQUAL(),SQLTYPES.DATE)
+}
+
result.string(cond.toString());
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f333233b07..6f23da5142 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1016,7 +1016,7 @@
</entry>
<entry>
<key>Update campaign step</key>
- <value>Aktualisieren des Kampagnenschrittes</value>
+ <value>Kampagnenstufe ändern</value>
</entry>
<entry>
<key>Serial letters</key>
@@ -1521,7 +1521,7 @@
</entry>
<entry>
<key>Participants</key>
- <value>Teilnehmer/innen</value>
+ <value>Teilnehmer</value>
</entry>
<entry>
<key>Contact Management</key>
@@ -1577,7 +1577,7 @@
</entry>
<entry>
<key>Add participants to Campaign</key>
- <value>Kampagnenteilnehmer/innen hinzufügen</value>
+ <value>Kampagnenteilnehmer hinzufügen</value>
</entry>
<entry>
<key>Firstname</key>
@@ -4402,7 +4402,7 @@
</entry>
<entry>
<key>Add participant to Campaign</key>
- <value>Kampagnenteilnehmer/in hinzufügen</value>
+ <value>Kampagnenteilnehmer hinzufügen</value>
</entry>
<entry>
<key>Relationtype</key>
diff --git a/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod b/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod
index 9ff58eaf03..f5b7670ca5 100644
--- a/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod
+++ b/neonView/CampaignStepParticipnatsPerStep_view/CampaignStepParticipnatsPerStep_view.aod
@@ -13,6 +13,7 @@
<titleField>NAME</titleField>
<highlightingField>CurrentMaxParticipantsInfo</highlightingField>
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
<columns>
<neonTitledListTableColumn>
<name>4ea71a13-4108-47a5-9a28-2256618fdc2c</name>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b71e5b84d7..c2757f2c08 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -176,6 +176,7 @@ $KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
$KeywordRegistry.campaignState = function(){return "CampaignManagementStates";};
$KeywordRegistry.campaignState$planning = function(){return "PLANNING";};
$KeywordRegistry.campaignState$approved = function(){return "APPROVED";};
+$KeywordRegistry.campaignState$completed = function(){return "COMPLETED";};
$KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
$KeywordRegistry.campaignStepState$open = function(){return "OPEN";};
--
GitLab