BulkMail create activities

process/Bulkmail_lib/process.js

+import("system.translate");
+import("ActivityTask_lib");
 import("system.util");
 import("Contact_lib");
 import("system.datetime");
@@ -50,25 +52,24 @@ BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pTestRecipients, pUs
  */
 BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
 {
-    var [templateId, subject, emailSender] = db.array(db.ROW, SqlCondition.begin()
+    var [templateId, subject, emailSender, createActivity, bulkMailName] = db.array(db.ROW, SqlCondition.begin()
         .andPrepare("BULKMAIL.BULKMAILID", pBulkMailId)
-        .buildSql("select DOCUMENTTEMPLATE_ID, SUBJECT, SENDER from BULKMAIL", "1=2")
+        .buildSql("select DOCUMENTTEMPLATE_ID, SUBJECT, SENDER, CREATEACTIVITIES, NAME from BULKMAIL", "1=2")
     );
     var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId);
     
-    var sql = SqlBuilder.begin();
     var recipientData;
     if (pTestRecipients)
     {
         recipientData = pTestRecipients.map(function (row)
         {
-            return ["", row[0], row[1]];
+            return ["", row[0], row[1], "", ""];
         });
     }
     else
     {
         recipientData = db.table(SqlBuilder.begin()
-            .select("BULKMAILRECIPIENTID, BULKMAILRECIPIENT.CONTACT_ID, (" + CommUtil.getStandardSubSqlMail() + ")")
+            .select("BULKMAILRECIPIENTID, BULKMAILRECIPIENT.CONTACT_ID, (" + CommUtil.getStandardSubSqlMail() + "), PERSON_ID, ORGANISATION_ID")
             .from("CONTACT")
             .join("BULKMAILRECIPIENT", "BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
             .where(SqlCondition.begin()
@@ -87,6 +88,9 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
     var subjectTemplate = new DocumentTemplate(subject, DocumentTemplate.types.PLAIN);
     var subjects = subjectTemplate.getReplacedContentByContactIds(contactIds);
     
+    var bulkMailLink = [["BulkMail", pBulkMailId]];
+    var activitySubject = translate.withArguments("Bulk mail \"%0\" sent", [bulkMailName]);
+    
     for (let i = 0, l = recipientData.length; i < l; i++)
     {
         let isSuccess = false;
@@ -101,7 +105,20 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
             isSuccess = email.send();
         }
         if (recipientData[i][0])    //set the recipient status to 'sent' or 'failed'
+        {
             Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i][0]);
+            if (isSuccess && createActivity == "1")
+            {
+                let activityData = {
+                    categoryKeywordId : $KeywordRegistry.activityCategory$mail(),
+                    directionKeywordId : $KeywordRegistry.activityDirection$outgoing(),
+                    subject : activitySubject,
+                    content : email.body
+                };
+                let contactLink = [[ContactUtils.getContextByPersOrg(recipientData[i][3], recipientData[i][4]), recipientData[i][1]]];
+                ActivityUtils.insertNewActivity(activityData, bulkMailLink.concat(contactLink));
+            }
+        }
     }
     if (successIds.length > 0)
         db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate],