diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index f867fcdc4097bd543af7e7698418c8c9ae9fd68a..c0178e47a953feaeeecf5d9bbd965d8497d13de3 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 ceeb7e8662d98a71b9a214fd5cd0fbb100c5c8c3..53f88a49def7abcf0296e9630c7922b6fa3b178a 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 70aefbf84202f8e9600cc7d5360989d42df60cf6..d3ed7d447b6582533c41340415c08d9f97fbf001 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 7f9346cc2d57a6e3eba0f70aa8c2bdd96968eb7f..f85dbe201195bbd44410a4f3cf9bd797481a98a7 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 0000000000000000000000000000000000000000..6d246bbd4d9b27b34b037d97f5746d9b592fbd2c
--- /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 7e0c6abd260e50c2900bb4da742fbf585ee67fe4..9ca492da02dbd6dd4bcaae3e08f20603a17e14a3 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 28366e4157b65883db64e8ff97e27712649b637f..f501fca35fa2298d83bc769c0b5a95b8882474e3 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 e5c5faf2b6e2facaaaad245e6858fa3ddec4c0a7..2e845464f084f58b2765eb94811d2bf52d46efe2 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 f333233b075bd6733ad5d0eabb6088cf4b01a31f..6f23da51429520c73437dc0b02b013d1aec651a9 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 9ff58eaf033c269cb2b282932208c3dc1f2ca621..f5b7670ca57935120510a86a48a4453b64dedc8f 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 b71e5b84d7764486f2aec05ae336f0406d6219ae..c2757f2c087d94806679adde98ed56a68607206f 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";};