From 7d787884f2ff02420d6167566e659d5916ca5e58 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 9 Aug 2026 20:24:07 +0000 Subject: [PATCH 1/2] Add klass exclusion filter to student report card, remove old non-react report card - add denyKlassReferenceIds param to studentReportCardReact (server + client) - exclude denied klasses from getReportsFilterForReportCard, combined with klassType inclusion filter when both present - delete server/src/reports/studentReportCard.ts (old ejs-based report) and its registrations - update tests accordingly Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_012dgrqbwpeXRKvrQZER1QDo --- client/src/entities/student.jsx | 2 - .../reports/studentReportCardReactButton.jsx | 5 + project-index.md | 3 +- .../__tests__/student-klass.config.spec.ts | 23 -- .../__tests__/student.config.spec.ts | 4 +- .../student-klass-report.config.ts | 2 - .../entity-modules/student-klass.config.ts | 2 - server/src/entity-modules/student.config.ts | 2 - server/src/reports/reportGenerator.ts | 1 + server/src/reports/studentReportCard.ts | 253 ------------------ server/src/reports/studentReportCardReact.tsx | 3 +- .../__tests__/studentReportData.util.spec.ts | 20 ++ server/src/utils/studentReportData.util.ts | 7 +- 13 files changed, 36 insertions(+), 291 deletions(-) delete mode 100644 server/src/reports/studentReportCard.ts diff --git a/client/src/entities/student.jsx b/client/src/entities/student.jsx index 53b0cb3e..f5da89c1 100644 --- a/client/src/entities/student.jsx +++ b/client/src/entities/student.jsx @@ -41,8 +41,6 @@ const filterDefaultValues = { }; const additionalBulkButtons = [ - // } - // key='studentReportCard' name='studentReportCard' filename='תעודה' />, , { reference="lesson" label="שיעורים שלא ייכללו בתעודה" /> + diff --git a/project-index.md b/project-index.md index 65e0dce6..fc75bbab 100644 --- a/project-index.md +++ b/project-index.md @@ -128,8 +128,7 @@ ### Reports - `/server/src/reports/reportGenerator.ts` - Report generation functionality -- `/server/src/reports/studentReportCard.ts` - Student report card generation -- `/server/src/reports/studentReportCardReact.tsx` - React version of student report cards +- `/server/src/reports/studentReportCardReact.tsx` - Student report card generation - `/server/src/reports/teacherReportFile.ts` - Teacher report file generation - `/server/src/reports/michlolPopulatedFile.ts` - Michlol populated file generation diff --git a/server/src/entity-modules/__tests__/student-klass.config.spec.ts b/server/src/entity-modules/__tests__/student-klass.config.spec.ts index 6470b76b..e4ccf615 100644 --- a/server/src/entity-modules/__tests__/student-klass.config.spec.ts +++ b/server/src/entity-modules/__tests__/student-klass.config.spec.ts @@ -171,29 +171,6 @@ describe('StudentKlassConfig', () => { }); describe('getReportData', () => { - it('should handle studentReportCard report type', async () => { - const req = { - ...createMockCrudRequest({ - report: 'studentReportCard', - ids: '1,2,3', - }), - auth: { id: 1 }, - }; - - mockRepository.find.mockResolvedValueOnce([ - createMockStudentKlass({ studentReferenceId: 101 }), - createMockStudentKlass({ studentReferenceId: 102 }), - createMockStudentKlass({ studentReferenceId: 103 }), - ]); - - await service.getReportData(req); - - expect(mockRepository.find).toHaveBeenCalledWith({ - where: { id: In([1, 2, 3]) }, - select: { studentReferenceId: true }, - }); - }); - it('should handle studentReportCardReact report type', async () => { const req = { ...createMockCrudRequest({ diff --git a/server/src/entity-modules/__tests__/student.config.spec.ts b/server/src/entity-modules/__tests__/student.config.spec.ts index 5d16c4c9..b0f23bad 100644 --- a/server/src/entity-modules/__tests__/student.config.spec.ts +++ b/server/src/entity-modules/__tests__/student.config.spec.ts @@ -56,7 +56,6 @@ describe('StudentConfig', () => { // Properly type the service to include reportsDict let service: BaseEntityService & { reportsDict: { - studentReportCard: BulkToPdfReportGenerator; studentReportCardReact: BulkToPdfReportGenerator; }; }; @@ -121,14 +120,13 @@ describe('StudentConfig', () => { it('should initialize reports dictionary', () => { expect(service.reportsDict).toEqual({ - studentReportCard: expect.any(BulkToPdfReportGenerator), studentReportCardReact: expect.any(BulkToPdfReportGenerator), }); }); describe('getReportData', () => { const mockUserId = '123'; - const mockExtra = { report: 'studentReportCard', someOption: 'value' }; + const mockExtra = { report: 'studentReportCardReact', someOption: 'value' }; const mockReq = { auth: { someAuth: true }, parsed: { diff --git a/server/src/entity-modules/student-klass-report.config.ts b/server/src/entity-modules/student-klass-report.config.ts index bc235cb9..eadd4123 100644 --- a/server/src/entity-modules/student-klass-report.config.ts +++ b/server/src/entity-modules/student-klass-report.config.ts @@ -3,7 +3,6 @@ import { BaseEntityService } from '@shared/base-entity/base-entity.service'; import { BaseEntityModuleOptions, Entity } from '@shared/base-entity/interface'; import { StudentKlassReport } from 'src/db/view-entities/StudentKlassReport.entity'; import { CommonReportData } from '@shared/utils/report/types'; -import studentReportCard from '../reports/studentReportCard'; import { BulkToPdfReportGenerator } from '@shared/utils/report/bulk-to-pdf.generator'; import studentReportCardReact from 'src/reports/studentReportCardReact'; import { generateStudentReportCard } from 'src/reports/reportGenerator'; @@ -45,7 +44,6 @@ function getConfig(): BaseEntityModuleOptions { class StudentKlassReportService extends BaseEntityService { reportsDict = { - studentReportCard: new BulkToPdfReportGenerator(studentReportCard), studentReportCardReact: new BulkToPdfReportGenerator(studentReportCardReact), }; async getReportData(req: CrudRequest): Promise { diff --git a/server/src/entity-modules/student-klass.config.ts b/server/src/entity-modules/student-klass.config.ts index f6e24f74..bcc48482 100644 --- a/server/src/entity-modules/student-klass.config.ts +++ b/server/src/entity-modules/student-klass.config.ts @@ -8,7 +8,6 @@ import { BulkToPdfReportGenerator } from '@shared/utils/report/bulk-to-pdf.gener import { CommonReportData } from '@shared/utils/report/types'; import { StudentKlass } from 'src/db/entities/StudentKlass.entity'; import { generateStudentReportCard } from 'src/reports/reportGenerator'; -import studentReportCard from 'src/reports/studentReportCard'; import studentReportCardReact from 'src/reports/studentReportCardReact'; import { fixReferences } from '@shared/utils/entity/fixReference.util'; import { getAsNumberArray } from '@shared/utils/queryParam.util'; @@ -45,7 +44,6 @@ function getConfig(): BaseEntityModuleOptions { class StudentKlassService extends BaseEntityService { reportsDict = { - studentReportCard: new BulkToPdfReportGenerator(studentReportCard), studentReportCardReact: new BulkToPdfReportGenerator(studentReportCardReact), }; async getReportData(req: CrudRequest): Promise { diff --git a/server/src/entity-modules/student.config.ts b/server/src/entity-modules/student.config.ts index b1f22bc5..bc5dcb05 100644 --- a/server/src/entity-modules/student.config.ts +++ b/server/src/entity-modules/student.config.ts @@ -5,7 +5,6 @@ import { IHeader } from '@shared/utils/exporter/types'; import { getHebrewBooleanFormatter } from '@shared/utils/formatting/formatter.util'; import { Student } from 'src/db/entities/Student.entity'; import { CommonReportData } from '@shared/utils/report/types'; -import studentReportCard from '../reports/studentReportCard'; import { BulkToPdfReportGenerator } from '@shared/utils/report/bulk-to-pdf.generator'; import studentReportCardReact from 'src/reports/studentReportCardReact'; import { getUserIdFromUser } from '@shared/auth/auth.util'; @@ -34,7 +33,6 @@ function getConfig(): BaseEntityModuleOptions { class StudentService extends BaseEntityService { reportsDict = { - studentReportCard: new BulkToPdfReportGenerator(studentReportCard), studentReportCardReact: new BulkToPdfReportGenerator(studentReportCardReact), }; async getReportData(req: CrudRequest): Promise { diff --git a/server/src/reports/reportGenerator.ts b/server/src/reports/reportGenerator.ts index 3f0fa492..22cdc299 100644 --- a/server/src/reports/reportGenerator.ts +++ b/server/src/reports/reportGenerator.ts @@ -18,6 +18,7 @@ export function generateStudentReportCard(userId: any, reqExtra: any, generator: endDate: getAsString(reqExtra.endDate), globalLessonReferenceIds: getAsString(reqExtra.globalLessonReferenceIds), denyLessonReferenceIds: getAsString(reqExtra.denyLessonReferenceIds), + denyKlassReferenceIds: getAsString(reqExtra.denyKlassReferenceIds), klassTypeReferenceId: getAsString(reqExtra.klassTypeReferenceId), attendance: getAsBoolean(reqExtra.attendance), grades: getAsBoolean(reqExtra.grades), diff --git a/server/src/reports/studentReportCard.ts b/server/src/reports/studentReportCard.ts deleted file mode 100644 index fb634b5d..00000000 --- a/server/src/reports/studentReportCard.ts +++ /dev/null @@ -1,253 +0,0 @@ -import { EjsToPdfReportGenerator } from '@shared/utils/report/ejs-to-pdf.generator'; -import { getReportData, getReportName } from './studentReportCardReact'; - -const reportTemplate = ` - - - - - - <% /* %> - <%- include('../../common-modules/templates/custom-font', { font }); %> - <% */ %> - - - - - <% /* %> - <%- include('header', { img }); %> - <% */ %> - - <% var reportDataArr = [{reports, id: studentBaseKlass.id}] %> - <% if (reportParams.groupByKlass) { %> - <% var klasses = {} %> - <% reports.forEach(item => { - klasses[item.klass.name] = klasses[item.klass.name] || { name: item.klass.name, id: item.klass.id, order: item.isBaseKlass ? -1 : 1, reports: [] } - klasses[item.klass.name].reports.push(item) - }) %> - <% reportDataArr = Object.values(klasses).sort((a, b) => a.order - b.order) %> - <% } %> - -
-
- <% if (student && student.comment) { %> -

התמחות: - <%= student.comment %> -

- <% } %> -
-
- <% if (student) { %> -

שם התלמידה: - <%= student.name %> -

-

מספר תז: - <%= student.tz %> -

- <% } %> - <% if (studentBaseKlass && !reportParams.groupByKlass) { %> -

- <%= studentBaseKlass.klassName %> -

- <% } %> -
- - <% reportDataArr.forEach(reportData => { %> -
-
- <% if (reportParams.groupByKlass) { %> -

- <%= reportData.name %> -

- <% } %> -
- - <% var reports = reportData.reports %> - - <% if (reports.length > 0) { %> - - - - <% if (reportParams.grades) { %> - - <% } %> - - - <% reports.forEach((report, index) => { %> - <% if ( - (!reportParams.forceGrades || (report.grade != undefined && report.grade != null)) && - (!reportParams.forceAtt || (report.lessonsCount)) - ) { %> - - - - - <% var att_percents = Math.round((((report.lessonsCount ?? 1) - (report.absCount ?? 0)) / (report.lessonsCount ?? 1)) * 100) %> - - <% if (report.lessonsCount && report.lessonsCount * 2 == report.absCount) { %> - - - <% } else { %> - <% if (reportParams.grades) { %> - - <% } %> - - <% } %> - - <% } %> - <% }) %> - <% if (!reportParams.hideAbsTotal) { %> - - - - <% if (reportParams.grades) { %> - - <% } %> - - <% var reportsNoSpecial = reports.filter(item => item.lessonsCount * 2 != item.absCount) %> - <% var total_lesson_count = reportsNoSpecial.reduce((a, b) => a + b.lessonsCount, 0) %> - <% var total_abs_count = reportsNoSpecial.reduce((a, b) => a + b.absCount, 0) %> - <% var total_att_count = total_lesson_count - total_abs_count %> - - - - - - - <% if (reportParams.grades) { %> - - <% } %> - - - <% } %> - <% } %> -
מקצועשם המורהציוןאחוז נוכחות
<%= report.lesson && report.lesson.name %><%= report.teacher && report.teacher.name %><%= report.grade %>  - <% if (report.grade != undefined && report.grade != null) { %> - <% var grade_effect = att_grade_effect?.find(item => item.percents <= att_percents || item.count >= report.absCount)?.effect ?? 0 %> - <% var isOriginalGrade = report.grade > 100 || report.grade == 0 %> - <% var affected_grade = isOriginalGrade ? report.grade : Math.min(100, report.grade + grade_effect) %> - <% var matching_grade_name = grade_names?.find(item => item.key <= affected_grade)?.name %> - - <% if (matching_grade_name) { %> - <%= matching_grade_name %> - <% } else { %> - <%= affected_grade %>% - <% } %> - <% } else { %> -   - <% } %> - <%= att_percents %>%
אחוז נוכחות כללי   - <%= - Math.round(((total_att_count) / total_lesson_count) * 100) - %>% -
נוכחות בקיזוז חיסורים מאושרים   - <% var approved_abs_value = approved_abs_count?.[reportData.id] %> - <% if (!reportParams.groupByKlass) { %> - <% approved_abs_value = Object.values(approved_abs_count)[0] %> - <% } %> - <%= - Math.round( - ( - ( - total_att_count + (approved_abs_value || 0) - ) / total_lesson_count - ) * 100 - ) - %>% -
-
- <% }) %> - - <% if (reportParams.personalNote) { %> -

- <%= reportParams.personalNote %> -

- <% } %> -
- הופק באמצעות תוכנת יומנט -
- <% /* %> - <%- include('image', { img: footerImage }); %> - <% */ %> -
- - -`; - -const reportOptions: ejs.Options = { - compileDebug: true, -}; - -export default new EjsToPdfReportGenerator(getReportName, getReportData, reportTemplate, reportOptions); diff --git a/server/src/reports/studentReportCardReact.tsx b/server/src/reports/studentReportCardReact.tsx index 80e8a680..dd788a58 100644 --- a/server/src/reports/studentReportCardReact.tsx +++ b/server/src/reports/studentReportCardReact.tsx @@ -483,6 +483,7 @@ export interface IReportParams { endDate?: string; globalLessonReferenceIds?: string; denyLessonReferenceIds?: string; + denyKlassReferenceIds?: string; klassTypeReferenceId?: string; attendance: boolean; grades: boolean; @@ -507,7 +508,7 @@ export const getReportData: IGetReportDataFunction = as const [user, student, studentReports, studentBaseKlass, studentSpeciality, reportLogo, reportBottomLogo, knownAbsences] = await Promise.all([ dataSource.getRepository(User).findOneBy({ id: params.userId }), dataSource.getRepository(Student).findOneBy({ id: params.studentId }), - dataSource.getRepository(AttReportAndGrade).find({ where: getReportsFilterForReportCard(params.studentId, params.year, reportDate, params.globalLessonReferenceIds, params.denyLessonReferenceIds, klassIds), order: { reportDate: 'ASC' } }), + dataSource.getRepository(AttReportAndGrade).find({ where: getReportsFilterForReportCard(params.studentId, params.year, reportDate, params.globalLessonReferenceIds, params.denyLessonReferenceIds, klassIds, params.denyKlassReferenceIds), order: { reportDate: 'ASC' } }), dataSource.getRepository(StudentBaseKlass).findOneBy({ id: params.studentId, year: params.year }), dataSource.getRepository(StudentSpeciality).findOneBy({ id: params.studentId, year: params.year }), dataSource.getRepository(Image).findOneBy({ userId: params.userId, imageTarget: ImageTargetEnum.reportLogo }), diff --git a/server/src/utils/__tests__/studentReportData.util.spec.ts b/server/src/utils/__tests__/studentReportData.util.spec.ts index e54481d4..7a21a0b8 100644 --- a/server/src/utils/__tests__/studentReportData.util.spec.ts +++ b/server/src/utils/__tests__/studentReportData.util.spec.ts @@ -200,6 +200,26 @@ describe('studentReportData.util', () => { lessonReferenceId: undefined, }); }); + + it('should exclude deny klass ids when no klass type filter is given', () => { + const result = getReportsFilterForReportCard(123, 2024, null, undefined, undefined, undefined, '4,5'); + + expect(result[0]).toMatchObject({ + studentReferenceId: 123, + year: 2024, + klassReferenceId: Not(In(['4', '5'])), + }); + }); + + it('should exclude deny klass ids from the klass type filter', () => { + const result = getReportsFilterForReportCard(123, 2024, null, undefined, undefined, [4, 5, 6], '5'); + + expect(result[0]).toMatchObject({ + studentReferenceId: 123, + year: 2024, + klassReferenceId: In([4, 6]), + }); + }); }); describe('calcReportsData', () => { diff --git a/server/src/utils/studentReportData.util.ts b/server/src/utils/studentReportData.util.ts index 6fef3ae5..5381ae11 100644 --- a/server/src/utils/studentReportData.util.ts +++ b/server/src/utils/studentReportData.util.ts @@ -99,6 +99,7 @@ export function getReportsFilterForReportCard( globalLessonIdsStr: string, denyLessonIdStr: string, klassIds?: number[], + denyKlassIdStr?: string, ): FindOptionsWhere[] { const denyLessonIds = getAsArray(denyLessonIdStr); const lessonFilter: FindOperator = denyLessonIds?.length ? Not(In(denyLessonIds)) : undefined; @@ -109,8 +110,12 @@ export function getReportsFilterForReportCard( }; const globalLessonIds = getAsArray(globalLessonIdsStr); + const denyKlassIds = getAsArray(denyKlassIdStr); if (klassIds?.length) { - commonFilter.klassReferenceId = In(klassIds); + const filteredKlassIds = denyKlassIds?.length ? klassIds.filter((id) => !denyKlassIds.includes(String(id))) : klassIds; + commonFilter.klassReferenceId = In(filteredKlassIds); + } else if (denyKlassIds?.length) { + commonFilter.klassReferenceId = Not(In(denyKlassIds)); } if (reportDateFilter && globalLessonIds?.length) { From 3db776a349841cc5d29286fcbeb709a68803bc70 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 9 Aug 2026 20:37:49 +0000 Subject: [PATCH 2/2] Extract shared deny-ids filter logic in getReportsFilterForReportCard Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_012dgrqbwpeXRKvrQZER1QDo --- server/src/utils/studentReportData.util.ts | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/server/src/utils/studentReportData.util.ts b/server/src/utils/studentReportData.util.ts index 5381ae11..fcd6013a 100644 --- a/server/src/utils/studentReportData.util.ts +++ b/server/src/utils/studentReportData.util.ts @@ -92,6 +92,17 @@ export function getKnownAbsenceFilterBySprAndDates( })); } +// builds an inclusion/exclusion filter for a reference id column: excludes denyIdsStr, +// intersected with includeIds when given (used for klass ids, which also have a klassType inclusion list) +function getDenyIdsFilter(denyIdsStr: string, includeIds?: number[]): FindOperator { + const denyIds = getAsArray(denyIdsStr); + if (includeIds?.length) { + const filteredIds = denyIds?.length ? includeIds.filter((id) => !denyIds.includes(String(id))) : includeIds; + return In(filteredIds); + } + return denyIds?.length ? Not(In(denyIds)) : undefined; +} + export function getReportsFilterForReportCard( studentId: number, year: number, @@ -101,23 +112,14 @@ export function getReportsFilterForReportCard( klassIds?: number[], denyKlassIdStr?: string, ): FindOptionsWhere[] { - const denyLessonIds = getAsArray(denyLessonIdStr); - const lessonFilter: FindOperator = denyLessonIds?.length ? Not(In(denyLessonIds)) : undefined; const commonFilter: FindOptionsWhere = { studentReferenceId: studentId, year, - lessonReferenceId: lessonFilter, + lessonReferenceId: getDenyIdsFilter(denyLessonIdStr), + klassReferenceId: getDenyIdsFilter(denyKlassIdStr, klassIds), }; const globalLessonIds = getAsArray(globalLessonIdsStr); - const denyKlassIds = getAsArray(denyKlassIdStr); - if (klassIds?.length) { - const filteredKlassIds = denyKlassIds?.length ? klassIds.filter((id) => !denyKlassIds.includes(String(id))) : klassIds; - commonFilter.klassReferenceId = In(filteredKlassIds); - } else if (denyKlassIds?.length) { - commonFilter.klassReferenceId = Not(In(denyKlassIds)); - } - if (reportDateFilter && globalLessonIds?.length) { return [ { ...commonFilter, reportDate: reportDateFilter },