From 58882bebcf8e97f14ed33dd5495d409281e1d6bd Mon Sep 17 00:00:00 2001 From: dmitrij Date: Wed, 8 Jan 2025 15:18:05 +0300 Subject: [PATCH] SST-51 feat: message templates updates for double a labs --- .../messages/ish.email.enrolmentConfirmation.html | 8 ++++++++ .../messages/ish.email.enrolmentConfirmation.txt | 6 +++++- .../ish.email.studentNoticeOfClassCommencement.html | 2 +- .../ish.email.studentNoticeOfClassCommencement.txt | 2 +- .../ish.email.tutorNoticeOfClassCommencement.html | 5 +++-- .../messages/ish.email.tutorNoticeOfClassCommencement.txt | 5 +++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html b/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html index 9a62859e40c..946fbec65f4 100644 --- a/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html +++ b/server/src/main/resources/messages/ish.email.enrolmentConfirmation.html @@ -20,6 +20,7 @@

Dear ${enrolment.student.contact.fullName},
Thank you for enrolling at ${Preferences.get("college.name")} + Location: ${enrolment.courseClass.room?.virtualRoomUrl ?: enrolment.courseClass.displayableLocation ?: "-"}

<% if (enrolment.courseClass.course.modules.size() > 0) { %>

@@ -35,9 +36,15 @@

+ 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. Enrolment reference: ${enrolment.invoiceLine.invoice.invoiceNumber}

+ <% } %> @@ -70,6 +77,7 @@

+

Class start: ${enrolment.courseClass.startDateTime?.format("EEEE d MMMM yyyy h:mm a", enrolment.courseClass.getTimeZone())}
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 index bec63b48304..3ea8fd4f48a 100644 --- 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 index 2abd700b3d2..343bf37bcd3 100644 --- a/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.html +++ b/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.html @@ -21,7 +21,7 @@

- 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.studentNoticeOfClassCommencement.txt b/server/src/main/resources/messages/ish.email.studentNoticeOfClassCommencement.txt index 6d8e3c6b40b..fa4b2d57675 100644 --- 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. \ No newline at end of file diff --git a/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html b/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html index 632a9863a10..fc68ca59d61 100644 --- a/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html +++ b/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.html @@ -11,9 +11,10 @@ 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")} diff --git a/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.txt b/server/src/main/resources/messages/ish.email.tutorNoticeOfClassCommencement.txt index ceb1af361c6..d6278d4336a 100644 --- 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")} \ No newline at end of file