Admissions: change the wording of student withdraw notifications that…

… are in the future (#1828)
GibbonEdu · May 6, 2024 · eae1e4f · eae1e4f
1 parent dc371ab
commit eae1e4f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -89,6 +89,7 @@ v27.0.00
         Activities: fixed missing Waiting List option when adding activity enrolment
         Admissions: fixed Form Group at Entry field when not using it as Office Only
         Admissions: ensure form submission email goes to the admissions account email address rather than parent1
+        Admissions: fixed the tense of the notification string when a student withdraws from the school
         Attendance: fixed handling of double periods in Set Future Absence tool
         Attendance: fixed timestamp of attendance taken for double periods in Take Attendance by Class
         Attendance: fixed onsite school absences not showing blue in Attendance by Form Group

diff --git a/modules/Admissions/student_withdrawProcess.php b/modules/Admissions/student_withdrawProcess.php
@@ -106,13 +106,24 @@
         if (!empty($notify) || !empty($notificationList)) {
             // Create the notification body
             $studentName = Format::name('', $student['preferredName'], $student['surname'], 'Student', false, true);
-            $notificationString = __('{student} {formGroup} has withdrawn from {school} on {date}.', [
-                'student'   => $studentName,
-                'formGroup'   => $student['formGroup'],
-                'school'    => $session->get('organisationNameShort'),
-                'date'      => Format::date($data['dateEnd']),
-            ]);
-
+
+            $today = date("Y-m-d"); 
+            if ($today > $data['dateEnd']) {
+                $notificationString = __('{student} {formGroup} has withdrawn from {school} on {date}.', [
+                    'student'   => $studentName,
+                    'formGroup'   => $student['formGroup'],
+                    'school'    => $session->get('organisationNameShort'),
+                    'date'      => Format::date($data['dateEnd']),
+                ]);
+            } else {
+                $notificationString = __('{student} {formGroup} will withdraw from {school}, effective from {date}.', [
+                    'student'   => $studentName,
+                    'formGroup'   => $student['formGroup'],
+                    'school'    => $session->get('organisationNameShort'),
+                    'date'      => Format::date($data['dateEnd']),
+                ]);
+            }
+
             if (!empty($withdrawNote)) {
                 $notificationString .= '<br/><br/>'.__('Withdraw Note').': '.$withdrawNote;
             }