SST-51 feat: message templates updates for double a labs

ishgroup · Jan 8, 2025 · 58882be · 58882be
1 parent bf489b6
commit 58882be
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html b/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html
@@ -20,6 +20,7 @@ <h2 style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 1em;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-wrap: break-word;border: 0;text-align: left;">
                     Dear ${enrolment.student.contact.fullName}, <br />
                     Thank you for enrolling at <a style="color: #0084b4;color: #0084b4 !important;background-color: #ffffff;text-decoration: none;border: 0;word-wrap: break-word;" href="${Preferences.get("web.url")}" target="_blank">${Preferences.get("college.name")}</a>
+                    Location: ${enrolment.courseClass.room?.virtualRoomUrl ?: enrolment.courseClass.displayableLocation ?: "-"}
                 </p>
                 <% if (enrolment.courseClass.course.modules.size() > 0) { %>
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 1em;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-wrap: break-word;border: 0;text-align: left;">
@@ -35,9 +36,15 @@ <h2 style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size
                     If you do not have a USI you can apply for one via the link above.
                 </p>
                 <% } %>
+                <% if(enrolment.courseClass.isDistantLearningCourse && enrolment.courseClass.room?.virtualRoomUrl != null) { %>
+                <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 0;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-wrap: break-word;border: 0;text-align: left;">
+                    You can start your class any time by clicking here - ${enrolment.courseClass.room.virtualRoomUrl}
+                </p>
+                <% } else if(enrolment.courseClass.isHybrid && enrolment.courseClass.room?.virtualRoomUrl == null) { %>
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 0;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-wrap: break-word;border: 0;text-align: left;">
                     Please visit <a style="color: #0084b4;color: #0084b4 !important;background-color: #ffffff;text-decoration: none;border: 0;word-wrap: break-word;" href="${Preferences.get("web.url")}/class/${enrolment.courseClass.course.code}-${enrolment.courseClass.code}" target="_blank">${Preferences.get("web.url")}/class/${enrolment.courseClass.course.code}-${enrolment.courseClass.code}</a> to confirm the class details, directions and course requirements. <span style="color: #000000; color: #000000 !important; ">Enrolment reference: ${enrolment.invoiceLine.invoice.invoiceNumber}</span>
                 </p>
+                <% } %>
             </div>
         </td>
     </tr>
@@ -70,6 +77,7 @@ <h2 style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size
     <tr>
         <td align="left" class="ish_content_container left" style="border: 0;border-collapse: collapse;background-color: #ffffff;border: 0;padding-top: 0;padding-right: 17px;padding-bottom: 10px;padding-left: 17px; vertical-align: top;" valign="top">
             <div class="ish_text_container">
+
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 1em;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-wrap: break-word;border: 0;text-align: left;">
                     Class start: ${enrolment.courseClass.startDateTime?.format("EEEE d MMMM yyyy h:mm a", enrolment.courseClass.getTimeZone())} <br />
                     Class end: ${enrolment.courseClass.endDateTime?.format("EEEE d MMMM yyyy h:mm a", enrolment.courseClass.getTimeZone())}

diff --git a/server/src/main/resources/messages/ish.email.enrolmentConfirmation.txt b/server/src/main/resources/messages/ish.email.enrolmentConfirmation.txt
@@ -10,9 +10,13 @@ Expected duration: ${enrolment.courseClass.expectedHours ?: "not specified"}
 Start: ${enrolment.courseClass.startDateTime.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone())}
 End: ${enrolment.courseClass.endDateTime.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone())}
 <% } %>
-Location:${enrolment.courseClass.displayableLocation}
+Location: ${enrolment.courseClass.room?.virtualRoomUrl ?: enrolment.courseClass.displayableLocation ?: "-"}
 
