Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/components/ApproveFullDays.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export const ApproveFullDays = ({ label }) => {
source="klassReferenceId"
reference="klass"
dynamicFilter={filterByUserIdAndYear}
filter={defaultYearFilter}
label="כיתה (לא חובה)"
/>
<AbsenceReasonInput validate={maxLength(500)} label="סיבה" />
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/BulkApproveAbsences.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ export const BulkApproveAbsences = ({ label, name }) => {
<CommonReferenceInput
source="klassReferenceId"
reference="klass"
filter={defaultYearFilter}
validate={required()}
label="כיתה"
/>
<CommonReferenceInput source="lessonReferenceId" reference="lesson" label="שיעור" />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" filter={defaultYearFilter} label="שיעור" />
<NumberInput source="absnceCount" validate={required()} label="מספר חיסורים" />
</SimpleFormIterator>
</ArrayInput>
Expand Down
4 changes: 2 additions & 2 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<NumberInput source="howManyLessons" />
<NumberInput source="absCount" />
<TextInput source="comments" />
Expand Down
4 changes: 2 additions & 2 deletions client/src/entities/grade.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ const filterDefaultValues = {
const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<NumberInput source="howManyLessons" />
<NumberInput source="grade" />
<TextInput source="estimation" />
Expand Down
1 change: 1 addition & 0 deletions client/src/entities/klass.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const additionalBulkButtons = [
reference="lesson"
label="שיעורים"
dynamicFilter={filterByUserIdAndYear}
filter={defaultYearFilter}
/>
<BooleanInput source="groupByDate" label="קיבוץ לפי תאריך" defaultValue={true} />
</BulkReportButton>,
Expand Down
4 changes: 2 additions & 2 deletions client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ const filterDefaultValues = {
const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} filter={defaultYearFilter} />
<NumberInput source="absnceCount" />
<NumberInput source="absnceCode" />
<AbsenceReasonInput validate={maxLength(500)} />
Expand Down
Loading