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
12 changes: 12 additions & 0 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove';
import HelpIcon from '@mui/icons-material/Help';
import ClassIcon from '@mui/icons-material/Class';
import PersonIcon from '@mui/icons-material/Person';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
Expand Down Expand Up @@ -81,6 +82,17 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
{isAdmin && <CommonYearInput />}
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
</BulkActionButton>,
<BulkActionButton
label="שינוי מורה"
icon={<PersonIcon />}
name="bulkChangeTeacher"
key="bulkChangeTeacher"
reloadOnEnd
>
{isAdmin && <CommonReferenceInput source="userId" reference="user" />}
{isAdmin && <CommonYearInput />}
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
</BulkActionButton>,
<BulkActionButton label="הוספת חיסורים מאושרים" icon={<PlaylistRemoveIcon />} name="bulkKnownAbsences">
<DateInput source="reportDate" resource="known_absence" />
<NumberInput source="absnceCount" resource="known_absence" defaultValue={1} />
Expand Down
11 changes: 11 additions & 0 deletions server/src/entity-modules/att-report-with-report-month.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ class AttReportWithReportMonthService<T extends Entity | AttReportWithReportMont
switch (req.parsed.extra.action) {
case 'bulkChangeKlass':
return this.bulkChangeKlass(req.parsed.extra);
case 'bulkChangeTeacher':
return this.bulkChangeTeacher(req.parsed.extra);
case 'bulkKnownAbsences':
return this.bulkKnownAbsences(req.parsed.extra);
case 'fixStudentReferenceV2':
Expand All @@ -135,6 +137,15 @@ class AttReportWithReportMonthService<T extends Entity | AttReportWithReportMont
return `עודכנו ${result.affected} רשומות`;
}

private async bulkChangeTeacher(extra: any): Promise<string> {
const ids = getAsNumberArray(extra.ids);
if (!ids || ids.length === 0) return 'לא נבחרו רשומות';
const teacherReferenceId = getAsNumber(extra.teacherReferenceId);
if (!teacherReferenceId) return 'לא נבחר מורה';
const result = await this.dataSource.getRepository(AttReport).update({ id: In(ids) }, { teacherReferenceId });
return `עודכנו ${result.affected} רשומות`;
}

private async bulkKnownAbsences(extra: any): Promise<string> {
const ids = getAsArray(extra.ids);
if (!ids) return 'לא נבחרו רשומות';
Expand Down
Loading