From 533cc8140e6e7c8330bbe0b80dfdd384c1a7018c Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 18 Oct 2026 16:14:40 +0000 Subject: [PATCH 1/2] feat: bulk edit in grades, approved absences, students, lessons and teachers Move to the shared bulk edit (nra-server bulkEditFields + nra-client BulkEditButton). Attendance keeps its fields and now uses the shared handler on the att_report table; grades, known absences, students, lessons and teachers get bulk edit. The student "active/inactive" button is replaced by bulk edit with a nullable isActive field. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_018Ju7CjT3xeJYnaF7vU93GJ --- client/shared | 2 +- .../entities/att-report-with-report-month.jsx | 17 ++---- client/src/entities/grade.jsx | 16 +++++- client/src/entities/known-absence.jsx | 17 +++++- client/src/entities/lesson.jsx | 13 ++++- client/src/entities/student.jsx | 17 ++---- client/src/entities/teacher.jsx | 9 ++- client/src/roadmapFeatures.js | 1 + server/shared | 2 +- ...tt-report-with-report-month.config.spec.ts | 56 +++++-------------- .../att-report-with-report-month.config.ts | 27 ++++----- server/src/entity-modules/grade.config.ts | 10 ++++ .../entity-modules/known-absence.config.ts | 11 ++++ server/src/entity-modules/lesson.config.ts | 1 + server/src/entity-modules/student.config.ts | 20 +------ server/src/entity-modules/teacher.config.ts | 1 + 16 files changed, 112 insertions(+), 108 deletions(-) diff --git a/client/shared b/client/shared index aad767b1..b20a9449 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit aad767b171a0df8a3385c1fe503c1fec514a9cdd +Subproject commit b20a9449e0119be245485a7d06e81845e194d3e9 diff --git a/client/src/entities/att-report-with-report-month.jsx b/client/src/entities/att-report-with-report-month.jsx index e1e15515..a8808c43 100644 --- a/client/src/entities/att-report-with-report-month.jsx +++ b/client/src/entities/att-report-with-report-month.jsx @@ -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'; @@ -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'; @@ -75,16 +75,7 @@ const filterDefaultValues = { export const Datagrid = ({ isAdmin, children, ...props }) => { const additionalBulkButtons = [ - } - name="bulkEdit" - key="bulkEdit" - reloadOnEnd - cacheValues={false} - > - {isAdmin && } - {isAdmin && } + @@ -92,7 +83,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => { - , + , } name="bulkKnownAbsences"> diff --git a/client/src/entities/grade.jsx b/client/src/entities/grade.jsx index 59987fb6..648223a9 100644 --- a/client/src/entities/grade.jsx +++ b/client/src/entities/grade.jsx @@ -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, @@ -53,9 +54,22 @@ const filterDefaultValues = { ...defaultYearFilter, }; +const additionalBulkButtons = [ + + + + + + + + + + , +]; + export const Datagrid = ({ isAdmin, children, ...props }) => { return ( - + {children} {isAdmin && } {isAdmin && } diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 3b5c45bb..28ff8899 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -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'; @@ -64,10 +65,24 @@ const filterDefaultValues = { ...defaultYearFilter, }; +const additionalBulkButtons = [ + + + + + + + + + + + , +]; + const Datagrid = ({ isAdmin, children, isPreview, ...props }) => { const isAbsenceType = useIsAbsenceType(); return ( - + {children} {isAdmin && } {isAdmin && } diff --git a/client/src/entities/lesson.jsx b/client/src/entities/lesson.jsx index 0b7e964b..eb956aaa 100644 --- a/client/src/entities/lesson.jsx +++ b/client/src/entities/lesson.jsx @@ -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, @@ -49,9 +50,19 @@ const filterDefaultValues = { ...defaultYearFilter, }; +const additionalBulkButtons = [ + + + + + + + , +]; + const Datagrid = ({ isAdmin, children, ...props }) => { return ( - + {children} {isAdmin && } {isAdmin && } diff --git a/client/src/entities/student.jsx b/client/src/entities/student.jsx index 9a3336cb..12633a91 100644 --- a/client/src/entities/student.jsx +++ b/client/src/entities/student.jsx @@ -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'; @@ -39,15 +38,11 @@ const filterDefaultValues = { const additionalBulkButtons = [ , - } - name="bulkUpdateActive" - key="bulkUpdateActive" - reloadOnEnd - > - - , + + + + + , ]; const Datagrid = ({ isAdmin, children, ...props }) => { diff --git a/client/src/entities/teacher.jsx b/client/src/entities/teacher.jsx index f992da87..464eecd1 100644 --- a/client/src/entities/teacher.jsx +++ b/client/src/entities/teacher.jsx @@ -18,6 +18,7 @@ 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, @@ -25,9 +26,15 @@ const filters = [ , ]; +const additionalBulkButtons = [ + + + , +]; + const Datagrid = ({ isAdmin, children, ...props }) => { return ( - + {children} {isAdmin && } {isAdmin && } diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index 57890809..b407974a 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -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' }, diff --git a/server/shared b/server/shared index c7558b33..729ed00c 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit c7558b330f8468a16ab6013f143041b7ed950afe +Subproject commit 729ed00c794c0bc850fd371bc4a4bf9f62fb1109 diff --git a/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts b/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts index 623c447d..6ced40f1 100644 --- a/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts +++ b/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts @@ -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(); - }); }); }); diff --git a/server/src/entity-modules/att-report-with-report-month.config.ts b/server/src/entity-modules/att-report-with-report-month.config.ts index 75cdde53..05c92f25 100644 --- a/server/src/entity-modules/att-report-with-report-month.config.ts +++ b/server/src/entity-modules/att-report-with-report-month.config.ts @@ -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 }, @@ -107,7 +115,8 @@ class AttReportWithReportMonthService, body: any): Promise { 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': @@ -126,20 +135,6 @@ class AttReportWithReportMonthService entity.id); } - private async bulkEdit(extra: Record, ids: number[]): Promise { - 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, ids: number[]): Promise { if (ids.length === 0) return 'לא נבחרו רשומות'; const reports = await this.dataSource.getRepository(AttReport).findBy({ id: In(ids) }); diff --git a/server/src/entity-modules/grade.config.ts b/server/src/entity-modules/grade.config.ts index 882e138d..a589eeaa 100644 --- a/server/src/entity-modules/grade.config.ts +++ b/server/src/entity-modules/grade.config.ts @@ -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 }, diff --git a/server/src/entity-modules/known-absence.config.ts b/server/src/entity-modules/known-absence.config.ts index 2de7a1c3..aa9ec611 100644 --- a/server/src/entity-modules/known-absence.config.ts +++ b/server/src/entity-modules/known-absence.config.ts @@ -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 }, diff --git a/server/src/entity-modules/lesson.config.ts b/server/src/entity-modules/lesson.config.ts index 5ed4ece8..b69ac8d9 100644 --- a/server/src/entity-modules/lesson.config.ts +++ b/server/src/entity-modules/lesson.config.ts @@ -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 }, diff --git a/server/src/entity-modules/student.config.ts b/server/src/entity-modules/student.config.ts index cd31fb8e..33edc1cd 100644 --- a/server/src/entity-modules/student.config.ts +++ b/server/src/entity-modules/student.config.ts @@ -9,12 +9,11 @@ import { BulkToPdfReportGenerator } from '@shared/utils/report/bulk-to-pdf.gener import studentReportCardReact from 'src/reports/studentReportCardReact'; import { getUserIdFromUser } from '@shared/auth/auth.util'; import { generateStudentReportCard } from 'src/reports/reportGenerator'; -import { In } from 'typeorm'; -import { getAsBoolean, getAsNumberArray } from '@shared/utils/queryParam.util'; function getConfig(): BaseEntityModuleOptions { return { entity: Student, + bulkEditFields: ['comment', 'address', 'isActive'], exporter: { getExportHeaders(): IHeader[] { return [ @@ -43,23 +42,6 @@ class StudentService extends BaseEntityService { } return super.getReportData(req); } - - async doAction(req: CrudRequest, body: any): Promise { - switch (req.parsed.extra.action) { - case 'bulkUpdateActive': { - const ids = (await this.getManyByIds(req, getAsNumberArray(req.parsed.extra.ids))).map( - (entity: any) => entity.id, - ); - const isActive = getAsBoolean(req.parsed.extra.isActive) ?? false; - if (!ids.length) return 'לא נבחרו רשומות'; - - const result = await this.dataSource.getRepository(Student).update({ id: In(ids) }, { isActive }); - - return `עודכנו ${result.affected} תלמידים`; - } - } - return super.doAction(req, body); - } } export default getConfig(); diff --git a/server/src/entity-modules/teacher.config.ts b/server/src/entity-modules/teacher.config.ts index 23825ab4..add287a7 100644 --- a/server/src/entity-modules/teacher.config.ts +++ b/server/src/entity-modules/teacher.config.ts @@ -5,6 +5,7 @@ import { Teacher } from 'src/db/entities/Teacher.entity'; function getConfig(): BaseEntityModuleOptions { return { entity: Teacher, + bulkEditFields: ['comment'], exporter: { getExportHeaders(): IHeader[] { return [ From 28a5f62a1c32f81053071f0852524a6101dd896f Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 18 Oct 2026 18:36:54 +0000 Subject: [PATCH 2/2] chore: point shared submodules to merged bulk edit commits Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_018Ju7CjT3xeJYnaF7vU93GJ --- client/shared | 2 +- server/shared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index b20a9449..57559541 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit b20a9449e0119be245485a7d06e81845e194d3e9 +Subproject commit 5755954159e2792f1421bb344049aceec85733a9 diff --git a/server/shared b/server/shared index 729ed00c..08a31a98 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 729ed00c794c0bc850fd371bc4a4bf9f62fb1109 +Subproject commit 08a31a98f89ac06cbb8856a111a595b8d3571f5f