+<% if (enrolment.courseClass.isDistantLearningCourse && enrolment.courseClass.room?.virtualRoomUrl != null) { %>
+You can start your class any time by clicking here - ${enrolment.courseClass.room.virtualRoomUrl}
+<% } else if (enrolment.courseClass.isHybrid && enrolment.courseClass.room?.virtualRoomUrl == null) { %>
 Please visit ${Preferences.get("web.url")}/class/${enrolment.courseClass.course.code}-${enrolment.courseClass.code} to confirm the class details, directions and course requirements.
+<% } %>
 
 <% if (Preferences.hasSurveyForm()) { %>
 At ${Preferences.get("college.name")} we value honest, constructive feedback to help us continually improve our services.

diff --git a/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.html b/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.html
@@ -21,7 +21,7 @@ <h2 style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size
                     Dear ${enrolment.student.contact.fullName},
                 </p>
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 1em;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-break: break-word;border: 0;text-align: left;">
-                    Just a reminder that your class for <strong>${enrolment.courseClass.course.name}</strong> starts on <strong>${enrolment.courseClass.startDateTime.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone())}</strong> at <strong>${enrolment.courseClass.displayableLocation}</strong>.
+                    Just a reminder that your class for <strong>${enrolment.courseClass.course.name}</strong> starts on <strong>${enrolment.courseClass.startDateTime?.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone()) ?: "?"}</strong> at <strong>${enrolment.courseClass.room?.virtualRoomUrl ?: enrolment.courseClass.displayableLocation ?: " - "}</strong>.
                 </p>
                 <p class="align-left" style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;font-size: 13px;color: #464646;color: #464646 !important;background-color: #ffffff;border: 0;letter-spacing: normal;mso-line-height-rule: exactly;-mso-line-height-rule: exactly;line-height: 150%;margin-top: .2em;margin-right: 0;margin-bottom: 1em;margin-left: 0;padding-top: 0;padding-right: 0;padding-bottom: 0;padding-left: 0;vertical-align: top;word-break: break-word;border: 0;text-align: left;">
                     Please let us know if you are unable to attend.

diff --git a/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.txt b/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.txt
@@ -1,5 +1,5 @@
 Dear ${enrolment.student.contact.firstName},
 
-Just a reminder that your class for ${enrolment.courseClass.course.name} starts on ${enrolment.courseClass.startDateTime.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone())} at ${enrolment.courseClass.displayableLocation}.
+Just a reminder that your class for ${enrolment.courseClass.course.name} starts on ${enrolment.courseClass.startDateTime?.format("h:mm a EEEE d MMMM yyyy zzzz", enrolment.courseClass.getTimeZone()) ?: "?"} at ${enrolment.courseClass.room?.virtualRoomUrl ?: enrolment.courseClass.displayableLocation ?: " - "}.
 
 Please let us know if you are unable to attend.
diff --git a/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html b/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html
@@ -11,9 +11,10 @@
                             <tr>
                                 <td class="mini-block pull-left" valign="top">
                                     Dear ${to.firstName},<br /><br />
-                                    Just a reminder that your class for ${courseClassTutor.courseClass.course.name} starts on ${courseClassTutor.courseClass.startDateTime.format( 'h:mm a EEEE d MMMM yyyy zzzz', courseClassTutor.courseClass.timeZone)} at ${courseClassTutor.courseClass.displayableLocation}<br />
+                                    Just a reminder that your class for ${courseClassTutor.courseClass.course.name} starts on ${courseClassTutor.courseClass.startDateTime?.format( 'h:mm a EEEE d MMMM yyyy zzzz', courseClassTutor.courseClass.timeZone) ?: "?"} at ${courseClassTutor.courseClass.room?.virtualRoomUrl ?: courseClassTutor.courseClass.displayableLocation}<br />
                                     You are currently expecting ${courseClassTutor.courseClass.successAndQueuedEnrolments.size()} students. This number may change if there are further enrolments.<br />
-                                    The class roll and other class information can be accessed at <a href="https://skillsoncourse.com.au/portal/login"><span>https://skillsoncourse.com.au/portal/login</span></a>
+                                    The class roll and other class information can be accessed at <a href="${to.getPortalLink(courseClassTutor.courseClass)}"><span>${to.getPortalLink(courseClassTutor.courseClass)}</span></a>
+                                    <br>You can download documents for this class from ${to.getPortalLink("/resources")}
                                 </td>
                             </tr>
                         </table>

diff --git a/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.txt b/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.txt
@@ -1,4 +1,5 @@
 Dear ${to.firstName},
-Just a reminder that your class for ${courseClassTutor.courseClass.course.name} starts on ${courseClassTutor.courseClass.startDateTime.format( 'h:mm a EEEE d MMMM yyyy zzzz', courseClassTutor.courseClass.timeZone)} at ${courseClassTutor.courseClass.displayableLocation}
+Just a reminder that your class for ${courseClassTutor.courseClass.course.name} starts on ${courseClassTutor.courseClass.startDateTime?.format( 'h:mm a EEEE d MMMM yyyy zzzz', courseClassTutor.courseClass.timeZone) ?: "?"} at ${courseClassTutor.courseClass.room?.virtualRoomUrl ?: courseClassTutor.courseClass.displayableLocation}
 You are currently expecting ${courseClassTutor.courseClass.successAndQueuedEnrolments.size()} students. This number may change if there are further enrolments.
-The class roll and other class information can be accessed at https://skillsoncourse.com.au/portal/login
+The class roll and other class information can be accessed at ${to.getPortalLink(courseClassTutor.courseClass)}
+You can download documents for this class from ${to.getPortalLink("/resources")}