diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index d31eb7b8f..1378a6758 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -80,22 +80,33 @@ const endPoints = InstanceManager({ * @returns {string|string} */ const formatDate = (date) => { - return date ? `| Due on ${moment(date).format("MM/DD/YYYY")}` : ""; + return date ? `| Due on: ${moment(date).format("MM/DD/YYYY")}` : ""; +}; + +const formatPriority = (priority) => { + if (priority === 1) { + return "High"; + } else if (priority === 3) { + return "Low"; + } else { + return "Medium"; + } }; /** * Generate the email template arguments. * @param title - * @param createdBy + * @param priority + * @param description * @param dueDate * @param taskId * @returns {{header, body: string, subHeader: string}} */ -const generateTemplateArgs = (title, createdBy, dueDate, taskId) => { +const generateTemplateArgs = (title, priority, description, dueDate, taskId) => { return { header: title, - subHeader: `Assigned by ${createdBy} ${formatDate(dueDate)}`, - body: `Please sign in to your account to view the Task details.` + subHeader: `Priority: ${formatPriority(priority)} ${priority} ${formatDate(dueDate)}`, + body: `${description}
Please sign in to your account to view the further details of the Task.` }; }; @@ -155,8 +166,10 @@ const taskAssignedEmail = async (req, res) => { sendMail( "assigned", newTask.assigned_to, - `A Task has been ${dirty ? "reassigned" : "created"} for you - ${newTask.title}`, - generateEmailTemplate(generateTemplateArgs(newTask.title, newTask.created_by, newTask.due_date, newTask.id)) + `A ${formatPriority(newTask.priority)} PriorityTask has been ${dirty ? "reassigned" : "created"} for you - ${newTask.title}`, + generateEmailTemplate( + generateTemplateArgs(newTask.title, newTask.priority, newTask.description, newTask.due_date, newTask.id) + ) ); // We return success regardless because we don't want to block the event trigger. @@ -217,23 +230,23 @@ const tasksRemindEmail = async (req, res) => { const onlyTask = groupedTasks[recipient.email][0]; emailData.subject = - `New Task Reminder - ${onlyTask.title} ${onlyTask.due_date ? `- ${formatDate(onlyTask.due_date)}` : ""}`.trim(); + `New ${formatPriority(onlyTask.priority)} Priority 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) + generateTemplateArgs(onlyTask.title, onlyTask.priority, onlyTask.description, onlyTask.due_date, onlyTask.id) ); } // There are multiple emails to send to this author. else { const allTasks = groupedTasks[recipient.email]; - emailData.subject = `New Task Reminder - ${allTasks.length} Tasks require your attention`; + emailData.subject = `New Tasks Reminder - ${allTasks.length} Tasks require your attention`; emailData.html = generateEmailTemplate({ header: `${allTasks.length} Tasks require your attention`, subHeader: `Please sign in to your account to view the Task details.`, body: `` diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index 1ffe8c858..dbd3a851f 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -2407,6 +2407,7 @@ exports.QUERY_REMIND_TASKS = ` ) { id title + description due_date created_by assigned_to