From 6845280d6a0757d9e0a479d7ca7692acd3c5b721 Mon Sep 17 00:00:00 2001 From: Ali Alam Date: Mon, 3 Mar 2025 10:25:44 +0800 Subject: [PATCH] Tables: fixed hard-coded use of colon : in filterBy methods (#1912) Co-authored-by: Ali Alam --- cli/schoolAdmin_parentWeeklyEmailSummary.php | 4 ++-- modules/Staff/coverage_my.php | 10 +++++----- modules/Staff/coverage_view.php | 4 ++-- modules/User Admin/role_manage_view.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/schoolAdmin_parentWeeklyEmailSummary.php b/cli/schoolAdmin_parentWeeklyEmailSummary.php index 5bdc686213..16dbde8d2f 100644 --- a/cli/schoolAdmin_parentWeeklyEmailSummary.php +++ b/cli/schoolAdmin_parentWeeklyEmailSummary.php @@ -112,8 +112,8 @@ // HOMEWORK $criteria = $plannerEntryGateway->newQueryCriteria(true) ->sortBy('homeworkDueDateTime', 'ASC') - ->filterBy('weekly:Y') - ->filterBy('viewableParents:Y') + ->filterBy('weekly', 'Y') + ->filterBy('viewableParents', 'Y') ->fromPOST(); $allHomework = $plannerEntryGateway->queryHomeworkByPerson($criteria, $gibbonSchoolYearID, $student['gibbonPersonID']); diff --git a/modules/Staff/coverage_my.php b/modules/Staff/coverage_my.php index 4b2a39ba23..372a4acaaf 100644 --- a/modules/Staff/coverage_my.php +++ b/modules/Staff/coverage_my.php @@ -53,9 +53,9 @@ // TODAY'S COVERAGE $criteria = $staffCoverageGateway->newQueryCriteria(true) ->sortBy('timeStart') - ->filterBy('status:Accepted') - ->filterBy('dateStart:'.date('Y-m-d')) - ->filterBy('dateEnd:'.date('Y-m-d')) + ->filterBy('status', 'Accepted') + ->filterBy('dateStart', date('Y-m-d')) + ->filterBy('dateEnd', date('Y-m-d')) ->fromPOST('staffCoverageToday'); $todaysCoverage = $staffCoverageGateway->queryCoverageByPersonCovering($criteria, $session->get('gibbonSchoolYearID'), $gibbonPersonID); @@ -92,7 +92,7 @@ // TEACHER COVERAGE $criteria = $staffCoverageGateway->newQueryCriteria(true) ->sortBy('dateStart', 'DESC') - ->filterBy('date:upcoming') + ->filterBy('date', 'upcoming') ->fromPOST('staffCoverageSelf'); $coverage = $staffCoverageGateway->queryCoverageByPersonAbsent($criteria, $session->get('gibbonSchoolYearID'), $gibbonPersonID, false); @@ -213,7 +213,7 @@ // QUERY $criteria = $staffCoverageGateway->newQueryCriteria(true) ->sortBy('date', 'DESC') - ->filterBy('date:upcoming') + ->filterBy('date', 'upcoming') ->fromPOST('staffCoverageOther'); $coverage = $staffCoverageGateway->queryCoverageByPersonCovering($criteria, $session->get('gibbonSchoolYearID'), $gibbonPersonID); diff --git a/modules/Staff/coverage_view.php b/modules/Staff/coverage_view.php index 1329603ebb..1834bf1a39 100644 --- a/modules/Staff/coverage_view.php +++ b/modules/Staff/coverage_view.php @@ -49,7 +49,7 @@ $criteria = $staffCoverageGateway->newQueryCriteria() ->sortBy('date', 'ASC') ->filterBy('requested', 'Y') - ->filterBy('date:upcoming') + ->filterBy('date', 'upcoming') ->fromPOST('myCoverage'); $myCoverage = $staffCoverageGateway->queryCoverageByPersonCovering($criteria, $gibbonSchoolYearID, $gibbonPersonID, true); @@ -57,7 +57,7 @@ $criteria = $staffCoverageGateway->newQueryCriteria() ->sortBy('date', 'ASC') ->filterBy('requested', 'Y') - ->filterBy('date:upcoming') + ->filterBy('date', 'upcoming') ->fromPOST('allCoverage'); $allCoverage = $staffCoverageGateway->queryCoverageWithNoPersonAssigned($criteria, $substitute['type'] ?? ''); diff --git a/modules/User Admin/role_manage_view.php b/modules/User Admin/role_manage_view.php index 81545612c5..58dd57007d 100644 --- a/modules/User Admin/role_manage_view.php +++ b/modules/User Admin/role_manage_view.php @@ -45,7 +45,7 @@ // CRITERIA $criteria = $roleGateway->newQueryCriteria(true) ->sortBy(['gibbonPerson.surname', 'gibbonPerson.preferredName']) - ->filterBy('status:full') + ->filterBy('status', 'full') ->fromPOST(); $actions = $roleGateway->selectActionsByRole($gibbonRoleID)->fetchGrouped();