From 0c65b4317717c012dbf75620b4aec40fec6c1da0 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 15 Jul 2026 19:08:42 +0000 Subject: [PATCH 1/7] Add student name confirmation and manager phone report to teacher attendance IVR - Teacher attendance phone flow now reads back the student's name and asks for confirmation (1 = correct, 2 = wrong) before recording an absence. - Add a manager phone number setting (gated by seminarAttendanceYemot) so a manager can call in and hear which teachers reported attendance today and which did not. - Add a "today's teacher phone calls" report page for a live, readable view of phone-in attendance activity throughout the day. --- client/src/App.jsx | 11 ++ client/src/domainTranslations.js | 10 ++ .../src/entities/teacher-phone-call-today.jsx | 29 +++++ client/src/roadmapFeatures.js | 3 + .../settings/ManagerPhoneSettingsInput.jsx | 31 +++++ client/src/settings/Settings.jsx | 2 + .../TeacherPhoneCallToday.entity.ts | 50 +++++++ server/src/entities.module.ts | 2 + ...0-UpdateYemotTextsNameConfirmAndManager.ts | 31 +++++ server/src/yemot-handler.service.test.ts | 122 ++++++++++++++++++ server/src/yemot-handler.service.ts | 48 ++++++- 11 files changed, 336 insertions(+), 3 deletions(-) create mode 100644 client/src/entities/teacher-phone-call-today.jsx create mode 100644 client/src/settings/ManagerPhoneSettingsInput.jsx create mode 100644 server/src/db/view-entities/TeacherPhoneCallToday.entity.ts create mode 100644 server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index bc8e8db2..21750dbb 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -47,6 +47,7 @@ import attendanceName from 'src/entities/attendance-name'; import attGradeEffect from './entities/att-grade-effect'; import reportGroup from './entities/report-group'; import reportGroupSession from './entities/report-group-session'; +import teacherPhoneCallToday from './entities/teacher-phone-call-today'; import Settings from 'src/settings/Settings'; import StudentAttendanceList from 'src/pivots/StudentAttendanceList'; @@ -62,6 +63,7 @@ import { isAbsenceType, isLessonSchedule, isStudentView, + isSeminarAttendanceYemot, } from 'src/utils/appPermissions'; import ScannerUpload from '@shared/components/views/ScannerUpload'; import InLessonReport from 'src/reports/InLessonReport'; @@ -90,6 +92,7 @@ import LocalAtmIcon from '@mui/icons-material/LocalAtmOutlined'; import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettingsOutlined'; import DirectionsBusIcon from '@mui/icons-material/DirectionsBusOutlined'; import CelebrationIcon from '@mui/icons-material/CelebrationOutlined'; +import PhoneInTalkIcon from '@mui/icons-material/PhoneInTalkOutlined'; const themeOptions = { primary: blue[700], secondary: purple[500] }; @@ -218,6 +221,14 @@ const App = () => ( options={{ menuGroup: 'report' }} icon={RuleIcon} /> + {isSeminarAttendanceYemot(permissions) && ( + + )} { + if (record.hasError) return ; + if (record.isOpen) return ; + return ; +}; + +const Datagrid = ({ isAdmin, children, ...props }) => ( + + {children} + + + + +); + +const entity = { + Datagrid, + filters: [], + exporter: false, + configurable: false, + sort: { field: 'callTime', order: 'DESC' }, +}; + +export default getResourceComponents(entity); diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index b39cfce8..b58b229c 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -24,6 +24,9 @@ export default [ { html: 'העלאת קובץ אקסל של מערכת שעות וזיהוי אוטומטי של השיעור בדיווח נוכחות בטלפון', status: 'בוצע', statusColor: 'success' }, { html: 'אפשרות לבחור בין "וגם" ל"או" בין סינון נוכחות וציון בתעודה', status: 'בוצע', statusColor: 'success' }, { 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/client/src/settings/ManagerPhoneSettingsInput.jsx b/client/src/settings/ManagerPhoneSettingsInput.jsx new file mode 100644 index 00000000..92bb089e --- /dev/null +++ b/client/src/settings/ManagerPhoneSettingsInput.jsx @@ -0,0 +1,31 @@ +import { TextInput, maxLength, useGetIdentity } from 'react-admin'; +import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion'; +import { useIsSeminarAttendanceYemot } from 'src/utils/appPermissions'; + +export const ManagerPhoneSettingsInput = () => { + const { identity } = useGetIdentity(); + const isSeminarAttendanceYemot = useIsSeminarAttendanceYemot(); + + if (!isSeminarAttendanceYemot) { + return null; + } + + return ( + + + + ); +}; + +export default ManagerPhoneSettingsInput; diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx index 1c8c7f96..638f9a2a 100644 --- a/client/src/settings/Settings.jsx +++ b/client/src/settings/Settings.jsx @@ -21,6 +21,7 @@ import { GeneralSettingsInput } from './GeneralSettingsInput'; import { ReportCardSettingsInput } from './ReportCardSettingsInput'; import { YemotSettingsInput } from '@shared/components/phone/YemotSettingsInput'; import { PhoneSettingsInput } from '@shared/components/phone/PhoneSettingsInput'; +import { ManagerPhoneSettingsInput } from './ManagerPhoneSettingsInput'; const SettingsToolbar = () => ( @@ -76,6 +77,7 @@ export default function Settings() { > + diff --git a/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts b/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts new file mode 100644 index 00000000..f673b2b4 --- /dev/null +++ b/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts @@ -0,0 +1,50 @@ +import { Column, DataSource, ViewEntity } from 'typeorm'; +import { IHasUserId } from '@shared/base-entity/interface'; +import { YemotCall } from '@shared/entities/YemotCall.entity'; +import { Teacher } from '../entities/Teacher.entity'; + +@ViewEntity('teacher_phone_call_today', { + expression: (dataSource: DataSource) => + dataSource + .createQueryBuilder() + .select('yemot_call.id', 'id') + .addSelect('yemot_call.userId', 'userId') + .addSelect('teacher.id', 'teacherReferenceId') + .addSelect('teacher.name', 'teacherName') + .addSelect('yemot_call.phone', 'phone') + .addSelect('yemot_call.isOpen', 'isOpen') + .addSelect('yemot_call.hasError', 'hasError') + .addSelect('yemot_call.createdAt', 'callTime') + .from(YemotCall, 'yemot_call') + .innerJoin( + Teacher, + 'teacher', + '(teacher.phone = yemot_call.phone OR teacher.phone2 = yemot_call.phone) AND teacher.userId = yemot_call.userId', + ) + .where('DATE(yemot_call.createdAt) = CURDATE()'), +}) +export class TeacherPhoneCallToday implements IHasUserId { + @Column() + id: number; + + @Column() + userId: number; + + @Column() + teacherReferenceId: number; + + @Column() + teacherName: string; + + @Column() + phone: string; + + @Column() + isOpen: boolean; + + @Column() + hasError: boolean; + + @Column() + callTime: Date; +} diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index 41fa7d94..a76a4209 100644 --- a/server/src/entities.module.ts +++ b/server/src/entities.module.ts @@ -42,6 +42,7 @@ import phoneCampaignConfig from '@shared/entities/configs/phone-campaign.config' import { Student } from './db/entities/Student.entity'; import { Teacher } from './db/entities/Teacher.entity'; import userConfig from '@shared/entities/configs/user.config'; +import { TeacherPhoneCallToday } from './db/view-entities/TeacherPhoneCallToday.entity'; registerEntityNameMap({ att_report: 'נוכחות', @@ -97,6 +98,7 @@ registerEntityNameMap({ BaseEntityModule.register(uploadedFileConfig), BaseEntityModule.register(phoneTemplateConfig), BaseEntityModule.register(phoneCampaignConfig), + BaseEntityModule.register({ entity: TeacherPhoneCallToday }), ], }) export class EntitiesModule {} diff --git a/server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts b/server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts new file mode 100644 index 00000000..746cd398 --- /dev/null +++ b/server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateYemotTextsNameConfirmAndManager1784200000000 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + const texts = [ + { name: 'SEMINAR.CONFIRM_STUDENT_NAME', text: 'התלמידה {studentName}. {yes} {no}' }, + { name: 'SEMINAR.STUDENT_NAME_REJECTED', text: 'נסי שוב להקיש את מספר התלמידה' }, + { name: 'MANAGER.NO_SCHEDULE_TODAY', text: 'אין מורות עם מערכת שעות היום.' }, + { name: 'MANAGER.REPORT_STATUS_TODAY', text: 'מורות שדיווחו היום: {reportedList}.\nמורות שלא דיווחו: {notReportedList}.' }, + ]; + + for (const text of texts) { + await queryRunner.query( + 'INSERT INTO `texts` (`user_id`, `name`, `description`, `value`) VALUES (?, ?, ?, ?)', + [0, text.name, text.text, text.text], + ); + } + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + 'DELETE FROM `texts` WHERE `user_id` = 0 AND `name` IN (?, ?, ?, ?)', + [ + 'SEMINAR.CONFIRM_STUDENT_NAME', + 'SEMINAR.STUDENT_NAME_REJECTED', + 'MANAGER.NO_SCHEDULE_TODAY', + 'MANAGER.REPORT_STATUS_TODAY', + ], + ); + } +} diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index d3a16cc7..7f143a3d 100644 --- a/server/src/yemot-handler.service.test.ts +++ b/server/src/yemot-handler.service.test.ts @@ -244,6 +244,8 @@ describe('YemotHandlerService — react-admin-nestjs', () => { { userId: 0, name: 'SEMINAR.ABSENT_STUDENT_PROMPT', description: '', value: 'Enter absent student number, or 0 to finish' }, { userId: 0, name: 'SEMINAR.INVALID_STUDENT_NUM', description: '', value: 'Invalid student number, try again' }, { userId: 0, name: 'SEMINAR.NO_STUDENTS_IN_KLASS', description: '', value: 'No students found for this klass' }, + { userId: 0, name: 'SEMINAR.CONFIRM_STUDENT_NAME', description: '', value: 'Confirm student {studentName}' }, + { userId: 0, name: 'SEMINAR.STUDENT_NAME_REJECTED', description: '', value: 'Name rejected, try again' }, ]; const allTexts = [...baseTexts, ...seminarTexts]; @@ -279,6 +281,8 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .userResponds('7') .systemAsks(/enter absent student number/i) .userResponds('11') + .systemAsks(/confirm student/i) + .userResponds('1') .systemAsks(/enter absent student number/i) .userResponds('0') .systemHangsUp(/success/i) @@ -325,6 +329,8 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .userResponds('8') .systemAsks(/enter absent student number/i) .userResponds('11') + .systemAsks(/confirm student/i) + .userResponds('1') .systemAsks(/enter absent student number/i) .userResponds('0') .systemHangsUp(/success/i) @@ -401,6 +407,8 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .systemSends(/invalid student number/i) .systemAsks(/enter absent student number/i) .userResponds('11') + .systemAsks(/confirm student/i) + .userResponds('1') .systemAsks(/enter absent student number/i) .userResponds('0') .systemHangsUp(/success/i) @@ -410,6 +418,44 @@ describe('YemotHandlerService — react-admin-nestjs', () => { expect(result.passed).toBe(true); }); + it('name confirmation rejected — retries the student number prompt', async () => { + jest.setSystemTime(israelTimeAt(7, 0)); + const year = getCurrentHebrewYear(); + const klass = { id: 235, userId: 1, key: 15, name: 'Klass Fifteen', year }; + + const scenario = new YemotScenarioBuilder('Seminar name confirmation rejected') + .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) + .seed('Teacher', [teacher]) + .seed('Klass', [klass]) + .seed('Student', roster()) + .seed('StudentKlass', studentKlasses(235, year)) + .seed('Text', allTexts) + .seed('AttReport', []) + .systemAsks(/enter klass number/i) + .userResponds('15') + .systemAsks(/enter absent student number/i) + .userResponds('11') + .systemAsks(/confirm student/i) + .userResponds('2') + .systemSends(/name rejected/i) + .systemAsks(/enter absent student number/i) + .userResponds('12') + .systemAsks(/confirm student/i) + .userResponds('1') + .systemAsks(/enter absent student number/i) + .userResponds('0') + .systemHangsUp(/success/i) + .build(); + + const result = await runner.run(scenario); + expect(result.passed).toBe(true); + expect(result.hungup).toBe(true); + + const byStudent = Object.fromEntries(result.saved['AttReport'].map((r: any) => [r.studentReferenceId, r])); + expect(byStudent[101].absCount).toBe(0); + expect(byStudent[102].absCount).toBe(1); + }); + it('already reported today for this klass — hangup with SEMINAR.ALREADY_REPORTED', async () => { jest.setSystemTime(israelTimeAt(7, 0)); const year = getCurrentHebrewYear(); @@ -527,4 +573,80 @@ describe('YemotHandlerService — react-admin-nestjs', () => { expect(result.hungup).toBe(true); }); }); + + describe('manager report call', () => { + const managerTexts = [ + { userId: 0, name: 'MANAGER.NO_SCHEDULE_TODAY', description: '', value: 'No teachers scheduled today' }, + { + userId: 0, + name: 'MANAGER.REPORT_STATUS_TODAY', + description: '', + value: 'Reported: {reportedList}. Not reported: {notReportedList}.', + }, + ]; + const managerAllTexts = [...baseTexts, ...managerTexts]; + const managerUser = (managerPhone: string) => ({ + ...baseUser, + permissions: { seminarAttendanceYemot: true }, + additionalData: { managerPhone }, + }); + + it('reports which teachers reported today and which did not', async () => { + jest.setSystemTime(israelTimeAt(10, 0)); + const year = getCurrentHebrewYear(); + const today = new Date(); + today.setHours(0, 0, 0, 0); + + const scenario = new YemotScenarioBuilder('Manager report status') + .seed('User', [managerUser('0501234567')]) + .seed('Teacher', [ + { id: 1, userId: 1, tz: '900000001', name: 'Teacher A', phone: '0509999999' }, + { id: 2, userId: 1, tz: '900000002', name: 'Teacher B', phone: '0508888888' }, + ]) + .seed('LessonSchedule', [ + { + userId: 1, + year, + teacherReferenceId: 1, + klassReferenceId: 200, + lessonReferenceId: 700, + scheduleDate: today, + startTime: '08:00', + }, + { + userId: 1, + year, + teacherReferenceId: 2, + klassReferenceId: 201, + lessonReferenceId: 701, + scheduleDate: today, + startTime: '09:00', + }, + ]) + .seed('AttReport', [ + { id: 900, userId: 1, teacherReferenceId: 1, klassReferenceId: 200, reportDate: today, absCount: 0 }, + ]) + .seed('Text', managerAllTexts) + .systemHangsUp(/Teacher A.*Teacher B/s) + .build(); + + const result = await runner.run(scenario); + expect(result.passed).toBe(true); + expect(result.hungup).toBe(true); + }); + + it('no lesson schedules today — hangup with MANAGER.NO_SCHEDULE_TODAY', async () => { + jest.setSystemTime(israelTimeAt(10, 0)); + + const scenario = new YemotScenarioBuilder('Manager no schedule today') + .seed('User', [managerUser('0501234567')]) + .seed('Text', managerAllTexts) + .systemHangsUp(/no teachers scheduled/i) + .build(); + + const result = await runner.run(scenario); + expect(result.passed).toBe(true); + expect(result.hungup).toBe(true); + }); + }); }); diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index ff4eb19f..de35b980 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -12,7 +12,7 @@ import { AttReport } from './db/entities/AttReport.entity'; import { ReportGroup } from './db/entities/ReportGroup.entity'; import { ReportGroupSession } from './db/entities/ReportGroupSession.entity'; import { LessonSchedule } from './db/entities/LessonSchedule.entity'; -import { Between } from 'typeorm'; +import { Between, In } from 'typeorm'; const SCHEDULE_MATCH_TOLERANCE_MINUTES = 90; /** @@ -26,12 +26,49 @@ export class YemotHandlerService extends BaseYemotHandlerService { await this.getUserByDidPhone(); this.logger.log(`Processing call with ID: ${this.call.callId} from phone: ${this.call.phone}`); if (hasPermission(this.user, 'seminarAttendanceYemot')) { - await this.processSeminarAttendanceCall(); + if (this.isManagerCall()) { + await this.processManagerReportCall(); + } else { + await this.processSeminarAttendanceCall(); + } } else { await this.processTransportationCall(); } } + private isManagerCall(): boolean { + const managerPhone = this.user.additionalData?.managerPhone; + return Boolean(managerPhone) && managerPhone === this.call.phone; + } + + private async processManagerReportCall(): Promise { + const todayDateOnly = this.getIsraelDateString(new Date()); + + const schedules = await this.dataSource.getRepository(LessonSchedule).find({ + where: { userId: this.user.id, scheduleDate: todayDateOnly as unknown as Date }, + }); + if (schedules.length === 0) { + await this.hangupWithMessageByKey('MANAGER.NO_SCHEDULE_TODAY'); + return; + } + + const teacherIds = [...new Set(schedules.map((schedule) => schedule.teacherReferenceId))]; + const teachers = await this.dataSource.getRepository(Teacher).findBy({ userId: this.user.id, id: In(teacherIds) }); + + const reports = await this.dataSource.getRepository(AttReport).find({ + where: { userId: this.user.id, reportDate: todayDateOnly as unknown as Date, teacherReferenceId: In(teacherIds) }, + }); + const reportedTeacherIds = new Set(reports.map((report) => report.teacherReferenceId)); + + const reportedNames = teachers.filter((teacher) => reportedTeacherIds.has(teacher.id)).map((teacher) => teacher.name); + const notReportedNames = teachers.filter((teacher) => !reportedTeacherIds.has(teacher.id)).map((teacher) => teacher.name); + + await this.hangupWithMessageByKey('MANAGER.REPORT_STATUS_TODAY', { + reportedList: reportedNames.length ? reportedNames.join(', ') : 'אין', + notReportedList: notReportedNames.length ? notReportedNames.join(', ') : 'כולן', + }); + } + private async processTransportationCall(): Promise { if (await this.isPastReportingDeadline()) { await this.hangupWithMessageByKey('SYSTEM.CLOSED'); @@ -190,7 +227,12 @@ export class YemotHandlerService extends BaseYemotHandlerService { if (!student) { await this.sendMessageByKey('SEMINAR.INVALID_STUDENT_NUM'); } else { - absentStudentReferenceIds.add(student.id); + const nameConfirmed = await this.askConfirmation('SEMINAR.CONFIRM_STUDENT_NAME', { studentName: student.name }); + if (nameConfirmed) { + absentStudentReferenceIds.add(student.id); + } else { + await this.sendMessageByKey('SEMINAR.STUDENT_NAME_REJECTED'); + } } input = await this.askForInputByKey('SEMINAR.ABSENT_STUDENT_PROMPT'); } From ddc110c1d20cd93a9e3fb78e01c9a4840bdf7e66 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 15 Jul 2026 19:21:00 +0000 Subject: [PATCH 2/7] Query distinct reported teachers instead of full report rows; add real migrations - Manager report call now selects DISTINCT teacherReferenceId instead of fetching every AttReport row (one per student) just to check who reported. - Generated the TeacherPhoneCallToday view migration from a real MySQL diff (typeorm:generate) instead of hand-writing it, and re-created the text-seed migration with typeorm:create so both carry accurate timestamps. Verified apply -> generate (no diff) -> revert -> re-apply against a live database. --- ...1784143009404-AddTeacherPhoneCallTodayView.ts | 16 ++++++++++++++++ ...666-UpdateYemotTextsNameConfirmAndManager.ts} | 5 +++-- server/src/yemot-handler.service.ts | 13 +++++++++---- 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts rename server/src/migrations/{1784200000000-UpdateYemotTextsNameConfirmAndManager.ts => 1784143134666-UpdateYemotTextsNameConfirmAndManager.ts} (91%) diff --git a/server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts b/server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts new file mode 100644 index 00000000..eda868fa --- /dev/null +++ b/server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTeacherPhoneCallTodayView1784143009404 implements MigrationInterface { + name = 'AddTeacherPhoneCallTodayView1784143009404' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE VIEW \`teacher_phone_call_today\` AS SELECT \`yemot_call\`.\`id\` AS \`id\`, \`yemot_call\`.\`userId\` AS \`userId\`, \`yemot_call\`.\`phone\` AS \`phone\`, \`yemot_call\`.\`isOpen\` AS \`isOpen\`, \`yemot_call\`.\`hasError\` AS \`hasError\`, \`yemot_call\`.\`createdAt\` AS \`callTime\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\` FROM \`yemot_call\` \`yemot_call\` INNER JOIN \`teachers\` \`teacher\` ON (\`teacher\`.\`phone\` = \`yemot_call\`.\`phone\` OR \`teacher\`.\`phone2\` = \`yemot_call\`.\`phone\`) AND \`teacher\`.\`user_id\` = \`yemot_call\`.\`userId\` WHERE DATE(\`yemot_call\`.\`createdAt\`) = CURDATE()`); + await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_phone_call_today","SELECT `yemot_call`.`id` AS `id`, `yemot_call`.`userId` AS `userId`, `yemot_call`.`phone` AS `phone`, `yemot_call`.`isOpen` AS `isOpen`, `yemot_call`.`hasError` AS `hasError`, `yemot_call`.`createdAt` AS `callTime`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName` FROM `yemot_call` `yemot_call` INNER JOIN `teachers` `teacher` ON (`teacher`.`phone` = `yemot_call`.`phone` OR `teacher`.`phone2` = `yemot_call`.`phone`) AND `teacher`.`user_id` = `yemot_call`.`userId` WHERE DATE(`yemot_call`.`createdAt`) = CURDATE()"]); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_phone_call_today","mysql_database"]); + await queryRunner.query(`DROP VIEW \`teacher_phone_call_today\``); + } + +} diff --git a/server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts b/server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts similarity index 91% rename from server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts rename to server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts index 746cd398..b2a3e513 100644 --- a/server/src/migrations/1784200000000-UpdateYemotTextsNameConfirmAndManager.ts +++ b/server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts @@ -1,6 +1,7 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; +import { MigrationInterface, QueryRunner } from "typeorm" + +export class UpdateYemotTextsNameConfirmAndManager1784143134666 implements MigrationInterface { -export class UpdateYemotTextsNameConfirmAndManager1784200000000 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { const texts = [ { name: 'SEMINAR.CONFIRM_STUDENT_NAME', text: 'התלמידה {studentName}. {yes} {no}' }, diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index de35b980..4f5dfff5 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -55,10 +55,15 @@ export class YemotHandlerService extends BaseYemotHandlerService { const teacherIds = [...new Set(schedules.map((schedule) => schedule.teacherReferenceId))]; const teachers = await this.dataSource.getRepository(Teacher).findBy({ userId: this.user.id, id: In(teacherIds) }); - const reports = await this.dataSource.getRepository(AttReport).find({ - where: { userId: this.user.id, reportDate: todayDateOnly as unknown as Date, teacherReferenceId: In(teacherIds) }, - }); - const reportedTeacherIds = new Set(reports.map((report) => report.teacherReferenceId)); + const reportedRows = await this.dataSource + .getRepository(AttReport) + .createQueryBuilder('att_report') + .select('DISTINCT att_report.teacherReferenceId', 'teacherReferenceId') + .where('att_report.userId = :userId', { userId: this.user.id }) + .andWhere('att_report.reportDate = :reportDate', { reportDate: todayDateOnly }) + .andWhere('att_report.teacherReferenceId IN (:...teacherIds)', { teacherIds }) + .getRawMany<{ teacherReferenceId: number }>(); + const reportedTeacherIds = new Set(reportedRows.map((row) => row.teacherReferenceId)); const reportedNames = teachers.filter((teacher) => reportedTeacherIds.has(teacher.id)).map((teacher) => teacher.name); const notReportedNames = teachers.filter((teacher) => !reportedTeacherIds.has(teacher.id)).map((teacher) => teacher.name); From 736f77f5658e253ccffc8ddb9b544d3e4b749203 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 16 Jul 2026 01:23:01 +0000 Subject: [PATCH 3/7] Make teacher phone call report filterable by date instead of today-only - Drop the CURDATE() restriction baked into the view so it can serve any date range; regenerated the migration against a real MySQL diff. - Add From/To date filters (callTime:$gte/$lte) to the client list, defaulting to today so the default view is unchanged, but any other date or range can now be selected. --- .../src/entities/teacher-phone-call-today.jsx | 33 +++++++++++++++++-- .../TeacherPhoneCallToday.entity.ts | 3 +- ...143674917-AddTeacherPhoneCallTodayView.ts} | 8 ++--- 3 files changed, 36 insertions(+), 8 deletions(-) rename server/src/migrations/{1784143009404-AddTeacherPhoneCallTodayView.ts => 1784143674917-AddTeacherPhoneCallTodayView.ts} (87%) diff --git a/client/src/entities/teacher-phone-call-today.jsx b/client/src/entities/teacher-phone-call-today.jsx index 67c5e033..c4011aa4 100644 --- a/client/src/entities/teacher-phone-call-today.jsx +++ b/client/src/entities/teacher-phone-call-today.jsx @@ -1,4 +1,4 @@ -import { TextField, DateField, FunctionField } from 'react-admin'; +import { TextField, DateField, DateInput, FunctionField } from 'react-admin'; import Chip from '@mui/material/Chip'; import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; @@ -9,6 +9,34 @@ const CallStatusChip = (record) => { return ; }; +const toDateInputValue = (datetimeStr) => (datetimeStr ? datetimeStr.slice(0, 10) : datetimeStr); +const startOfDay = (dateStr) => (dateStr ? `${dateStr} 00:00:00` : dateStr); +const endOfDay = (dateStr) => (dateStr ? `${dateStr} 23:59:59` : dateStr); + +const todayDateOnly = new Date().toISOString().slice(0, 10); + +const filters = [ + , + , +]; + +const filterDefaultValues = { + 'callTime:$gte': startOfDay(todayDateOnly), + 'callTime:$lte': endOfDay(todayDateOnly), +}; + const Datagrid = ({ isAdmin, children, ...props }) => ( {children} @@ -20,7 +48,8 @@ const Datagrid = ({ isAdmin, children, ...props }) => ( const entity = { Datagrid, - filters: [], + filters, + filterDefaultValues, exporter: false, configurable: false, sort: { field: 'callTime', order: 'DESC' }, diff --git a/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts b/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts index f673b2b4..e0b8e17f 100644 --- a/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts +++ b/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts @@ -20,8 +20,7 @@ import { Teacher } from '../entities/Teacher.entity'; Teacher, 'teacher', '(teacher.phone = yemot_call.phone OR teacher.phone2 = yemot_call.phone) AND teacher.userId = yemot_call.userId', - ) - .where('DATE(yemot_call.createdAt) = CURDATE()'), + ), }) export class TeacherPhoneCallToday implements IHasUserId { @Column() diff --git a/server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts b/server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts similarity index 87% rename from server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts rename to server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts index eda868fa..ed1a7a72 100644 --- a/server/src/migrations/1784143009404-AddTeacherPhoneCallTodayView.ts +++ b/server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts @@ -1,11 +1,11 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -export class AddTeacherPhoneCallTodayView1784143009404 implements MigrationInterface { - name = 'AddTeacherPhoneCallTodayView1784143009404' +export class AddTeacherPhoneCallTodayView1784143674917 implements MigrationInterface { + name = 'AddTeacherPhoneCallTodayView1784143674917' public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE VIEW \`teacher_phone_call_today\` AS SELECT \`yemot_call\`.\`id\` AS \`id\`, \`yemot_call\`.\`userId\` AS \`userId\`, \`yemot_call\`.\`phone\` AS \`phone\`, \`yemot_call\`.\`isOpen\` AS \`isOpen\`, \`yemot_call\`.\`hasError\` AS \`hasError\`, \`yemot_call\`.\`createdAt\` AS \`callTime\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\` FROM \`yemot_call\` \`yemot_call\` INNER JOIN \`teachers\` \`teacher\` ON (\`teacher\`.\`phone\` = \`yemot_call\`.\`phone\` OR \`teacher\`.\`phone2\` = \`yemot_call\`.\`phone\`) AND \`teacher\`.\`user_id\` = \`yemot_call\`.\`userId\` WHERE DATE(\`yemot_call\`.\`createdAt\`) = CURDATE()`); - await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_phone_call_today","SELECT `yemot_call`.`id` AS `id`, `yemot_call`.`userId` AS `userId`, `yemot_call`.`phone` AS `phone`, `yemot_call`.`isOpen` AS `isOpen`, `yemot_call`.`hasError` AS `hasError`, `yemot_call`.`createdAt` AS `callTime`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName` FROM `yemot_call` `yemot_call` INNER JOIN `teachers` `teacher` ON (`teacher`.`phone` = `yemot_call`.`phone` OR `teacher`.`phone2` = `yemot_call`.`phone`) AND `teacher`.`user_id` = `yemot_call`.`userId` WHERE DATE(`yemot_call`.`createdAt`) = CURDATE()"]); + await queryRunner.query(`CREATE VIEW \`teacher_phone_call_today\` AS SELECT \`yemot_call\`.\`id\` AS \`id\`, \`yemot_call\`.\`userId\` AS \`userId\`, \`yemot_call\`.\`phone\` AS \`phone\`, \`yemot_call\`.\`isOpen\` AS \`isOpen\`, \`yemot_call\`.\`hasError\` AS \`hasError\`, \`yemot_call\`.\`createdAt\` AS \`callTime\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\` FROM \`yemot_call\` \`yemot_call\` INNER JOIN \`teachers\` \`teacher\` ON (\`teacher\`.\`phone\` = \`yemot_call\`.\`phone\` OR \`teacher\`.\`phone2\` = \`yemot_call\`.\`phone\`) AND \`teacher\`.\`user_id\` = \`yemot_call\`.\`userId\``); + await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_phone_call_today","SELECT `yemot_call`.`id` AS `id`, `yemot_call`.`userId` AS `userId`, `yemot_call`.`phone` AS `phone`, `yemot_call`.`isOpen` AS `isOpen`, `yemot_call`.`hasError` AS `hasError`, `yemot_call`.`createdAt` AS `callTime`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName` FROM `yemot_call` `yemot_call` INNER JOIN `teachers` `teacher` ON (`teacher`.`phone` = `yemot_call`.`phone` OR `teacher`.`phone2` = `yemot_call`.`phone`) AND `teacher`.`user_id` = `yemot_call`.`userId`"]); } public async down(queryRunner: QueryRunner): Promise { From 6cf3be0c15126a49dcf7ad30e1db98c108eb04e5 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 16 Jul 2026 06:25:48 +0000 Subject: [PATCH 4/7] Rebuild teacher report as attendance-based, not phone-call-based - Base the view on att_reports instead of yemot_call: it now shows which teachers reported attendance on a given date, regardless of channel (phone or otherwise), grouped by teacher + report date. - Add an admin-only user column and admin user filter, matching the convention used elsewhere (adminUserFilter + isAdmin-gated ReferenceField). - Rename resource/view/files from teacher_phone_call_today to teacher_reported_today to match the new scope; regenerated the migration against a real MySQL diff and verified apply/generate/revert/re-apply. --- client/src/App.jsx | 10 ++-- client/src/domainTranslations.js | 8 +-- .../src/entities/teacher-phone-call-today.jsx | 58 ------------------- .../src/entities/teacher-reported-today.jsx | 37 ++++++++++++ client/src/roadmapFeatures.js | 2 +- .../TeacherPhoneCallToday.entity.ts | 49 ---------------- .../TeacherReportedToday.entity.ts | 39 +++++++++++++ server/src/entities.module.ts | 4 +- ...4143674917-AddTeacherPhoneCallTodayView.ts | 16 ----- ...84182661568-AddTeacherReportedTodayView.ts | 16 +++++ 10 files changed, 104 insertions(+), 135 deletions(-) delete mode 100644 client/src/entities/teacher-phone-call-today.jsx create mode 100644 client/src/entities/teacher-reported-today.jsx delete mode 100644 server/src/db/view-entities/TeacherPhoneCallToday.entity.ts create mode 100644 server/src/db/view-entities/TeacherReportedToday.entity.ts delete mode 100644 server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts create mode 100644 server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index 21750dbb..91ae7974 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -47,7 +47,7 @@ import attendanceName from 'src/entities/attendance-name'; import attGradeEffect from './entities/att-grade-effect'; import reportGroup from './entities/report-group'; import reportGroupSession from './entities/report-group-session'; -import teacherPhoneCallToday from './entities/teacher-phone-call-today'; +import teacherReportedToday from './entities/teacher-reported-today'; import Settings from 'src/settings/Settings'; import StudentAttendanceList from 'src/pivots/StudentAttendanceList'; @@ -92,7 +92,7 @@ import LocalAtmIcon from '@mui/icons-material/LocalAtmOutlined'; import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettingsOutlined'; import DirectionsBusIcon from '@mui/icons-material/DirectionsBusOutlined'; import CelebrationIcon from '@mui/icons-material/CelebrationOutlined'; -import PhoneInTalkIcon from '@mui/icons-material/PhoneInTalkOutlined'; +import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedInOutlined'; const themeOptions = { primary: blue[700], secondary: purple[500] }; @@ -223,10 +223,10 @@ const App = () => ( /> {isSeminarAttendanceYemot(permissions) && ( )} { - if (record.hasError) return ; - if (record.isOpen) return ; - return ; -}; - -const toDateInputValue = (datetimeStr) => (datetimeStr ? datetimeStr.slice(0, 10) : datetimeStr); -const startOfDay = (dateStr) => (dateStr ? `${dateStr} 00:00:00` : dateStr); -const endOfDay = (dateStr) => (dateStr ? `${dateStr} 23:59:59` : dateStr); - -const todayDateOnly = new Date().toISOString().slice(0, 10); - -const filters = [ - , - , -]; - -const filterDefaultValues = { - 'callTime:$gte': startOfDay(todayDateOnly), - 'callTime:$lte': endOfDay(todayDateOnly), -}; - -const Datagrid = ({ isAdmin, children, ...props }) => ( - - {children} - - - - -); - -const entity = { - Datagrid, - filters, - filterDefaultValues, - exporter: false, - configurable: false, - sort: { field: 'callTime', order: 'DESC' }, -}; - -export default getResourceComponents(entity); diff --git a/client/src/entities/teacher-reported-today.jsx b/client/src/entities/teacher-reported-today.jsx new file mode 100644 index 00000000..eb54a6bc --- /dev/null +++ b/client/src/entities/teacher-reported-today.jsx @@ -0,0 +1,37 @@ +import { TextField, DateField, DateInput, ReferenceField } from 'react-admin'; +import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; +import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; +import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; + +const todayDateOnly = new Date().toISOString().slice(0, 10); + +const filters = [ + adminUserFilter, + , + , +]; + +const filterDefaultValues = { + 'reportDate:$gte': todayDateOnly, + 'reportDate:$lte': todayDateOnly, +}; + +const Datagrid = ({ isAdmin, children, ...props }) => ( + + {children} + {isAdmin && } + + + +); + +const entity = { + Datagrid, + filters, + filterDefaultValues, + exporter: false, + configurable: false, + sort: { field: 'reportDate', order: 'DESC' }, +}; + +export default getResourceComponents(entity); diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index b58b229c..5ac1b34c 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -26,7 +26,7 @@ export default [ { html: 'הוספת דף בית פומבי המסביר את המערכת', status: 'בוצע', statusColor: 'success' }, { 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/db/view-entities/TeacherPhoneCallToday.entity.ts b/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts deleted file mode 100644 index e0b8e17f..00000000 --- a/server/src/db/view-entities/TeacherPhoneCallToday.entity.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Column, DataSource, ViewEntity } from 'typeorm'; -import { IHasUserId } from '@shared/base-entity/interface'; -import { YemotCall } from '@shared/entities/YemotCall.entity'; -import { Teacher } from '../entities/Teacher.entity'; - -@ViewEntity('teacher_phone_call_today', { - expression: (dataSource: DataSource) => - dataSource - .createQueryBuilder() - .select('yemot_call.id', 'id') - .addSelect('yemot_call.userId', 'userId') - .addSelect('teacher.id', 'teacherReferenceId') - .addSelect('teacher.name', 'teacherName') - .addSelect('yemot_call.phone', 'phone') - .addSelect('yemot_call.isOpen', 'isOpen') - .addSelect('yemot_call.hasError', 'hasError') - .addSelect('yemot_call.createdAt', 'callTime') - .from(YemotCall, 'yemot_call') - .innerJoin( - Teacher, - 'teacher', - '(teacher.phone = yemot_call.phone OR teacher.phone2 = yemot_call.phone) AND teacher.userId = yemot_call.userId', - ), -}) -export class TeacherPhoneCallToday implements IHasUserId { - @Column() - id: number; - - @Column() - userId: number; - - @Column() - teacherReferenceId: number; - - @Column() - teacherName: string; - - @Column() - phone: string; - - @Column() - isOpen: boolean; - - @Column() - hasError: boolean; - - @Column() - callTime: Date; -} diff --git a/server/src/db/view-entities/TeacherReportedToday.entity.ts b/server/src/db/view-entities/TeacherReportedToday.entity.ts new file mode 100644 index 00000000..d45500d4 --- /dev/null +++ b/server/src/db/view-entities/TeacherReportedToday.entity.ts @@ -0,0 +1,39 @@ +import { Column, DataSource, ViewEntity } from 'typeorm'; +import { IHasUserId } from '@shared/base-entity/interface'; +import { AttReport } from '../entities/AttReport.entity'; +import { Teacher } from '../entities/Teacher.entity'; + +@ViewEntity('teacher_reported_today', { + expression: (dataSource: DataSource) => + dataSource + .createQueryBuilder() + .select( + "CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate)", + 'id', + ) + .addSelect('att_report.userId', 'userId') + .addSelect('teacher.id', 'teacherReferenceId') + .addSelect('teacher.name', 'teacherName') + .addSelect('att_report.reportDate', 'reportDate') + .from(AttReport, 'att_report') + .innerJoin(Teacher, 'teacher', 'teacher.id = att_report.teacherReferenceId AND teacher.userId = att_report.userId') + .groupBy('att_report.userId') + .addGroupBy('teacher.id') + .addGroupBy('att_report.reportDate'), +}) +export class TeacherReportedToday implements IHasUserId { + @Column() + id: string; + + @Column() + userId: number; + + @Column() + teacherReferenceId: number; + + @Column() + teacherName: string; + + @Column('date') + reportDate: Date; +} diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index a76a4209..0db8837c 100644 --- a/server/src/entities.module.ts +++ b/server/src/entities.module.ts @@ -42,7 +42,7 @@ import phoneCampaignConfig from '@shared/entities/configs/phone-campaign.config' import { Student } from './db/entities/Student.entity'; import { Teacher } from './db/entities/Teacher.entity'; import userConfig from '@shared/entities/configs/user.config'; -import { TeacherPhoneCallToday } from './db/view-entities/TeacherPhoneCallToday.entity'; +import { TeacherReportedToday } from './db/view-entities/TeacherReportedToday.entity'; registerEntityNameMap({ att_report: 'נוכחות', @@ -98,7 +98,7 @@ registerEntityNameMap({ BaseEntityModule.register(uploadedFileConfig), BaseEntityModule.register(phoneTemplateConfig), BaseEntityModule.register(phoneCampaignConfig), - BaseEntityModule.register({ entity: TeacherPhoneCallToday }), + BaseEntityModule.register({ entity: TeacherReportedToday }), ], }) export class EntitiesModule {} diff --git a/server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts b/server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts deleted file mode 100644 index ed1a7a72..00000000 --- a/server/src/migrations/1784143674917-AddTeacherPhoneCallTodayView.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddTeacherPhoneCallTodayView1784143674917 implements MigrationInterface { - name = 'AddTeacherPhoneCallTodayView1784143674917' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE VIEW \`teacher_phone_call_today\` AS SELECT \`yemot_call\`.\`id\` AS \`id\`, \`yemot_call\`.\`userId\` AS \`userId\`, \`yemot_call\`.\`phone\` AS \`phone\`, \`yemot_call\`.\`isOpen\` AS \`isOpen\`, \`yemot_call\`.\`hasError\` AS \`hasError\`, \`yemot_call\`.\`createdAt\` AS \`callTime\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\` FROM \`yemot_call\` \`yemot_call\` INNER JOIN \`teachers\` \`teacher\` ON (\`teacher\`.\`phone\` = \`yemot_call\`.\`phone\` OR \`teacher\`.\`phone2\` = \`yemot_call\`.\`phone\`) AND \`teacher\`.\`user_id\` = \`yemot_call\`.\`userId\``); - await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_phone_call_today","SELECT `yemot_call`.`id` AS `id`, `yemot_call`.`userId` AS `userId`, `yemot_call`.`phone` AS `phone`, `yemot_call`.`isOpen` AS `isOpen`, `yemot_call`.`hasError` AS `hasError`, `yemot_call`.`createdAt` AS `callTime`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName` FROM `yemot_call` `yemot_call` INNER JOIN `teachers` `teacher` ON (`teacher`.`phone` = `yemot_call`.`phone` OR `teacher`.`phone2` = `yemot_call`.`phone`) AND `teacher`.`user_id` = `yemot_call`.`userId`"]); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_phone_call_today","mysql_database"]); - await queryRunner.query(`DROP VIEW \`teacher_phone_call_today\``); - } - -} diff --git a/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts b/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts new file mode 100644 index 00000000..6fc074f0 --- /dev/null +++ b/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTeacherReportedTodayView1784182661568 implements MigrationInterface { + name = 'AddTeacherReportedTodayView1784182661568' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`att_report\`.\`teacherReferenceId\`, '_', \`att_report\`.\`report_date\`) AS \`id\` FROM \`att_reports\` \`att_report\` INNER JOIN \`teachers\` \`teacher\` ON \`teacher\`.\`id\` = \`att_report\`.\`teacherReferenceId\` AND \`teacher\`.\`user_id\` = \`att_report\`.\`user_id\` GROUP BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\``); + await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`report_date` AS `reportDate`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName`, CONCAT(`att_report`.`user_id`, '_', `att_report`.`teacherReferenceId`, '_', `att_report`.`report_date`) AS `id` FROM `att_reports` `att_report` INNER JOIN `teachers` `teacher` ON `teacher`.`id` = `att_report`.`teacherReferenceId` AND `teacher`.`user_id` = `att_report`.`user_id` GROUP BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`"]); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]); + await queryRunner.query(`DROP VIEW \`teacher_reported_today\``); + } + +} From 122a8fe46b576d60ac895b6112b5e9a87c3f163b Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 16 Jul 2026 06:55:54 +0000 Subject: [PATCH 5/7] Show per-lesson report rows grouped into per-teacher cards - View now has one row per teacher+lesson+date (left join to lessons), plus each teacher's earliest report time that day via a window function, instead of one pre-aggregated row per teacher+date. - Replace the Datagrid with a custom card list: one card per teacher, grouping its lesson rows client-side into chips, with the admin-only user reference, date, and hour shown in the card header. - Regenerated the migration against a real MySQL diff and verified the apply/generate/revert/re-apply loop, including a multi-lesson-per-teacher case against real att_reports data. --- client/src/domainTranslations.js | 3 + .../src/entities/teacher-reported-today.jsx | 67 ++++++++++++++++--- .../TeacherReportedToday.entity.ts | 28 ++++++-- ...84182661568-AddTeacherReportedTodayView.ts | 16 ----- ...84184430691-AddTeacherReportedTodayView.ts | 16 +++++ 5 files changed, 99 insertions(+), 31 deletions(-) delete mode 100644 server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts create mode 100644 server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index 53d505ab..e62c9225 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -307,6 +307,9 @@ export default { teacherReferenceId: 'מורה', teacherName: 'מורה', reportDate: 'תאריך דיווח', + lessonReferenceId: 'שיעור', + lessonName: 'שיעור', + reportHour: 'שעת דיווח', }, }, teacher_grade_report_status: { diff --git a/client/src/entities/teacher-reported-today.jsx b/client/src/entities/teacher-reported-today.jsx index eb54a6bc..5fa8c60d 100644 --- a/client/src/entities/teacher-reported-today.jsx +++ b/client/src/entities/teacher-reported-today.jsx @@ -1,5 +1,5 @@ -import { TextField, DateField, DateInput, ReferenceField } from 'react-admin'; -import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; +import { DateInput, ReferenceField, RecordContextProvider, useListContext } from 'react-admin'; +import { Box, Card, CardContent, Chip, Stack, Typography } from '@mui/material'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; @@ -16,14 +16,61 @@ const filterDefaultValues = { 'reportDate:$lte': todayDateOnly, }; -const Datagrid = ({ isAdmin, children, ...props }) => ( - - {children} - {isAdmin && } - - - -); +const formatDate = (value) => (value ? new Date(value).toLocaleDateString('he-IL') : ''); +const formatHour = (value) => (value ? new Date(value).toLocaleTimeString('he-IL', { hour: '2-digit', minute: '2-digit' }) : ''); + +// The view has one row per teacher+lesson+date; group rows sharing the same +// teacher+date into a single card, collecting their lesson names. +function groupByTeacherAndDate(rows) { + const groups = new Map(); + rows.forEach((row) => { + const key = `${row.userId}_${row.teacherReferenceId}_${row.reportDate}`; + if (!groups.has(key)) { + groups.set(key, { ...row, lessonNames: [] }); + } + if (row.lessonName) { + groups.get(key).lessonNames.push(row.lessonName); + } + }); + return [...groups.values()]; +} + +const TeacherReportCards = ({ isAdmin }) => { + const { data } = useListContext(); + const groups = groupByTeacherAndDate(data || []); + + return ( + + {groups.map((group) => ( + + + + + {group.teacherName} + + {isAdmin && } + {formatDate(group.reportDate)} + {formatHour(group.reportHour)} + + + + {group.lessonNames.length > 0 ? ( + group.lessonNames.map((name) => ( + + )) + ) : ( + ללא שיוך שיעור + )} + + + + + ))} + + ); +}; + +const Datagrid = ({ isAdmin }) => ; const entity = { Datagrid, diff --git a/server/src/db/view-entities/TeacherReportedToday.entity.ts b/server/src/db/view-entities/TeacherReportedToday.entity.ts index d45500d4..79680884 100644 --- a/server/src/db/view-entities/TeacherReportedToday.entity.ts +++ b/server/src/db/view-entities/TeacherReportedToday.entity.ts @@ -2,24 +2,33 @@ import { Column, DataSource, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; import { AttReport } from '../entities/AttReport.entity'; import { Teacher } from '../entities/Teacher.entity'; +import { Lesson } from '../entities/Lesson.entity'; @ViewEntity('teacher_reported_today', { expression: (dataSource: DataSource) => dataSource .createQueryBuilder() .select( - "CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate)", + "CONCAT(att_report.userId, '_', teacher.id, '_', att_report.reportDate, '_', COALESCE(lesson.id, 'null'))", 'id', ) .addSelect('att_report.userId', 'userId') + .addSelect('att_report.reportDate', 'reportDate') .addSelect('teacher.id', 'teacherReferenceId') .addSelect('teacher.name', 'teacherName') - .addSelect('att_report.reportDate', 'reportDate') + .addSelect('lesson.id', 'lessonReferenceId') + .addSelect('lesson.name', 'lessonName') + .addSelect( + 'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, teacher.id, att_report.reportDate)', + 'reportHour', + ) .from(AttReport, 'att_report') .innerJoin(Teacher, 'teacher', 'teacher.id = att_report.teacherReferenceId AND teacher.userId = att_report.userId') + .leftJoin(Lesson, 'lesson', 'lesson.id = att_report.lessonReferenceId AND lesson.userId = att_report.userId') .groupBy('att_report.userId') .addGroupBy('teacher.id') - .addGroupBy('att_report.reportDate'), + .addGroupBy('att_report.reportDate') + .addGroupBy('lesson.id'), }) export class TeacherReportedToday implements IHasUserId { @Column() @@ -28,12 +37,21 @@ export class TeacherReportedToday implements IHasUserId { @Column() userId: number; + @Column('date') + reportDate: Date; + @Column() teacherReferenceId: number; @Column() teacherName: string; - @Column('date') - reportDate: Date; + @Column({ nullable: true }) + lessonReferenceId: number; + + @Column({ nullable: true }) + lessonName: string; + + @Column() + reportHour: Date; } diff --git a/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts b/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts deleted file mode 100644 index 6fc074f0..00000000 --- a/server/src/migrations/1784182661568-AddTeacherReportedTodayView.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddTeacherReportedTodayView1784182661568 implements MigrationInterface { - name = 'AddTeacherReportedTodayView1784182661568' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`att_report\`.\`teacherReferenceId\`, '_', \`att_report\`.\`report_date\`) AS \`id\` FROM \`att_reports\` \`att_report\` INNER JOIN \`teachers\` \`teacher\` ON \`teacher\`.\`id\` = \`att_report\`.\`teacherReferenceId\` AND \`teacher\`.\`user_id\` = \`att_report\`.\`user_id\` GROUP BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\``); - await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`report_date` AS `reportDate`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName`, CONCAT(`att_report`.`user_id`, '_', `att_report`.`teacherReferenceId`, '_', `att_report`.`report_date`) AS `id` FROM `att_reports` `att_report` INNER JOIN `teachers` `teacher` ON `teacher`.`id` = `att_report`.`teacherReferenceId` AND `teacher`.`user_id` = `att_report`.`user_id` GROUP BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`"]); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]); - await queryRunner.query(`DROP VIEW \`teacher_reported_today\``); - } - -} diff --git a/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts b/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts new file mode 100644 index 00000000..688cfb49 --- /dev/null +++ b/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTeacherReportedTodayView1784184430691 implements MigrationInterface { + name = 'AddTeacherReportedTodayView1784184430691' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\`, \`lesson\`.\`id\` AS \`lessonReferenceId\`, \`lesson\`.\`name\` AS \`lessonName\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`teacher\`.\`id\`, '_', \`att_report\`.\`report_date\`, '_', COALESCE(\`lesson\`.\`id\`, 'null')) AS \`id\`, MIN(MIN(\`att_report\`.\`created_at\`)) OVER (PARTITION BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\`) AS \`reportHour\` FROM \`att_reports\` \`att_report\` INNER JOIN \`teachers\` \`teacher\` ON \`teacher\`.\`id\` = \`att_report\`.\`teacherReferenceId\` AND \`teacher\`.\`user_id\` = \`att_report\`.\`user_id\` LEFT JOIN \`lessons\` \`lesson\` ON \`lesson\`.\`id\` = \`att_report\`.\`lessonReferenceId\` AND \`lesson\`.\`user_id\` = \`att_report\`.\`user_id\` GROUP BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\`, \`lesson\`.\`id\``); + await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`report_date` AS `reportDate`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName`, `lesson`.`id` AS `lessonReferenceId`, `lesson`.`name` AS `lessonName`, CONCAT(`att_report`.`user_id`, '_', `teacher`.`id`, '_', `att_report`.`report_date`, '_', COALESCE(`lesson`.`id`, 'null')) AS `id`, MIN(MIN(`att_report`.`created_at`)) OVER (PARTITION BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`) AS `reportHour` FROM `att_reports` `att_report` INNER JOIN `teachers` `teacher` ON `teacher`.`id` = `att_report`.`teacherReferenceId` AND `teacher`.`user_id` = `att_report`.`user_id` LEFT JOIN `lessons` `lesson` ON `lesson`.`id` = `att_report`.`lessonReferenceId` AND `lesson`.`user_id` = `att_report`.`user_id` GROUP BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`, `lesson`.`id`"]); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]); + await queryRunner.query(`DROP VIEW \`teacher_reported_today\``); + } + +} From 934208713592670d386e3d69fcdb0764348be1cb Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 16 Jul 2026 08:04:47 +0000 Subject: [PATCH 6/7] Responsive card grid + deduplicate repeated IVR test step sequences - Teacher-reported-today cards now lay out in a responsive CSS grid (auto-fill, 320px min) instead of a single column, so multiple cards share a row on wider screens. - Extract repeated systemAsks/userResponds sequences in yemot-handler.service.test.ts (TZ prompt, transport prompt, departure confirmation, klass prompt, absent-student add/reject/finish) into small named helper functions, reused across the transport and seminar test groups instead of repeating the same steps in every test. --- .../src/entities/teacher-reported-today.jsx | 6 +- server/src/yemot-handler.service.test.ts | 314 +++++++++--------- 2 files changed, 152 insertions(+), 168 deletions(-) diff --git a/client/src/entities/teacher-reported-today.jsx b/client/src/entities/teacher-reported-today.jsx index 5fa8c60d..5e4f728c 100644 --- a/client/src/entities/teacher-reported-today.jsx +++ b/client/src/entities/teacher-reported-today.jsx @@ -1,5 +1,5 @@ import { DateInput, ReferenceField, RecordContextProvider, useListContext } from 'react-admin'; -import { Box, Card, CardContent, Chip, Stack, Typography } from '@mui/material'; +import { Box, Card, CardContent, Chip, Typography } from '@mui/material'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; @@ -40,7 +40,7 @@ const TeacherReportCards = ({ isAdmin }) => { const groups = groupByTeacherAndDate(data || []); return ( - + {groups.map((group) => ( @@ -66,7 +66,7 @@ const TeacherReportCards = ({ isAdmin }) => { ))} - + ); }; diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index 7f143a3d..91f6b9ac 100644 --- a/server/src/yemot-handler.service.test.ts +++ b/server/src/yemot-handler.service.test.ts @@ -12,6 +12,64 @@ function israelTimeAt(hour: number, minute: number): Date { return new Date(utcMs); } +// ---- Reusable scenario-step helpers (each mutates and returns the same builder) ---- + +function respondToTz(builder: YemotScenarioBuilder, tz: string): YemotScenarioBuilder { + return builder.systemAsks(/enter.*id/i).userResponds(tz); +} + +function rejectTz(builder: YemotScenarioBuilder, tz: string): YemotScenarioBuilder { + return builder.systemAsks(/enter.*id/i).userResponds(tz).systemSends(/not found|invalid/i); +} + +function respondToTransport(builder: YemotScenarioBuilder, num: string): YemotScenarioBuilder { + return builder.systemAsks(/transport/i).userResponds(num); +} + +function rejectTransport(builder: YemotScenarioBuilder, num: string): YemotScenarioBuilder { + return builder.systemAsks(/transport/i).userResponds(num).systemSends(/invalid|try again/i); +} + +function confirmDeparture(builder: YemotScenarioBuilder, confirm: boolean): YemotScenarioBuilder { + return builder.systemAsks(/departure.*07:30/i).userResponds(confirm ? '1' : '2'); +} + +function askForKlass(builder: YemotScenarioBuilder, klassKey: string): YemotScenarioBuilder { + return builder.systemAsks(/enter klass number/i).userResponds(klassKey); +} + +function rejectKlass(builder: YemotScenarioBuilder, klassKey: string): YemotScenarioBuilder { + return builder.systemAsks(/enter klass number/i).userResponds(klassKey).systemSends(/invalid klass/i); +} + +function reportAbsentStudent(builder: YemotScenarioBuilder, studentNumber: string): YemotScenarioBuilder { + return builder + .systemAsks(/enter absent student number/i) + .userResponds(studentNumber) + .systemAsks(/confirm student/i) + .userResponds('1'); +} + +function rejectAbsentStudentName(builder: YemotScenarioBuilder, studentNumber: string): YemotScenarioBuilder { + return builder + .systemAsks(/enter absent student number/i) + .userResponds(studentNumber) + .systemAsks(/confirm student/i) + .userResponds('2') + .systemSends(/name rejected/i); +} + +function rejectStudentNumber(builder: YemotScenarioBuilder, studentNumber: string): YemotScenarioBuilder { + return builder + .systemAsks(/enter absent student number/i) + .userResponds(studentNumber) + .systemSends(/invalid student number/i); +} + +function finishAbsentStudentEntry(builder: YemotScenarioBuilder): YemotScenarioBuilder { + return builder.systemAsks(/enter absent student number/i).userResponds('0'); +} + describe('YemotHandlerService — react-admin-nestjs', () => { const runner = new YemotScenarioRunner(YemotHandlerService as any); @@ -52,20 +110,16 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('happy path — valid TZ, valid transport, confirmed departure', async () => { jest.setSystemTime(israelTimeAt(7, 0)); - const scenario = new YemotScenarioBuilder('Transport happy path') + const builder = new YemotScenarioBuilder('Transport happy path') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) .seed('StudentKlass', [{ id: 50, userId: 1, studentReferenceId: 100, klassReferenceId: 200 }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('1') - .systemHangsUp(/success/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + respondToTransport(builder, '5'); + confirmDeparture(builder, true); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -75,23 +129,17 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('invalid TZ — error message then retry with valid TZ', async () => { jest.setSystemTime(israelTimeAt(7, 0)); - const scenario = new YemotScenarioBuilder('Invalid TZ retry') + const builder = new YemotScenarioBuilder('Invalid TZ retry') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) .seed('StudentKlass', [{ id: 50, userId: 1, studentReferenceId: 100, klassReferenceId: 200 }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('999') - .systemSends(/not found|invalid/i) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('1') - .systemHangsUp(/success/i) - .build(); + .seed('Text', baseTexts); + rejectTz(builder, '999'); + respondToTz(builder, '123456789'); + respondToTransport(builder, '5'); + confirmDeparture(builder, true); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -102,7 +150,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const today = new Date(); today.setHours(0, 0, 0, 0); - const scenario = new YemotScenarioBuilder('Already reported') + const builder = new YemotScenarioBuilder('Already reported') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('KnownAbsence', [ @@ -117,11 +165,9 @@ describe('YemotHandlerService — react-admin-nestjs', () => { klassReferenceId: 200, }, ]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemHangsUp(/already reported/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + const scenario = builder.systemHangsUp(/already reported/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -131,23 +177,17 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('invalid transport — error message then retry with valid transport', async () => { jest.setSystemTime(israelTimeAt(7, 0)); - const scenario = new YemotScenarioBuilder('Invalid transport retry') + const builder = new YemotScenarioBuilder('Invalid transport retry') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) .seed('StudentKlass', [{ id: 50, userId: 1, studentReferenceId: 100, klassReferenceId: 200 }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('99') - .systemSends(/invalid|try again/i) - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('1') - .systemHangsUp(/success/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + rejectTransport(builder, '99'); + respondToTransport(builder, '5'); + confirmDeparture(builder, true); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -156,19 +196,15 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('late departure — user says no to confirmation, hangup with LATE_DEPARTURE', async () => { jest.setSystemTime(israelTimeAt(7, 0)); - const scenario = new YemotScenarioBuilder('Late departure') + const builder = new YemotScenarioBuilder('Late departure') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('2') - .systemHangsUp(/departure time passed/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + respondToTransport(builder, '5'); + confirmDeparture(builder, false); + const scenario = builder.systemHangsUp(/departure time passed/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -180,19 +216,15 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('no class found — hangup with STUDENT.NO_CLASS', async () => { jest.setSystemTime(israelTimeAt(7, 0)); - const scenario = new YemotScenarioBuilder('No class found') + const builder = new YemotScenarioBuilder('No class found') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('1') - .systemHangsUp(/no class/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + respondToTransport(builder, '5'); + confirmDeparture(builder, true); + const scenario = builder.systemHangsUp(/no class/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -216,20 +248,16 @@ describe('YemotHandlerService — react-admin-nestjs', () => { it('before deadline — at 8:49, continues to student input', async () => { jest.setSystemTime(israelTimeAt(8, 49)); - const scenario = new YemotScenarioBuilder('Before deadline at 8:49') + const builder = new YemotScenarioBuilder('Before deadline at 8:49') .seed('User', [baseUser]) .seed('Student', [{ id: 100, userId: 1, tz: '123456789', name: 'Test Student' }]) .seed('Transportation', [{ id: 10, userId: 1, key: 5, departureTime: '07:30' }]) .seed('StudentKlass', [{ id: 50, userId: 1, studentReferenceId: 100, klassReferenceId: 200 }]) - .seed('Text', baseTexts) - .systemAsks(/enter.*id/i) - .userResponds('123456789') - .systemAsks(/transport/i) - .userResponds('5') - .systemAsks(/departure.*07:30/i) - .userResponds('1') - .systemHangsUp(/success/i) - .build(); + .seed('Text', baseTexts); + respondToTz(builder, '123456789'); + respondToTransport(builder, '5'); + confirmDeparture(builder, true); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -267,7 +295,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 200, userId: 1, key: 7, name: 'Klass Seven', year }; - const scenario = new YemotScenarioBuilder('Seminar happy path with report group') + const builder = new YemotScenarioBuilder('Seminar happy path with report group') .seed('User', [seminarUser({ seminarAttendanceYemot: true, lessonSignature: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) @@ -276,17 +304,11 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .seed('Text', allTexts) .seed('AttReport', []) .seed('ReportGroup', []) - .seed('ReportGroupSession', []) - .systemAsks(/enter klass number/i) - .userResponds('7') - .systemAsks(/enter absent student number/i) - .userResponds('11') - .systemAsks(/confirm student/i) - .userResponds('1') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('ReportGroupSession', []); + askForKlass(builder, '7'); + reportAbsentStudent(builder, '11'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -315,7 +337,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 210, userId: 1, key: 8, name: 'Klass Eight', year }; - const scenario = new YemotScenarioBuilder('Seminar happy path without report group') + const builder = new YemotScenarioBuilder('Seminar happy path without report group') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) @@ -324,17 +346,11 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .seed('Text', allTexts) .seed('AttReport', []) .seed('ReportGroup', []) - .seed('ReportGroupSession', []) - .systemAsks(/enter klass number/i) - .userResponds('8') - .systemAsks(/enter absent student number/i) - .userResponds('11') - .systemAsks(/confirm student/i) - .userResponds('1') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('ReportGroupSession', []); + askForKlass(builder, '8'); + reportAbsentStudent(builder, '11'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -367,22 +383,17 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 220, userId: 1, key: 9, name: 'Klass Nine', year }; - const scenario = new YemotScenarioBuilder('Seminar invalid klass retry') + const builder = new YemotScenarioBuilder('Seminar invalid klass retry') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) .seed('Student', roster()) .seed('StudentKlass', studentKlasses(220, year)) - .seed('Text', allTexts) - .systemAsks(/enter klass number/i) - .userResponds('99') - .systemSends(/invalid klass/i) - .systemAsks(/enter klass number/i) - .userResponds('9') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('Text', allTexts); + rejectKlass(builder, '99'); + askForKlass(builder, '9'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -393,26 +404,18 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 230, userId: 1, key: 10, name: 'Klass Ten', year }; - const scenario = new YemotScenarioBuilder('Seminar invalid student number retry') + const builder = new YemotScenarioBuilder('Seminar invalid student number retry') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) .seed('Student', roster()) .seed('StudentKlass', studentKlasses(230, year)) - .seed('Text', allTexts) - .systemAsks(/enter klass number/i) - .userResponds('10') - .systemAsks(/enter absent student number/i) - .userResponds('999') - .systemSends(/invalid student number/i) - .systemAsks(/enter absent student number/i) - .userResponds('11') - .systemAsks(/confirm student/i) - .userResponds('1') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('Text', allTexts); + askForKlass(builder, '10'); + rejectStudentNumber(builder, '999'); + reportAbsentStudent(builder, '11'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -423,29 +426,19 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 235, userId: 1, key: 15, name: 'Klass Fifteen', year }; - const scenario = new YemotScenarioBuilder('Seminar name confirmation rejected') + const builder = new YemotScenarioBuilder('Seminar name confirmation rejected') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) .seed('Student', roster()) .seed('StudentKlass', studentKlasses(235, year)) .seed('Text', allTexts) - .seed('AttReport', []) - .systemAsks(/enter klass number/i) - .userResponds('15') - .systemAsks(/enter absent student number/i) - .userResponds('11') - .systemAsks(/confirm student/i) - .userResponds('2') - .systemSends(/name rejected/i) - .systemAsks(/enter absent student number/i) - .userResponds('12') - .systemAsks(/confirm student/i) - .userResponds('1') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('AttReport', []); + askForKlass(builder, '15'); + rejectAbsentStudentName(builder, '11'); + reportAbsentStudent(builder, '12'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -463,18 +456,16 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const today = new Date(); today.setHours(0, 0, 0, 0); - const scenario = new YemotScenarioBuilder('Seminar already reported for klass') + const builder = new YemotScenarioBuilder('Seminar already reported for klass') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) .seed('AttReport', [ { id: 900, userId: 1, studentReferenceId: 101, klassReferenceId: 240, reportDate: today, absCount: 0 }, ]) - .seed('Text', allTexts) - .systemAsks(/enter klass number/i) - .userResponds('11') - .systemHangsUp(/already reported/i) - .build(); + .seed('Text', allTexts); + askForKlass(builder, '11'); + const scenario = builder.systemHangsUp(/already reported/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -488,7 +479,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const today = new Date(); today.setHours(0, 0, 0, 0); - const scenario = new YemotScenarioBuilder('Seminar auto-detected schedule') + const builder = new YemotScenarioBuilder('Seminar auto-detected schedule') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) @@ -506,11 +497,9 @@ describe('YemotHandlerService — react-admin-nestjs', () => { .seed('Student', roster()) .seed('StudentKlass', studentKlasses(260, year)) .seed('Text', allTexts) - .seed('AttReport', []) - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('AttReport', []); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -528,20 +517,17 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 270, userId: 1, key: 14, name: 'Klass Fourteen', year }; - const scenario = new YemotScenarioBuilder('Seminar no schedule fallback') + const builder = new YemotScenarioBuilder('Seminar no schedule fallback') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) .seed('Student', roster()) .seed('StudentKlass', studentKlasses(270, year)) .seed('Text', allTexts) - .seed('AttReport', []) - .systemAsks(/enter klass number/i) - .userResponds('14') - .systemAsks(/enter absent student number/i) - .userResponds('0') - .systemHangsUp(/success/i) - .build(); + .seed('AttReport', []); + askForKlass(builder, '14'); + finishAbsentStudentEntry(builder); + const scenario = builder.systemHangsUp(/success/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); @@ -558,15 +544,13 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 250, userId: 1, key: 12, name: 'Klass Twelve', year }; - const scenario = new YemotScenarioBuilder('Seminar no students in klass') + const builder = new YemotScenarioBuilder('Seminar no students in klass') .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) .seed('Teacher', [teacher]) .seed('Klass', [klass]) - .seed('Text', allTexts) - .systemAsks(/enter klass number/i) - .userResponds('12') - .systemHangsUp(/no students/i) - .build(); + .seed('Text', allTexts); + askForKlass(builder, '12'); + const scenario = builder.systemHangsUp(/no students/i).build(); const result = await runner.run(scenario); expect(result.passed).toBe(true); From 775cda86a6976e9de9d00f61240abb539b27d151 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 16 Jul 2026 08:21:03 +0000 Subject: [PATCH 7/7] Simplify view to drop joins; resolve teacher/lesson via ReferenceField - View now selects grouped att_reports columns directly (teacherReferenceId, lessonReferenceId) with no joins to teachers/lessons at all, matching how every other entity in this app resolves those references on the client. - Card header resolves the teacher name via ReferenceField+TextField; lesson chips resolve via ReferenceField+ChipField per lesson row. React-admin batches these into one getMany per reference type, so this isn't N+1 despite the extra requests. - Regenerated the migration against a real MySQL diff and verified the apply/generate/revert/re-apply loop plus real query output. --- client/src/domainTranslations.js | 2 -- .../src/entities/teacher-reported-today.jsx | 28 ++++++++++++------- .../TeacherReportedToday.entity.ts | 25 +++++------------ ...84184430691-AddTeacherReportedTodayView.ts | 16 ----------- ...84189504154-AddTeacherReportedTodayView.ts | 16 +++++++++++ 5 files changed, 41 insertions(+), 46 deletions(-) delete mode 100644 server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts create mode 100644 server/src/migrations/1784189504154-AddTeacherReportedTodayView.ts diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index e62c9225..366563d1 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -305,10 +305,8 @@ export default { fields: { ...generalResourceFieldsTranslation, teacherReferenceId: 'מורה', - teacherName: 'מורה', reportDate: 'תאריך דיווח', lessonReferenceId: 'שיעור', - lessonName: 'שיעור', reportHour: 'שעת דיווח', }, }, diff --git a/client/src/entities/teacher-reported-today.jsx b/client/src/entities/teacher-reported-today.jsx index 5e4f728c..f2581f40 100644 --- a/client/src/entities/teacher-reported-today.jsx +++ b/client/src/entities/teacher-reported-today.jsx @@ -1,5 +1,5 @@ -import { DateInput, ReferenceField, RecordContextProvider, useListContext } from 'react-admin'; -import { Box, Card, CardContent, Chip, Typography } from '@mui/material'; +import { ChipField, DateInput, ReferenceField, RecordContextProvider, TextField, useListContext } from 'react-admin'; +import { Box, Card, CardContent, Typography } from '@mui/material'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; @@ -20,16 +20,16 @@ const formatDate = (value) => (value ? new Date(value).toLocaleDateString('he-IL const formatHour = (value) => (value ? new Date(value).toLocaleTimeString('he-IL', { hour: '2-digit', minute: '2-digit' }) : ''); // The view has one row per teacher+lesson+date; group rows sharing the same -// teacher+date into a single card, collecting their lesson names. +// teacher+date into a single card, collecting their lesson rows. function groupByTeacherAndDate(rows) { const groups = new Map(); rows.forEach((row) => { const key = `${row.userId}_${row.teacherReferenceId}_${row.reportDate}`; if (!groups.has(key)) { - groups.set(key, { ...row, lessonNames: [] }); + groups.set(key, { ...row, lessonRows: [] }); } - if (row.lessonName) { - groups.get(key).lessonNames.push(row.lessonName); + if (row.lessonReferenceId) { + groups.get(key).lessonRows.push(row); } }); return [...groups.values()]; @@ -46,7 +46,11 @@ const TeacherReportCards = ({ isAdmin }) => { - {group.teacherName} + + + + + {isAdmin && } {formatDate(group.reportDate)} @@ -54,9 +58,13 @@ const TeacherReportCards = ({ isAdmin }) => { - {group.lessonNames.length > 0 ? ( - group.lessonNames.map((name) => ( - + {group.lessonRows.length > 0 ? ( + group.lessonRows.map((row) => ( + + + + + )) ) : ( ללא שיוך שיעור diff --git a/server/src/db/view-entities/TeacherReportedToday.entity.ts b/server/src/db/view-entities/TeacherReportedToday.entity.ts index 79680884..31a0b515 100644 --- a/server/src/db/view-entities/TeacherReportedToday.entity.ts +++ b/server/src/db/view-entities/TeacherReportedToday.entity.ts @@ -1,34 +1,29 @@ import { Column, DataSource, ViewEntity } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; import { AttReport } from '../entities/AttReport.entity'; -import { Teacher } from '../entities/Teacher.entity'; -import { Lesson } from '../entities/Lesson.entity'; @ViewEntity('teacher_reported_today', { expression: (dataSource: DataSource) => dataSource .createQueryBuilder() .select( - "CONCAT(att_report.userId, '_', teacher.id, '_', att_report.reportDate, '_', COALESCE(lesson.id, 'null'))", + "CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate, '_', COALESCE(att_report.lessonReferenceId, 'null'))", 'id', ) .addSelect('att_report.userId', 'userId') .addSelect('att_report.reportDate', 'reportDate') - .addSelect('teacher.id', 'teacherReferenceId') - .addSelect('teacher.name', 'teacherName') - .addSelect('lesson.id', 'lessonReferenceId') - .addSelect('lesson.name', 'lessonName') + .addSelect('att_report.teacherReferenceId', 'teacherReferenceId') + .addSelect('att_report.lessonReferenceId', 'lessonReferenceId') .addSelect( - 'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, teacher.id, att_report.reportDate)', + 'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, att_report.teacherReferenceId, att_report.reportDate)', 'reportHour', ) .from(AttReport, 'att_report') - .innerJoin(Teacher, 'teacher', 'teacher.id = att_report.teacherReferenceId AND teacher.userId = att_report.userId') - .leftJoin(Lesson, 'lesson', 'lesson.id = att_report.lessonReferenceId AND lesson.userId = att_report.userId') + .where('att_report.teacherReferenceId IS NOT NULL') .groupBy('att_report.userId') - .addGroupBy('teacher.id') + .addGroupBy('att_report.teacherReferenceId') .addGroupBy('att_report.reportDate') - .addGroupBy('lesson.id'), + .addGroupBy('att_report.lessonReferenceId'), }) export class TeacherReportedToday implements IHasUserId { @Column() @@ -43,15 +38,9 @@ export class TeacherReportedToday implements IHasUserId { @Column() teacherReferenceId: number; - @Column() - teacherName: string; - @Column({ nullable: true }) lessonReferenceId: number; - @Column({ nullable: true }) - lessonName: string; - @Column() reportHour: Date; } diff --git a/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts b/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts deleted file mode 100644 index 688cfb49..00000000 --- a/server/src/migrations/1784184430691-AddTeacherReportedTodayView.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddTeacherReportedTodayView1784184430691 implements MigrationInterface { - name = 'AddTeacherReportedTodayView1784184430691' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, \`teacher\`.\`id\` AS \`teacherReferenceId\`, \`teacher\`.\`name\` AS \`teacherName\`, \`lesson\`.\`id\` AS \`lessonReferenceId\`, \`lesson\`.\`name\` AS \`lessonName\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`teacher\`.\`id\`, '_', \`att_report\`.\`report_date\`, '_', COALESCE(\`lesson\`.\`id\`, 'null')) AS \`id\`, MIN(MIN(\`att_report\`.\`created_at\`)) OVER (PARTITION BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\`) AS \`reportHour\` FROM \`att_reports\` \`att_report\` INNER JOIN \`teachers\` \`teacher\` ON \`teacher\`.\`id\` = \`att_report\`.\`teacherReferenceId\` AND \`teacher\`.\`user_id\` = \`att_report\`.\`user_id\` LEFT JOIN \`lessons\` \`lesson\` ON \`lesson\`.\`id\` = \`att_report\`.\`lessonReferenceId\` AND \`lesson\`.\`user_id\` = \`att_report\`.\`user_id\` GROUP BY \`att_report\`.\`user_id\`, \`teacher\`.\`id\`, \`att_report\`.\`report_date\`, \`lesson\`.\`id\``); - await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`report_date` AS `reportDate`, `teacher`.`id` AS `teacherReferenceId`, `teacher`.`name` AS `teacherName`, `lesson`.`id` AS `lessonReferenceId`, `lesson`.`name` AS `lessonName`, CONCAT(`att_report`.`user_id`, '_', `teacher`.`id`, '_', `att_report`.`report_date`, '_', COALESCE(`lesson`.`id`, 'null')) AS `id`, MIN(MIN(`att_report`.`created_at`)) OVER (PARTITION BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`) AS `reportHour` FROM `att_reports` `att_report` INNER JOIN `teachers` `teacher` ON `teacher`.`id` = `att_report`.`teacherReferenceId` AND `teacher`.`user_id` = `att_report`.`user_id` LEFT JOIN `lessons` `lesson` ON `lesson`.`id` = `att_report`.`lessonReferenceId` AND `lesson`.`user_id` = `att_report`.`user_id` GROUP BY `att_report`.`user_id`, `teacher`.`id`, `att_report`.`report_date`, `lesson`.`id`"]); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]); - await queryRunner.query(`DROP VIEW \`teacher_reported_today\``); - } - -} diff --git a/server/src/migrations/1784189504154-AddTeacherReportedTodayView.ts b/server/src/migrations/1784189504154-AddTeacherReportedTodayView.ts new file mode 100644 index 00000000..f4c12919 --- /dev/null +++ b/server/src/migrations/1784189504154-AddTeacherReportedTodayView.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTeacherReportedTodayView1784189504154 implements MigrationInterface { + name = 'AddTeacherReportedTodayView1784189504154' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`teacherReferenceId\` AS \`teacherReferenceId\`, \`att_report\`.\`lessonReferenceId\` AS \`lessonReferenceId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`att_report\`.\`teacherReferenceId\`, '_', \`att_report\`.\`report_date\`, '_', COALESCE(\`att_report\`.\`lessonReferenceId\`, 'null')) AS \`id\`, MIN(MIN(\`att_report\`.\`created_at\`)) OVER (PARTITION BY \`att_report\`.\`user_id\`, \`att_report\`.\`teacherReferenceId\`, \`att_report\`.\`report_date\`) AS \`reportHour\` FROM \`att_reports\` \`att_report\` WHERE \`att_report\`.\`teacherReferenceId\` IS NOT NULL GROUP BY \`att_report\`.\`user_id\`, \`att_report\`.\`teacherReferenceId\`, \`att_report\`.\`report_date\`, \`att_report\`.\`lessonReferenceId\``); + await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`teacherReferenceId` AS `teacherReferenceId`, `att_report`.`lessonReferenceId` AS `lessonReferenceId`, `att_report`.`report_date` AS `reportDate`, CONCAT(`att_report`.`user_id`, '_', `att_report`.`teacherReferenceId`, '_', `att_report`.`report_date`, '_', COALESCE(`att_report`.`lessonReferenceId`, 'null')) AS `id`, MIN(MIN(`att_report`.`created_at`)) OVER (PARTITION BY `att_report`.`user_id`, `att_report`.`teacherReferenceId`, `att_report`.`report_date`) AS `reportHour` FROM `att_reports` `att_report` WHERE `att_report`.`teacherReferenceId` IS NOT NULL GROUP BY `att_report`.`user_id`, `att_report`.`teacherReferenceId`, `att_report`.`report_date`, `att_report`.`lessonReferenceId`"]); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]); + await queryRunner.query(`DROP VIEW \`teacher_reported_today\``); + } + +}