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 = [ - - + +