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
20 changes: 20 additions & 0 deletions server/src/migrations/1787500000000-SimplifyTeacherCodePrompt.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm"

export class SimplifyTeacherCodePrompt1787500000000 implements MigrationInterface {
private oldValue = 'כיתה {klassName}, הקישי קוד מורה. לבחירת כיתה אחרת הקישי כוכבית וסולמית';
private newValue = 'הקישי קוד מורה';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
'UPDATE `texts` SET `value` = ?, `description` = ? WHERE `user_id` = 0 AND `name` = ?',
[this.newValue, this.newValue, 'SEMINAR.TEACHER_CODE_PROMPT'],
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
'UPDATE `texts` SET `value` = ?, `description` = ? WHERE `user_id` = 0 AND `name` = ?',
[this.oldValue, this.oldValue, 'SEMINAR.TEACHER_CODE_PROMPT'],
);
}
}
4 changes: 3 additions & 1 deletion server/src/yemot-handler.service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
{ userId: 0, name: 'SEMINAR.STUDENT_NAME_REJECTED', description: '', value: 'Name rejected, try again' },
{ userId: 0, name: 'SEMINAR.WELCOME', description: '', value: 'Hello teacher {teacherName}' },
{ userId: 0, name: 'SEMINAR.KLASS_CONFIRMED', description: '', value: 'Confirmed klass {klassName}' },
{ userId: 0, name: 'SEMINAR.TEACHER_CODE_PROMPT', description: '', value: 'Enter teacher code for {klassName}' },
{ userId: 0, name: 'SEMINAR.TEACHER_CODE_PROMPT', description: '', value: 'Enter teacher code' },
{ userId: 0, name: 'SEMINAR.INVALID_TEACHER_CODE', description: '', value: 'Invalid teacher code, try again' },
];
const allTexts = [...baseTexts, ...seminarTexts];
Expand Down Expand Up @@ -404,6 +404,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
const klass = { id: 280, userId: 1, key: 16, name: 'Klass Sixteen', year, phone: '0501234567' };

const builder = seminarBuilder('Seminar klass phone recognized', klass).seed('AttReport', []);
builder.systemSends(/confirmed klass/i);
entersTeacherCode(builder, '1');
welcomesTeacher(builder);
finishAbsentStudentEntry(builder);
Expand All @@ -428,6 +429,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
StudentKlass: studentKlasses(282, year),
},
}).seed('AttReport', []);
builder.systemSends(/confirmed klass/i);
ask(builder, TEACHER_CODE_PROMPT, '*');
entersKlass(builder, '18');
entersTeacherCode(builder, '1');
Expand Down
2 changes: 1 addition & 1 deletion server/src/yemot-handler.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export class YemotHandlerService extends BaseYemotHandlerService {
if (!klass) {
klass = await this.getKlassByInput();
}
await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name });
const result = await this.getTeacherOrEscape(klass);
if (result === 'ESCAPE') {
Comment thread
buzz-code marked this conversation as resolved.
Resolved
klass = null;
Expand Down Expand Up @@ -199,7 +200,6 @@ export class YemotHandlerService extends BaseYemotHandlerService {
await this.sendMessageByKey('SEMINAR.INVALID_KLASS');
}
}
await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name });
return klass;
}

Expand Down
Loading