diff --git a/client/src/App.jsx b/client/src/App.jsx index bc8e8db2..91ae7974 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 teacherReportedToday from './entities/teacher-reported-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 AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedInOutlined'; const themeOptions = { primary: blue[700], secondary: purple[500] }; @@ -218,6 +221,14 @@ const App = () => ( options={{ menuGroup: 'report' }} icon={RuleIcon} /> + {isSeminarAttendanceYemot(permissions) && ( + + )} , + , +]; + +const filterDefaultValues = { + 'reportDate:$gte': todayDateOnly, + 'reportDate:$lte': todayDateOnly, +}; + +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 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, lessonRows: [] }); + } + if (row.lessonReferenceId) { + groups.get(key).lessonRows.push(row); + } + }); + return [...groups.values()]; +} + +const TeacherReportCards = ({ isAdmin }) => { + const { data } = useListContext(); + const groups = groupByTeacherAndDate(data || []); + + return ( + + {groups.map((group) => ( + + + + + + + + + + + {isAdmin && } + {formatDate(group.reportDate)} + {formatHour(group.reportHour)} + + + + {group.lessonRows.length > 0 ? ( + group.lessonRows.map((row) => ( + + + + + + )) + ) : ( + ללא שיוך שיעור + )} + + + + + ))} + + ); +}; + +const Datagrid = ({ 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 b39cfce8..5ac1b34c 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/TeacherReportedToday.entity.ts b/server/src/db/view-entities/TeacherReportedToday.entity.ts new file mode 100644 index 00000000..31a0b515 --- /dev/null +++ b/server/src/db/view-entities/TeacherReportedToday.entity.ts @@ -0,0 +1,46 @@ +import { Column, DataSource, ViewEntity } from 'typeorm'; +import { IHasUserId } from '@shared/base-entity/interface'; +import { AttReport } from '../entities/AttReport.entity'; + +@ViewEntity('teacher_reported_today', { + expression: (dataSource: DataSource) => + dataSource + .createQueryBuilder() + .select( + "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('att_report.teacherReferenceId', 'teacherReferenceId') + .addSelect('att_report.lessonReferenceId', 'lessonReferenceId') + .addSelect( + 'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, att_report.teacherReferenceId, att_report.reportDate)', + 'reportHour', + ) + .from(AttReport, 'att_report') + .where('att_report.teacherReferenceId IS NOT NULL') + .groupBy('att_report.userId') + .addGroupBy('att_report.teacherReferenceId') + .addGroupBy('att_report.reportDate') + .addGroupBy('att_report.lessonReferenceId'), +}) +export class TeacherReportedToday implements IHasUserId { + @Column() + id: string; + + @Column() + userId: number; + + @Column('date') + reportDate: Date; + + @Column() + teacherReferenceId: number; + + @Column({ nullable: true }) + lessonReferenceId: number; + + @Column() + reportHour: Date; +} diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index 41fa7d94..0db8837c 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 { TeacherReportedToday } from './db/view-entities/TeacherReportedToday.entity'; registerEntityNameMap({ att_report: 'נוכחות', @@ -97,6 +98,7 @@ registerEntityNameMap({ BaseEntityModule.register(uploadedFileConfig), BaseEntityModule.register(phoneTemplateConfig), BaseEntityModule.register(phoneCampaignConfig), + BaseEntityModule.register({ entity: TeacherReportedToday }), ], }) export class EntitiesModule {} diff --git a/server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts b/server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts new file mode 100644 index 00000000..b2a3e513 --- /dev/null +++ b/server/src/migrations/1784143134666-UpdateYemotTextsNameConfirmAndManager.ts @@ -0,0 +1,32 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class UpdateYemotTextsNameConfirmAndManager1784143134666 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/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\``); + } + +} diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index d3a16cc7..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); @@ -244,6 +272,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]; @@ -265,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]) @@ -274,15 +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(/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); @@ -311,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]) @@ -320,15 +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(/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); @@ -361,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); @@ -387,27 +404,49 @@ 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); + 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); + }); + + 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 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) - .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(/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); + 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 () => { @@ -417,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); @@ -442,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]) @@ -460,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); @@ -482,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); @@ -512,14 +544,88 @@ 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) + .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); + 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); diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index ff4eb19f..4f5dfff5 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,54 @@ 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 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); + + 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 +232,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'); }