From 9d1cd18b2afdc844267d9a1418ad5f66a2086525 Mon Sep 17 00:00:00 2001 From: Sandra Kuipers Date: Tue, 8 Aug 2023 14:46:24 +0800 Subject: [PATCH] Activities: update View Activities to highlight waiting list registrations in orange --- CHANGELOG.txt | 1 + modules/Activities/activities_view.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d0635dde91..224e72df07 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -37,6 +37,7 @@ v26.0.00 System: added additional sanitization to GET variables and alerts System: added a system log when passwords are manually changed in User Admin Attendance: added the name of attendance last taken to Form Groups Not Registered + Activities: updated View Activities to highlight waiting list registrations in orange Behaviour: added a list of failed email addresses to behaviour letter CLI script Behaviour: added a notification event for receiving behaviour notifications about IN students Library: added a confirmation step to replace the name of books using Google Book Data diff --git a/modules/Activities/activities_view.php b/modules/Activities/activities_view.php index ebcdc998db..8e2b00e827 100644 --- a/modules/Activities/activities_view.php +++ b/modules/Activities/activities_view.php @@ -298,7 +298,8 @@ }); $table->modifyRows(function ($activity, $row) { - if (!empty($activity['currentEnrolment'])) $row->addClass('current'); + if (!empty($activity['currentEnrolment']) && $activity['currentEnrolment']['status'] != 'Waiting List') $row->addClass('current'); + if (!empty($activity['currentEnrolment']) && $activity['currentEnrolment']['status'] == 'Waiting List') $row->addClass('warning'); else if ($activity['registration'] != 'Y') $row->addClass('dull'); else if ($activity['enrolmentFull']) $row->addClass('error');