From 535f92b7d270419c8b39e96994d5eb254395ddac Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 18 Apr 2024 07:46:05 -0700
Subject: [PATCH] Additional tasks changes.

---
 server/email/tasksEmails.js | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js
index f3ea56fe6..d31eb7b8f 100644
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -110,29 +110,29 @@ const generateTemplateArgs = (title, createdBy, dueDate, taskId) => {
  */
 const sendMail = (type, to, subject, html, taskIds, successCallback) => {
   // Push next messages to Nodemailer
-  transporter.once("idle", () => {
-    // Note: This is commented out because despite being in the documentation, it does not work
-    // and stackoverflow suggests it is not needed
-    // if (transporter.isIdle()) {
-    transporter.sendMail(
-      {
-        from: fromEmails,
-        to,
-        subject,
-        html
-      },
-      (error, info) => {
-        if (info) {
-          if (typeof successCallback === "function" && taskIds && taskIds.length) {
-            successCallback(taskIds);
-          }
-        } else {
-          logger.log(`task-${type}-email-failure`, "error", null, null, error);
+  //transporter.once("idle", () => {
+  // Note: This is commented out because despite being in the documentation, it does not work
+  // and stackoverflow suggests it is not needed
+  // if (transporter.isIdle()) {
+  transporter.sendMail(
+    {
+      from: fromEmails,
+      to,
+      subject,
+      html
+    },
+    (error, info) => {
+      if (info) {
+        if (typeof successCallback === "function" && taskIds && taskIds.length) {
+          successCallback(taskIds);
         }
+      } else {
+        logger.log(`task-${type}-email-failure`, "error", null, null, error);
       }
-    );
-    // }
-  });
+    }
+  );
+  // }
+  // });
 };
 
 /**
@@ -216,7 +216,8 @@ const tasksRemindEmail = async (req, res) => {
       if (recipient.count === 1) {
         const onlyTask = groupedTasks[recipient.email][0];
 
-        emailData.subject = `New Task Reminder - ${onlyTask.title} -  ${formatDate(onlyTask.due_date)}`;
+        emailData.subject =
+          `New Task Reminder - ${onlyTask.title} ${onlyTask.due_date ? `- ${formatDate(onlyTask.due_date)}` : ""}`.trim();
 
         emailData.html = generateEmailTemplate(
           generateTemplateArgs(onlyTask.title, onlyTask.created_by, onlyTask.due_date, onlyTask.id)