From 2eaf61ef6b424adbb15becdf61f12c95f266b40a Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 16 Oct 2026 11:53:23 +0000 Subject: [PATCH] Exclude inactive students from attendance entry rosters Students marked inactive (left school) still appeared when entering new attendance, so teachers kept reporting on them and the Yemot seminar flow even saved them as present. Filter student.isActive = true where a roster is built for new reports: in-lesson report screen, Yemot seminar roster, and teacher report file. View/pivot reports are unchanged and keep the student's history (they already offer an "active student" filter). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01HW4KhJ4NR3QPtnXXa9WwBk --- .../in-lesson-report/LessonSelector.jsx | 2 +- client/src/roadmapFeatures.js | 1 + .../__tests__/teacherReportFile.spec.ts | 5 ++++ server/src/reports/teacherReportFile.ts | 1 + server/src/yemot-handler.service.test.ts | 23 +++++++++++++++++++ server/src/yemot-handler.service.ts | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/client/src/reports/in-lesson-report/LessonSelector.jsx b/client/src/reports/in-lesson-report/LessonSelector.jsx index 67617b65..1c92df69 100644 --- a/client/src/reports/in-lesson-report/LessonSelector.jsx +++ b/client/src/reports/in-lesson-report/LessonSelector.jsx @@ -48,7 +48,7 @@ export const LessonSelector = ({ onLessonFound, selectedTeacher }) => { id: klassId, pagination: { page: 1, perPage: 1000 }, sort: { field: 'student.name', order: 'ASC' }, - filter: { year: defaultYearFilter.year }, + filter: { year: defaultYearFilter.year, 'student.isActive': true }, }); return students; }), diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index 841f15c6..a579b7e6 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -37,6 +37,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/src/reports/__tests__/teacherReportFile.spec.ts b/server/src/reports/__tests__/teacherReportFile.spec.ts index 341af7e6..98e320a5 100644 --- a/server/src/reports/__tests__/teacherReportFile.spec.ts +++ b/server/src/reports/__tests__/teacherReportFile.spec.ts @@ -132,6 +132,11 @@ describe('teacherReportFile', () => { expect(result).toHaveLength(1); expect(mockLessonRepo.findBy).toHaveBeenCalledWith({ id: 1, userId: 1 }); + expect(mockStudentKlassRepo.find).toHaveBeenCalledWith( + expect.objectContaining({ + where: expect.objectContaining({ student: expect.objectContaining({ isActive: true }) }), + }), + ); }); it('should handle lessons without klassReferenceIds', async () => { diff --git a/server/src/reports/teacherReportFile.ts b/server/src/reports/teacherReportFile.ts index b62d6453..0e169e62 100644 --- a/server/src/reports/teacherReportFile.ts +++ b/server/src/reports/teacherReportFile.ts @@ -77,6 +77,7 @@ const getReportData: IGetReportDataFunction = async ( studentReferenceId: Not(IsNull()), student: { id: Not(IsNull()), + isActive: true, }, }, relations: { diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index 02ec22c6..065aa7e0 100644 --- a/server/src/yemot-handler.service.test.ts +++ b/server/src/yemot-handler.service.test.ts @@ -540,6 +540,29 @@ describe('YemotHandlerService — react-admin-nestjs', () => { expect(result.saved['AttReport']).toHaveLength(3); }); + it('inactive student — excluded from the roster, gets no AttReport row', async () => { + jest.setSystemTime(israelTimeAt(7, 0)); + const year = getCurrentHebrewYear(); + const klass = { id: 284, userId: 1, key: 20, name: 'Klass Twenty', year }; + + const builder = teacherSetup('Seminar skips inactive student', { + extraSeeds: { + Klass: [klass], + Student: roster().map((s) => (s.id === 103 ? { ...s, isActive: false } : s)), + StudentKlass: studentKlasses(klass.id, year), + Lesson: [{ id: 800, userId: 1, key: 5, name: 'Lesson Five', year }], + }, + }).seed('AttReport', []); + startsSeminarCall(builder, '20', '1'); + entersLesson(builder, '5'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); + + const result = await runner.run(scenario); + expect(result.passed).toBe(true); + expect(result.saved['AttReport'].map((r: any) => r.studentReferenceId).sort()).toEqual([101, 102]); + }); + it('invalid teacher code — error message then retry with valid code', async () => { jest.setSystemTime(israelTimeAt(7, 0)); const year = getCurrentHebrewYear(); diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index eb25cc42..cc7372c1 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -259,6 +259,7 @@ export class YemotHandlerService extends BaseYemotHandlerService { userId: this.user.id, klassReferenceId, year: getCurrentHebrewYear(), + student: { isActive: true }, }, }); }