[Projekt: xRM-Marketing][TicketNr.: 1081635][Einheitliche Bezeichnung des...

[Projekt: xRM-Marketing][TicketNr.: 1081635][Einheitliche Bezeichnung des Status "Nicht versendet" oder "Ausstehend"]

.liquibase/Data_alias/basic/2021.1.2/Bulkmail/changelog.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="insertBulkmailRecipientStatus.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.1.2/Bulkmail/insertBulkmailRecipientStatus.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="v.broens" id="c1ecd92d-3bc2-47ac-8403-d5a5b6f65a5d">
+     <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="2d5cacf8-1834-4ab0-98a6-442c20ec5fd6"/>
+            <column name="CONTAINER" value="BulkMailRecipientStatus"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="25cb446a-24cd-4ebd-aad2-320da20830da"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="EMAILADDED"/>
+            <column name="TITLE" value="Added"/>
+            <column name="SORTING" valueNumeric="6"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.1.2/changelog.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Bulkmail/changelog.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/changelog.xml

@@ -25,7 +25,7 @@
     <include relativeToChangelogFile="true" file="basic/2021.0.3/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2021.1.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2021.1.1/changelog.xml"/>
-    
+    <include relativeToChangelogFile="true" file="basic/2021.1.2/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
     <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file

entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod

@@ -122,6 +122,7 @@
           <onActionProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js</onActionProcess>
           <isObjectAction v="false" />
           <iconId>VAADIN:ENVELOPES</iconId>
+          <tooltipProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js</tooltipProcess>
         </entityActionField>
       </children>
     </entityActionGroup>

entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/tooltipProcess.js

 import("system.translate");
 import("system.result");
 
-result.string(translate.text("Remove recipients with advertising ban"));
\ No newline at end of file
+result.string(translate.text("Remove recipients with communication rejection"));
\ No newline at end of file

entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js

+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Start marketing mailing"));
\ No newline at end of file

entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js

@@ -4,4 +4,4 @@ import("system.result");
 import("KeywordRegistry_basic");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string($KeywordRegistry.bulkMailRecipientStatus$pending());
\ No newline at end of file
+    result.string($KeywordRegistry.bulkMailRecipientStatus$added());
\ No newline at end of file

entity/BulkMail_entity/BulkMail_entity.aod

@@ -275,40 +275,6 @@
       <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/emleditinfo/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/emleditinfo/valueProcess.js</valueProcess>
     </entityField>
-    <entityActionField>
-      <name>sendMail</name>
-      <title>Send</title>
-      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PAPERPLANE</iconId>
-      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
-      <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>testMail</name>
-      <title>Test email</title>
-      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
-    </entityActionField>
-    <entityActionField>
-      <name>downloadTemplate</name>
-      <title>Download template</title>
-      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:FILE_FONT</iconId>
-      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
-    </entityActionField>
-    <entityActionField>
-      <name>copyBulkmail</name>
-      <title>Copy bulkmail</title>
-      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/copybulkmail/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:COPY</iconId>
-    </entityActionField>
-    <entityActionField>
-      <name>openAdminView</name>
-      <title>Open admin view</title>
-      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:CURLY_BRACKETS</iconId>
-      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
-    </entityActionField>
     <entityField>
       <name>DATE_TO_SEND</name>
       <title>Send Date</title>
@@ -502,6 +468,60 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityActionGroup>
+      <name>observeActionoGroup</name>
+      <children>
+        <entityActionField>
+          <name>observe</name>
+          <title>Observe</title>
+          <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:EYE</iconId>
+          <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/stateProcess.js</stateProcess>
+          <titleProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/titleProcess.js</titleProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>cancelObservation</name>
+          <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:EYE_SLASH</iconId>
+          <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/stateProcess.js</stateProcess>
+          <titleProcess>%aditoprj%/entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/titleProcess.js</titleProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionField>
+      <name>sendMail</name>
+      <title>Send</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PAPERPLANE</iconId>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
+      <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>testMail</name>
+      <title>Test email</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>downloadTemplate</name>
+      <title>Download template</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:FILE_FONT</iconId>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>copyBulkmail</name>
+      <title>Copy bulkmail</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/copybulkmail/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:COPY</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>openAdminView</name>
+      <title>Open admin view</title>
+      <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:CURLY_BRACKETS</iconId>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+    </entityActionField>
     <entityActionField>
       <name>openMosaico</name>
       <title>Open Mosaico</title>

entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/onActionProcess.js

+import("Observation_lib");
+
+Observation.cancelAction();
\ No newline at end of file

entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/stateProcess.js

+import("system.vars");
+import("system.result");
+import("Observation_lib");
+import("system.neon");
+
+result.string(Observation.actionState(vars.get("$sys.selection"), true));
\ No newline at end of file

entity/BulkMail_entity/entityfields/observeactionogroup/children/cancelobservation/titleProcess.js

+import("system.result");
+import("system.vars");
+import("Observation_lib");
+
+result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
\ No newline at end of file

entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/onActionProcess.js

+import("Observation_lib");
+
+Observation.insertAction();
\ No newline at end of file

entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/stateProcess.js

+import("system.vars");
+import("system.result");
+import("Observation_lib");
+
+result.string(Observation.actionState(vars.get("$sys.selection")));
\ No newline at end of file

entity/BulkMail_entity/entityfields/observeactionogroup/children/observe/titleProcess.js

+import("system.result");
+import("Observation_lib");
+import("system.vars");
+
+result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
\ No newline at end of file

entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js

@@ -10,8 +10,12 @@ import("KeywordRegistry_basic");
 var send = question.askYesNo(translate.text("Bulk mail"), translate.text("Should the mail be sent now?"), false);
 if (send)
 {
+    //UPDATE BULKMAIL STATUS
     newWhere("BULKMAIL.BULKMAILID", "$field.BULKMAILID")
         .updateFields({"STATUS" : $KeywordRegistry.bulkMailStatus$beingSent()});
+    //UPDATE RECIPIENT STATUS
+    newWhere("BULKMAILRECIPIENT.BULKMAIL_ID", "$field.BULKMAILID")
+        .updateFields({"STATUS" : $KeywordRegistry.bulkMailRecipientStatus$pending()});
     
     neon.refreshAll();
     BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"));

entity/CampaignStep_entity/CampaignStep_entity.aod

@@ -384,16 +384,21 @@
       <children>
         <entityActionField>
           <name>moveUp</name>
+          <title>Move up</title>
           <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/moveup/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:ARROW_UP</iconId>
           <state>DISABLED</state>
           <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/moveup/stateProcess.js</stateProcess>
+          <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/moveup/tooltipProcess.js</tooltipProcess>
         </entityActionField>
         <entityActionField>
           <name>moveDown</name>
+          <title>Move down</title>
+          <description></description>
           <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/movedown/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:ARROW_DOWN</iconId>
           <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/movedown/stateProcess.js</stateProcess>
+          <tooltipProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/movedown/tooltipProcess.js</tooltipProcess>
         </entityActionField>
       </children>
     </entityActionGroup>

entity/CampaignStep_entity/entityfields/group/children/movedown/tooltipProcess.js

+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Move selection down"));
\ No newline at end of file

entity/CampaignStep_entity/entityfields/group/children/moveup/tooltipProcess.js

+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Move selection up"));
\ No newline at end of file

entity/WeblinkClick_entity/WeblinkClick_entity.aod

@@ -72,7 +72,7 @@
     </entityProvider>
     <entityField>
       <name>URL</name>
-      <title>Url</title>
+      <title>URL</title>
     </entityField>
     <entityParameter>
       <name>WeblinkId_param</name>