Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ export default {
fields: {
...generalResourceFieldsTranslation,
tz: 'תז',
studentNumber: 'מספר תלמידה',
comment: 'הערה',
phone: 'טלפון',
address: 'כתובת',
Expand Down
2 changes: 2 additions & 0 deletions client/src/entities/student.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
<TextField source="tz" />
<TextField source="studentNumber" />
<TextField source="name" />
<TextField source="comment" />
<TextField source="phone" />
Expand All @@ -80,6 +81,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
{!isCreate && isAdmin && <TextInput source="id" disabled />}
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<TextInput source="tz" validate={[required(), maxLength(10), unique()]} />
<TextInput source="studentNumber" validate={[maxLength(20), unique()]} />
<TextInput source="name" validate={[required(), maxLength(500)]} />
<TextInput source="comment" validate={[maxLength(1000)]} />
<TextInput source="phone" validate={[maxLength(1000)]} />
Expand Down
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default [
{ html: 'מילוי אוטומטי של קבצי מכלול', status: 'בוצע', statusColor: 'success' },
{ html: 'הצגת ציון אחרון במקום ממוצע', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת סינון לפי ציון נמוך מ בתעודה', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת אפשרות לדיווח נוכחות סמינר בטלפון', status: 'בוצע', statusColor: 'success' },

// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
Expand Down
5 changes: 5 additions & 0 deletions client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const appPermissions = {
absenceType: 'absenceType',
studentView: 'studentView',
studentAttendanceByKlass: 'studentAttendanceByKlass',
seminarAttendanceYemot: 'seminarAttendanceYemot',
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand Down Expand Up @@ -61,3 +62,7 @@ export const useIsStudentView = () => useHasPermission(appPermissions.studentVie
export const isStudentAttendanceByKlass = (permissions) =>
isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.studentAttendanceByKlass);
export const useIsStudentAttendanceByKlass = () => useHasPermission(appPermissions.studentAttendanceByKlass);

export const isSeminarAttendanceYemot = (permissions) =>
hasPermissionLogic(permissions, appPermissions.seminarAttendanceYemot);
export const useIsSeminarAttendanceYemot = () => useHasPermission(appPermissions.seminarAttendanceYemot);
8 changes: 8 additions & 0 deletions server/src/db/entities/Student.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty

@Index('students_users_idx', ['userId'], {})
@Index(['userId', 'tz', 'year'], { unique: true })
@Index(['userId', 'studentNumber', 'year'], { unique: true })
@Entity('students')
export class Student implements IHasUserId {
@PrimaryGeneratedColumn({ type: 'int', name: 'id' })
Expand All @@ -28,6 +29,13 @@ export class Student implements IHasUserId {
@Column('varchar', { name: 'tz', length: 10 })
tz: string;

@IsOptional({ always: true })
@MaxLength(20, { always: true })
@StringType
@IsUniqueCombination(['userId'], [Student, User], { always: true })
@Column('varchar', { name: 'student_number', nullable: true, length: 20 })
studentNumber: string;

@IsOptional({ groups: [CrudValidationGroups.UPDATE] })
@StringType
@MaxLength(500, { always: true })
Expand Down
26 changes: 26 additions & 0 deletions server/src/migrations/1783286226248-AddStudentNumberToStudents.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddStudentNumberToStudents1783286226248 implements MigrationInterface {
name = 'AddStudentNumberToStudents1783286226248'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE \`students\`
ADD \`student_number\` varchar(20) NULL
`);
await queryRunner.query(`
ALTER TABLE \`students\`
ADD UNIQUE INDEX \`students_user_student_number_year_unique\` (\`user_id\`, \`student_number\`, \`year\`)
`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE \`students\` DROP INDEX \`students_user_student_number_year_unique\`
`);
await queryRunner.query(`
ALTER TABLE \`students\` DROP COLUMN \`student_number\`
`);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class UpdateYemotTextsSeminarAttendance1783286613243 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
const texts = [
{ name: 'TEACHER.PHONE_NOT_RECOGNIZED', text: 'מספר הטלפון שלך אינו מוכר במערכת, אנא פני למזכירות.' },
{ name: 'SEMINAR.KLASS_PROMPT', text: 'הקישי מספר כיתה' },
{ name: 'SEMINAR.INVALID_KLASS', text: 'מספר כיתה לא תקין, נסי שוב' },
{ name: 'SEMINAR.ALREADY_REPORTED', text: 'כבר דיווחת נוכחות לכיתה זו היום, לא ניתן לדווח פעמיים.' },
{ name: 'SEMINAR.ABSENT_STUDENT_PROMPT', text: 'הקישי מספר תלמידה שנעדרה מהסמינר, ולסיום הקישי 0' },
{ name: 'SEMINAR.INVALID_STUDENT_NUM', text: 'מספר תלמידה לא תקין, נסי שוב' },
{ name: 'SEMINAR.NO_STUDENTS_IN_KLASS', text: 'לא נמצאו תלמידות המשויכות לכיתה זו, אנא פני למזכירות.' },
];

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<void> {
await queryRunner.query(
'DELETE FROM `texts` WHERE `user_id` = 0 AND `name` IN (?, ?, ?, ?, ?, ?, ?)',
[
'TEACHER.PHONE_NOT_RECOGNIZED',
'SEMINAR.KLASS_PROMPT',
'SEMINAR.INVALID_KLASS',
'SEMINAR.ALREADY_REPORTED',
'SEMINAR.ABSENT_STUDENT_PROMPT',
'SEMINAR.INVALID_STUDENT_NUM',
'SEMINAR.NO_STUDENTS_IN_KLASS',
],
);
}
}
222 changes: 222 additions & 0 deletions server/src/yemot-handler.service.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { YemotScenarioBuilder, YemotScenarioRunner, useFakeDateOnly } from '@shared/utils/yemot/testing';
import { getCurrentHebrewYear } from '@shared/utils/entity/year.util';
import { YemotHandlerService } from './yemot-handler.service';

/**
Expand Down Expand Up @@ -233,4 +234,225 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
const result = await runner.run(scenario);
expect(result.passed).toBe(true);
});

describe('seminar attendance flow', () => {
const seminarTexts = [
{ userId: 0, name: 'TEACHER.PHONE_NOT_RECOGNIZED', description: '', value: 'Teacher phone not recognized' },
{ userId: 0, name: 'SEMINAR.KLASS_PROMPT', description: '', value: 'Enter klass number' },
{ userId: 0, name: 'SEMINAR.INVALID_KLASS', description: '', value: 'Invalid klass, try again' },
{ userId: 0, name: 'SEMINAR.ALREADY_REPORTED', description: '', value: 'Already reported for this klass today' },
{ 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' },
];
const allTexts = [...baseTexts, ...seminarTexts];

const seminarUser = (permissions: Record<string, boolean>) => ({ ...baseUser, permissions });
const teacher = { id: 1, userId: 1, tz: '900000001', name: 'Teacher One', phone: '0501234567' };
const roster = () => [
{ id: 101, userId: 1, tz: '300000001', name: 'Student A', studentNumber: '11' },
{ id: 102, userId: 1, tz: '300000002', name: 'Student B', studentNumber: '12' },
{ id: 103, userId: 1, tz: '300000003', name: 'Student C', studentNumber: '13' },
];
const studentKlasses = (klassReferenceId: number, year: number) => [
{ id: 501, userId: 1, studentReferenceId: 101, klassReferenceId, year },
{ id: 502, userId: 1, studentReferenceId: 102, klassReferenceId, year },
{ id: 503, userId: 1, studentReferenceId: 103, klassReferenceId, year },
];

it('happy path with lessonSignature permission — creates a ReportGroup/Session and AttReport rows', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
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')
.seed('User', [seminarUser({ seminarAttendanceYemot: true, lessonSignature: true })])
.seed('Teacher', [teacher])
.seed('Klass', [klass])
.seed('Student', roster())
.seed('StudentKlass', studentKlasses(200, year))
.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();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);

expect(result.saved['AttReport']).toHaveLength(3);
expect(result.saved['ReportGroup']).toHaveLength(1);
expect(result.saved['ReportGroupSession']).toHaveLength(1);

const session = result.saved['ReportGroupSession'][0];
expect(session.startTime).toBeTruthy();

const byStudent = Object.fromEntries(
result.saved['AttReport'].map((r: any) => [r.studentReferenceId, r]),
);
expect(byStudent[101].absCount).toBe(1);
expect(byStudent[102].absCount).toBe(0);
expect(byStudent[103].absCount).toBe(0);
for (const report of result.saved['AttReport']) {
expect(report.reportGroupSessionId).toBe(session.id);
}
});

it('happy path without lessonSignature permission — saves AttReport rows without a report group', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
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')
.seed('User', [seminarUser({ seminarAttendanceYemot: true })])
.seed('Teacher', [teacher])
.seed('Klass', [klass])
.seed('Student', roster())
.seed('StudentKlass', studentKlasses(210, year))
.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();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);

expect(result.saved['AttReport']).toHaveLength(3);
expect(result.saved['ReportGroup']).toHaveLength(0);
expect(result.saved['ReportGroupSession']).toHaveLength(0);
for (const report of result.saved['AttReport']) {
expect(report.reportGroupSessionId).toBeFalsy();
}
});

it('teacher phone not recognized — hangup with TEACHER.PHONE_NOT_RECOGNIZED', async () => {
jest.setSystemTime(israelTimeAt(7, 0));

const scenario = new YemotScenarioBuilder('Seminar unrecognized teacher phone')
.seed('User', [seminarUser({ seminarAttendanceYemot: true })])
.seed('Text', allTexts)
.systemHangsUp(/not recognized/i)
.build();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);
});

it('invalid klass number — error message then retry with valid klass', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();
const klass = { id: 220, userId: 1, key: 9, name: 'Klass Nine', year };

const scenario = 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();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
});

it('invalid student number — error message then retry with valid student number', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();
const klass = { id: 230, userId: 1, key: 10, name: 'Klass Ten', year };

const scenario = 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(/enter absent student number/i)
.userResponds('0')
.systemHangsUp(/success/i)
.build();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
});

it('already reported today for this klass — hangup with SEMINAR.ALREADY_REPORTED', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();
const klass = { id: 240, userId: 1, key: 11, name: 'Klass Eleven', year };
const today = new Date();
today.setHours(0, 0, 0, 0);

const scenario = 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();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);
});

it('no students in klass — hangup with SEMINAR.NO_STUDENTS_IN_KLASS', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();
const klass = { id: 250, userId: 1, key: 12, name: 'Klass Twelve', year };

const scenario = 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();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);
});
});
});
Loading
Loading