From d151bc2356c0d147e78e24eed5c8d46467819264 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 1 Nov 2026 18:28:55 +0000 Subject: [PATCH] fix(client): filter lesson/class pickers by year in dialogs without year field Bulk edit dialogs (grade, att report by month, known absence), approve full days, bulk approve absences and the class attendance journal report had lesson/class reference inputs relying on a year taken from form data. These forms have no year field, so the year filter was dropped and records from all years were listed, showing the same lesson name several times. Add a static filter for the selected year. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012GTicrS5U95qpZsb6Z5n9s --- client/src/components/ApproveFullDays.jsx | 1 + client/src/components/BulkApproveAbsences.jsx | 3 ++- client/src/entities/att-report-with-report-month.jsx | 4 ++-- client/src/entities/grade.jsx | 4 ++-- client/src/entities/klass.jsx | 1 + client/src/entities/known-absence.jsx | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/components/ApproveFullDays.jsx b/client/src/components/ApproveFullDays.jsx index e4e0a57f..7a904189 100644 --- a/client/src/components/ApproveFullDays.jsx +++ b/client/src/components/ApproveFullDays.jsx @@ -62,6 +62,7 @@ export const ApproveFullDays = ({ label }) => { source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} + filter={defaultYearFilter} label="כיתה (לא חובה)" /> diff --git a/client/src/components/BulkApproveAbsences.jsx b/client/src/components/BulkApproveAbsences.jsx index 00ed1d2d..93edd45b 100644 --- a/client/src/components/BulkApproveAbsences.jsx +++ b/client/src/components/BulkApproveAbsences.jsx @@ -78,10 +78,11 @@ export const BulkApproveAbsences = ({ label, name }) => { - + diff --git a/client/src/entities/att-report-with-report-month.jsx b/client/src/entities/att-report-with-report-month.jsx index a8808c43..b44f75be 100644 --- a/client/src/entities/att-report-with-report-month.jsx +++ b/client/src/entities/att-report-with-report-month.jsx @@ -77,9 +77,9 @@ export const Datagrid = ({ isAdmin, children, ...props }) => { const additionalBulkButtons = [ - + - + diff --git a/client/src/entities/grade.jsx b/client/src/entities/grade.jsx index 648223a9..c03555e8 100644 --- a/client/src/entities/grade.jsx +++ b/client/src/entities/grade.jsx @@ -57,9 +57,9 @@ const filterDefaultValues = { const additionalBulkButtons = [ - + - + diff --git a/client/src/entities/klass.jsx b/client/src/entities/klass.jsx index 7c72d9c3..32a08cc9 100644 --- a/client/src/entities/klass.jsx +++ b/client/src/entities/klass.jsx @@ -64,6 +64,7 @@ const additionalBulkButtons = [ reference="lesson" label="שיעורים" dynamicFilter={filterByUserIdAndYear} + filter={defaultYearFilter} /> , diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index f82b639d..eef07edb 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -70,8 +70,8 @@ const filterDefaultValues = { const additionalBulkButtons = [ - - + +