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
2 changes: 1 addition & 1 deletion client/shared
17 changes: 4 additions & 13 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
} from 'react-admin';
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove';
import HelpIcon from '@mui/icons-material/Help';
import EditIcon from '@mui/icons-material/Edit';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
Expand All @@ -23,11 +22,12 @@ import {
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { defaultYearFilter } from '@shared/utils/yearFilter';
import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { Inputs } from './att-report';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { useIsLessonSignature, isTeacherView } from 'src/utils/appPermissions';

Expand Down Expand Up @@ -75,24 +75,15 @@ const filterDefaultValues = {

export const Datagrid = ({ isAdmin, children, ...props }) => {
const additionalBulkButtons = [
<BulkActionButton
label="עריכה מרוכזת"
icon={<EditIcon />}
name="bulkEdit"
key="bulkEdit"
reloadOnEnd
cacheValues={false}
>
{isAdmin && <CommonReferenceInput source="userId" reference="user" />}
{isAdmin && <CommonYearInput />}
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<NumberInput source="howManyLessons" />
<NumberInput source="absCount" />
<TextInput source="comments" />
</BulkActionButton>,
</BulkEditButton>,
<BulkActionButton label="הוספת חיסורים מאושרים" icon={<PlaylistRemoveIcon />} name="bulkKnownAbsences">
<DateInput source="reportDate" resource="known_absence" />
<NumberInput source="absnceCount" resource="known_absence" defaultValue={1} />
Expand Down
16 changes: 15 additions & 1 deletion client/src/entities/grade.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput
import { defaultYearFilter } from '@shared/utils/yearFilter';
import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';

const filters = [
...commonAdminFilters,
Expand Down Expand Up @@ -53,9 +54,22 @@ const filterDefaultValues = {
...defaultYearFilter,
};

const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<NumberInput source="howManyLessons" />
<NumberInput source="grade" />
<TextInput source="estimation" />
<TextInput source="comments" />
</BulkEditButton>,
];

export const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
<CommonDatagrid {...props} additionalBulkButtons={additionalBulkButtons}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
Expand Down
17 changes: 16 additions & 1 deletion client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
import { BulkApproveAbsences } from 'src/components/BulkApproveAbsences';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';
import { useIsAbsenceType } from 'src/utils/appPermissions';

import CommonFileField from '@shared/components/fields/CommonFileField';
Expand Down Expand Up @@ -64,10 +65,24 @@ const filterDefaultValues = {
...defaultYearFilter,
};

const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<DateInput source="reportDate" />
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} />
<NumberInput source="absnceCount" />
<NumberInput source="absnceCode" />
<TextInput source="reason" validate={maxLength(500)} />
<TextInput source="senderName" validate={maxLength(100)} />
<TextInput source="comment" validate={maxLength(500)} />
<NullableBooleanInput source="isApproved" />
</BulkEditButton>,
];

const Datagrid = ({ isAdmin, children, isPreview, ...props }) => {
const isAbsenceType = useIsAbsenceType();
return (
<CommonDatagrid {...props}>
<CommonDatagrid {...props} additionalBulkButtons={additionalBulkButtons}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
Expand Down
13 changes: 12 additions & 1 deletion client/src/entities/lesson.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import { useUnique } from '@shared/utils/useUnique';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';

const filters = [
...commonAdminFilters,
Expand All @@ -49,9 +50,19 @@ const filterDefaultValues = {
...defaultYearFilter,
};

const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<DateInput source="startDate" />
<DateInput source="endDate" />
<NumberInput source="howManyLessons" />
<TextInput source="comment" validate={maxLength(1000)} />
</BulkEditButton>,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
<CommonDatagrid {...props} additionalBulkButtons={additionalBulkButtons}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
Expand Down
17 changes: 6 additions & 11 deletions client/src/entities/student.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import { defaultYearFilter } from '@shared/utils/yearFilter';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { useUnique } from '@shared/utils/useUnique';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { CommonYearField } from '@shared/components/fields/CommonYear';

Expand All @@ -39,15 +38,11 @@ const filterDefaultValues = {

const additionalBulkButtons = [
<StudentReportCardReactButton key="studentReportCardReact" defaultRequestValues={filterDefaultValues} />,
<BulkActionButton
label="סימון פעיל/לא פעיל"
icon={<CheckCircleIcon />}
name="bulkUpdateActive"
key="bulkUpdateActive"
reloadOnEnd
>
<BooleanInput source="isActive" label="פעיל" />
</BulkActionButton>,
<BulkEditButton key="bulkEdit">
<TextInput source="comment" validate={maxLength(1000)} />
<TextInput source="address" validate={maxLength(1000)} />
<NullableBooleanInput source="isActive" />
</BulkEditButton>,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
Expand Down
9 changes: 8 additions & 1 deletion client/src/entities/teacher.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,23 @@ import { getResourceComponents } from '@shared/components/crudContainers/CommonE
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { useUnique } from '@shared/utils/useUnique';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { BulkEditButton } from '@shared/components/crudContainers/BulkEditButton';

const filters = [
...commonAdminFilters,
<TextInput source="tz:$cont" label="תז" />,
<TextInput source="name:$cont" alwaysOn />,
];

const additionalBulkButtons = [
<BulkEditButton key="bulkEdit">
<TextInput source="comment" validate={maxLength(1000)} />
</BulkEditButton>,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
<CommonDatagrid {...props} additionalBulkButtons={additionalBulkButtons}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
Expand Down
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default [
{ html: 'הגדרת זמני שיעורים לכל יום במסך ההגדרות, ובדוח המורות שדיווחו: ריבוע ריק לשיעור שלא דווח באמצע היום', status: 'בוצע', statusColor: 'success' },
{ html: 'רשימות: שורת הסינון והייצוא וכותרת הטבלה נשארות קבועות בראש המסך בזמן גלילה (במחשב), ובייצוא לאקסל שורת הכותרת קפואה', status: 'בוצע', statusColor: 'success' },
{ html: 'תלמידה שסומנה "לא פעילה" לא מופיעה יותר בדיווח שיעור חדש, בדיווח טלפוני ובקובץ הדיווח למורה (הנתונים הקודמים שלה נשמרים)', status: 'בוצע', statusColor: 'success' },
{ html: 'עריכה מרוכזת גם בציונים, חיסורים מאושרים, תלמידות, שיעורים ומורות: מסמנים שורות ומעדכנים שדות נבחרים בכולן יחד (שדה ריק לא משתנה)', status: 'בוצע', statusColor: 'success' },

// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,67 +122,37 @@ describe('att-report-with-report-month.config', () => {
expect(mockBaseCreateMany).toHaveBeenCalledWith(req, dto);
});

it('bulkEdit should update only filled fields', async () => {
const req = {
parsed: {
extra: {
action: 'bulkEdit',
ids: '1,2',
reportDate: '2026-10-11',
klassReferenceId: '5',
teacherReferenceId: 'undefined',
lessonReferenceId: 'null',
howManyLessons: '',
absCount: '0',
},
},
} as any;
it('bulkEdit should update the att_report table through the shared bulk edit', async () => {
service.handleBulkEditAction = jest.fn().mockResolvedValue('עודכנו 2 רשומות');
const req = { parsed: { extra: { action: 'bulkEdit', ids: '1,2', absCount: '0' } } } as any;

const result = await service.doAction(req, {});

expect(mockDataSource.getRepository).toHaveBeenCalledWith(AttReport);
expect(mockRepo.update).toHaveBeenCalledWith(
{ id: expect.anything() },
{ reportDate: new Date('2026-10-11'), klassReferenceId: 5, absCount: 0 },
);
expect(mockRepo.update.mock.calls[0][0].id.value).toEqual([1, 2]);
expect(service.handleBulkEditAction).toHaveBeenCalledWith(req, mockRepo);
expect(result).toBe('עודכנו 2 רשומות');
});

it('bulkEdit should only update ids the caller can access', async () => {
it('bulkKnownAbsences should only use ids the caller can access', async () => {
service.getManyByIds.mockResolvedValueOnce([{ id: 1 }]);
const req = { parsed: { extra: { action: 'bulkEdit', ids: '1,99', absCount: '1' } } } as any;
mockRepo.findBy.mockResolvedValueOnce([]);
const req = { parsed: { extra: { action: 'bulkKnownAbsences', ids: '1,99' } } } as any;

await service.doAction(req, {});
// An empty insert fails validation; only the lookup matters here
await service.doAction(req, {}).catch(() => undefined);

expect(service.getManyByIds).toHaveBeenCalledWith(req, [1, 99]);
expect(mockRepo.update.mock.calls[0][0].id.value).toEqual([1]);
expect(mockRepo.findBy.mock.calls[0][0].id.value).toEqual([1]);
});

it('bulkEdit should do nothing when no selected id is accessible', async () => {
it('bulkKnownAbsences should do nothing when no selected id is accessible', async () => {
service.getManyByIds.mockResolvedValueOnce([]);
const req = { parsed: { extra: { action: 'bulkEdit', ids: '99', absCount: '1' } } } as any;
const req = { parsed: { extra: { action: 'bulkKnownAbsences', ids: '99' } } } as any;

const result = await service.doAction(req, {});

expect(mockRepo.update).not.toHaveBeenCalled();
expect(mockRepo.findBy).not.toHaveBeenCalled();
expect(result).toBe('לא נבחרו רשומות');
});

it('bulkEdit should not update when no field is filled', async () => {
const req = { parsed: { extra: { action: 'bulkEdit', ids: '1,2', reportDate: 'null' } } } as any;

const result = await service.doAction(req, {});

expect(mockRepo.update).not.toHaveBeenCalled();
expect(result).toBe('לא נבחרו שדות לעדכון');
});

it('bulkEdit should reject invalid values', async () => {
const req = { parsed: { extra: { action: 'bulkEdit', ids: '1', absCount: 'abc' } } } as any;

await expect(service.doAction(req, {})).rejects.toThrow('ערך לא תקין');
expect(mockRepo.update).not.toHaveBeenCalled();
});
});
});
27 changes: 11 additions & 16 deletions server/src/entity-modules/att-report-with-report-month.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@ import { validateBulk } from '@shared/base-entity/base-entity.util';
import { fixReferences } from '@shared/utils/entity/fixReference.util';
import { getHebrewDateFormatter } from '@shared/utils/formatting/formatter.util';
import { shouldShowTopic } from './att-report.config';
import { getBulkEditUpdate } from '@shared/utils/entity/bulkEdit.util';
import { getAsDate, getAsNumber, getAsBoolean, getAsString, getAsNumberArray } from '@shared/utils/queryParam.util';

function getConfig(): BaseEntityModuleOptions {
return {
entity: AttReportWithReportMonth,
bulkEditFields: [
'reportDate',
'klassReferenceId',
'teacherReferenceId',
'lessonReferenceId',
'howManyLessons',
'absCount',
'comments',
],
query: {
join: {
studentBaseKlass: { eager: true },
Expand Down Expand Up @@ -107,7 +115,8 @@ class AttReportWithReportMonthService<T extends Entity | AttReportWithReportMont
async doAction(req: CrudRequest<any, any>, body: any): Promise<any> {
switch (req.parsed.extra.action) {
case 'bulkEdit':
return this.bulkEdit(req.parsed.extra, await this.getOwnedIds(req));
// The view is read-only; the edit goes to the underlying att_report table
return this.handleBulkEditAction(req, this.dataSource.getRepository(AttReport));
case 'bulkKnownAbsences':
return this.bulkKnownAbsences(req.parsed.extra, await this.getOwnedIds(req));
case 'fixStudentReferenceV2':
Expand All @@ -126,20 +135,6 @@ class AttReportWithReportMonthService<T extends Entity | AttReportWithReportMont
return entities.map((entity: any) => entity.id);
}

private async bulkEdit(extra: Record<string, string>, ids: number[]): Promise<string> {
if (ids.length === 0) return 'לא נבחרו רשומות';

const update = getBulkEditUpdate(extra, {
numbers: ['klassReferenceId', 'teacherReferenceId', 'lessonReferenceId', 'howManyLessons', 'absCount'],
dates: ['reportDate'],
strings: ['comments'],
});
if (Object.keys(update).length === 0) return 'לא נבחרו שדות לעדכון';

const result = await this.dataSource.getRepository(AttReport).update({ id: In(ids) }, update);
return `עודכנו ${result.affected} רשומות`;
}

private async bulkKnownAbsences(extra: Record<string, string>, ids: number[]): Promise<string> {
if (ids.length === 0) return 'לא נבחרו רשומות';
const reports = await this.dataSource.getRepository(AttReport).findBy({ id: In(ids) });
Expand Down
10 changes: 10 additions & 0 deletions server/src/entity-modules/grade.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ import { getAsString } from '@shared/utils/queryParam.util';
function getConfig(): BaseEntityModuleOptions {
return {
entity: Grade,
bulkEditFields: [
'reportDate',
'klassReferenceId',
'teacherReferenceId',
'lessonReferenceId',
'howManyLessons',
'grade',
'estimation',
'comments',
],
query: {
join: {
studentBaseKlass: { eager: false },
Expand Down
11 changes: 11 additions & 0 deletions server/src/entity-modules/known-absence.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity';
function getConfig(): BaseEntityModuleOptions {
return {
entity: KnownAbsence,
bulkEditFields: [
'reportDate',
'klassReferenceId',
'lessonReferenceId',
'absnceCount',
'absnceCode',
'reason',
'senderName',
'comment',
'isApproved',
],
query: {
join: {
student: { eager: false },
Expand Down
1 change: 1 addition & 0 deletions server/src/entity-modules/lesson.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Lesson } from 'src/db/entities/Lesson.entity';
function getConfig(): BaseEntityModuleOptions {
return {
entity: Lesson,
bulkEditFields: ['teacherReferenceId', 'startDate', 'endDate', 'howManyLessons', 'comment'],
query: {
join: {
teacher: { eager: false },
Expand Down
Loading
Loading