From fa1c47316a7d90bbab54d613299a4ff20b542530 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 4 Jul 2019 15:41:30 +0200
Subject: [PATCH] Serienaktion Infotexte mit korrekten Platzhaltern erweitert.
---
.../isoperationvalid/valueProcess.js | 9 +----
.../CampaignPlanning_entity.aod | 38 +++++++++++++------
.../_____LANGUAGE_EXTRA.aod | 7 +---
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++--
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 7 +---
.../TaskMainPreview_view.aod | 0
6 files changed, 37 insertions(+), 32 deletions(-)
delete mode 100644 neonView/TaskMainPreview_view/TaskMainPreview_view.aod
diff --git a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
index 0964b63d8d..b4bf3c9120 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
@@ -94,17 +94,12 @@ if(selectedCampaignId != '')
}
else if(hasStepEnoughSlots(countValidParticipantsToAdd))
{
- messageString = translate.text("#countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s) will be added to the selected campaign step");
- messageString = messageString.replace("#countValidParticipantsToAdd#", countValidParticipantsToAdd);
- messageString = messageString.replace("#countParticipantsToAdd#", countParticipantsToAdd);
-
+ messageString = translate.withArguments("%0/%1 participant(s) will be added to the selected campaign step", [countValidParticipantsToAdd, countParticipantsToAdd]);
resultValue = "true";
}
else
{
- messageString = translate.text("Not enough slots for #countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s)");
- messageString = messageString.replace("#countValidParticipantsToAdd#", countValidParticipantsToAdd);
- messageString = messageString.replace("#countParticipantsToAdd#", countParticipantsToAdd);
+ messageString = translate.withArguments("Not enough slots for %0/%1 participant(s)", [countValidParticipantsToAdd, countParticipantsToAdd]);
}
neon.setFieldValue("$field.campaignParticipantMessage", messageString);
result.string(resultValue);
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 6f2d583196..d959eb41ca 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignPlanning_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:GROUP_APPOINTMENT</icon>
@@ -140,16 +140,32 @@
<contentProcess>%aditoprj%/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js</contentProcess>
<onUpdate>%aditoprj%/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>NAME.value</element>
- <element>PREDECESSOR_STEP_ID.value</element>
- <element>STEP_DESCRIPTION.value</element>
- <element>DATE_START.value</element>
- <element>DATE_END.value</element>
- <element>CAMPAIGN_ID.value</element>
- <element>targetContext.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>NAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PREDECESSOR_STEP_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STEP_DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DATE_START.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DATE_END.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CAMPAIGN_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>targetContext.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index df149270d2..2dde0da0bf 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4267,17 +4267,14 @@
<key>All selected participants already are in the campaign</key>
</entry>
<entry>
- <key>Not enough slots for #countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s)</key>
+ <key>Not enough slots for %0/%1 participant(s)</key>
</entry>
<entry>
- <key>#countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s) will be added to the selected campaign step</key>
+ <key>%0/%1 participant(s) will be added to the selected campaign step</key>
</entry>
<entry>
<key>No valid Selection</key>
</entry>
- <entry>
- <key>Open admin view</key>
- </entry>
<entry>
<key>Sender address</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a754ff6973..072bf07716 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5640,12 +5640,12 @@
<value>Alle selektierten Teilnehmer sind bereits in der Kampagne</value>
</entry>
<entry>
- <key>#countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s) will be added to the selected campaign step</key>
- <value>#countValidParticipantsToAdd#/#countParticipantsToAdd# Teilnehmer werden zur selektierten Kampagnenstufe hinzugefügt</value>
+ <key>%0/%1 participant(s) will be added to the selected campaign step</key>
+ <value>%0/%1 Teilnehmer werden zur selektierten Kampagnenstufe hinzugefügt</value>
</entry>
<entry>
- <key>Not enough slots for #countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s)</key>
- <value>Nicht genügend Teilnehmerplätze verfügbar für #countValidParticipantsToAdd#/#countParticipantsToAdd# Teilnehmer</value>
+ <key>Not enough slots for %0/%1 participant(s)</key>
+ <value>Nicht genügend Teilnehmerplätze verfügbar für %0/%1 Teilnehmer</value>
</entry>
<entry>
<key>No valid Selection</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 9b801d4a6b..bab6509f1c 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4316,17 +4316,14 @@
<key>All selected participants already are in the campaign</key>
</entry>
<entry>
- <key>#countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s) will be added to the selected campaign step</key>
+ <key>%0/%1 participant(s) will be added to the selected campaign step</key>
</entry>
<entry>
- <key>Not enough slots for #countValidParticipantsToAdd#/#countParticipantsToAdd# participant(s)</key>
+ <key>Not enough slots for %0/%1 participant(s)</key>
</entry>
<entry>
<key>No valid Selection</key>
</entry>
- <entry>
- <key>Open admin view</key>
- </entry>
<entry>
<key>Sender address</key>
</entry>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
deleted file mode 100644
index e69de29bb2..0000000000
--
GitLab