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
2 changes: 2 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export default {
teacherId: 'מורה',
teacherReferenceId: 'מורה',
order: 'סדר הצגה',
phone: 'טלפון',
},
},
klass_type: {
Expand Down Expand Up @@ -207,6 +208,7 @@ export default {
fields: {
...generalResourceFieldsTranslation,
tz: 'תז',
number: 'מספר מורה',
phone: 'טלפון',
phone2: 'טלפון 2',
email: 'כתובת מייל',
Expand Down
4 changes: 3 additions & 1 deletion client/src/entities/klass.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
<TextField source="key" />
<TextField source="name" />
<TextField source="displayName" />
<TextField source="phone" />
<MultiReferenceField
source="klassTypeReferenceId"
sortBy="klassType.name"
Expand Down Expand Up @@ -110,6 +111,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<NumberInput source="key" validate={[required(), unique()]} />
<TextInput source="name" validate={[required(), maxLength(500)]} />
<TextInput source="displayName" validate={[maxLength(500)]} />
<TextInput source="phone" validate={[maxLength(20), unique()]} />
Comment thread
buzz-code marked this conversation as resolved.
Resolved
<CommonReferenceInput
source="klassTypeReferenceId"
reference="klass_type"
Expand All @@ -128,7 +130,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
const Representation = CommonRepresentation;

const importer = {
fields: ['key', 'name', 'klassTypeId', 'teacherId', 'year', 'displayName', 'order'],
fields: ['key', 'name', 'klassTypeId', 'teacherId', 'year', 'displayName', 'order', 'phone'],
};

const entity = {
Expand Down
4 changes: 3 additions & 1 deletion client/src/entities/teacher.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
<TextField source="tz" />
<TextField source="name" />
<TextField source="displayName" />
<TextField source="number" />
<TextField source="phone" />
<TextField source="phone2" />
<EmailField source="email" />
Expand All @@ -50,6 +51,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<TextInput source="tz" validate={[required(), maxLength(10), unique()]} />
<TextInput source="name" validate={[required(), maxLength(500)]} />
<TextInput source="displayName" validate={maxLength(500)} />
<TextInput source="number" validate={[maxLength(10), unique()]} />
Comment thread
buzz-code marked this conversation as resolved.
Resolved
<TextInput source="phone" validate={maxLength(10)} />
<TextInput source="phone2" validate={maxLength(10)} />
<TextInput source="email" validate={maxLength(500)} />
Expand All @@ -63,7 +65,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
const Representation = CommonRepresentation;

const importer = {
fields: ['tz', 'name', 'phone', 'phone2', 'email', 'comment', 'displayName'],
fields: ['tz', 'name', 'number', 'phone', 'phone2', 'email', 'comment', 'displayName'],
};

const entity = {
Expand Down
10 changes: 10 additions & 0 deletions server/src/db/entities/Klass.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty
@Index('klasses_users_idx', ['userId'], {})
@Index(['userId', 'key', 'year'], { unique: true })
@Index('klasses_user_id_key_idx', ['userId', 'key'])
@Index('klasses_user_id_phone_year_unique', ['userId', 'phone', 'year'], { unique: true })
@Entity('klasses')
Comment thread
buzz-code marked this conversation as resolved.
Resolved
export class Klass implements IHasUserId {
@BeforeInsert()
@BeforeUpdate()
async fillFields() {
if (this.phone === '') this.phone = null;

let dataSource: DataSource;
try {
fillDefaultYearValue(this);
Expand Down Expand Up @@ -104,6 +107,13 @@ export class Klass implements IHasUserId {
@Column('varchar', { name: 'teacher_id', nullable: true, length: 10 })
teacherId: string | null;

@IsOptional({ always: true })
@StringType
@MaxLength(20, { always: true })
@IsUniqueCombination(['userId', 'year'], [Klass, KlassType, User, Teacher], { always: true })
@Column('varchar', { name: 'phone', nullable: true, length: 20 })
phone: string | null;
Comment thread
buzz-code marked this conversation as resolved.
Resolved

@Column({ nullable: true })
@Index('klasses_teacher_reference_id_idx')
teacherReferenceId: number;
Expand Down
16 changes: 15 additions & 1 deletion server/src/db/entities/Teacher.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { User } from 'src/db/entities/User.entity';
import { IsOptional } from 'class-validator';
Expand All @@ -12,8 +12,15 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty
@Index('teachers_user_id_tz_idx', ['userId', 'tz'])
@Index('teachers_user_id_phone_idx', ['userId', 'phone'])
@Index('teachers_user_id_phone2_idx', ['userId', 'phone2'])
@Index('teachers_user_id_number_unique', ['userId', 'number'], { unique: true })
@Entity('teachers')
export class Teacher implements IHasUserId {
@BeforeInsert()
@BeforeUpdate()
normalizeNumber() {
if (this.number === '') this.number = null;
}

@PrimaryGeneratedColumn({ type: 'int', name: 'id' })
id: number;

Expand Down Expand Up @@ -50,6 +57,13 @@ export class Teacher implements IHasUserId {
@Column('varchar', { name: 'phone2', nullable: true, length: 10 })
phone2: string | null;

@IsOptional({ always: true })
@StringType
@MaxLength(10, { always: true })
@IsUniqueCombination(['userId'], [Teacher, User], { always: true })
@Column('varchar', { name: 'number', nullable: true, length: 10 })
Comment thread
buzz-code marked this conversation as resolved.
Resolved
number: string | null;
Comment thread
Copilot marked this conversation as resolved.
Resolved

@IsOptional({ always: true })
@StringType
@MaxLength(500, { always: true })
Expand Down
1 change: 1 addition & 0 deletions server/src/entity-modules/teacher.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ function getConfig(): BaseEntityModuleOptions {
return [
{ value: 'tz', label: 'תז' },
{ value: 'name', label: 'שם' },
{ value: 'number', label: 'מספר מורה' },
{ value: 'phone', label: 'טלפון' },
{ value: 'phone2', label: 'טלפון 2' },
{ value: 'email', label: 'כתובת מייל' },
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddKlassPhoneAndTeacherNumber1787300000000 implements MigrationInterface {
name = 'AddKlassPhoneAndTeacherNumber1787300000000'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE \`klasses\`
ADD \`phone\` varchar(20) NULL
`);
await queryRunner.query(`
ALTER TABLE \`klasses\`
ADD UNIQUE INDEX \`klasses_user_id_phone_year_unique\` (\`user_id\`, \`phone\`, \`year\`)
`);
Comment thread
buzz-code marked this conversation as resolved.
Resolved
Comment thread
buzz-code marked this conversation as resolved.
Resolved
await queryRunner.query(`
ALTER TABLE \`teachers\`
ADD \`number\` varchar(10) NULL
`);
await queryRunner.query(`
ALTER TABLE \`teachers\`
ADD UNIQUE INDEX \`teachers_user_id_number_unique\` (\`user_id\`, \`number\`)
`);
Comment thread
buzz-code marked this conversation as resolved.
Resolved
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE \`teachers\` DROP INDEX \`teachers_user_id_number_unique\`
`);
await queryRunner.query(`
ALTER TABLE \`teachers\` DROP COLUMN \`number\`
`);
await queryRunner.query(`
ALTER TABLE \`klasses\` DROP INDEX \`klasses_user_id_phone_year_unique\`
`);
await queryRunner.query(`
ALTER TABLE \`klasses\` DROP COLUMN \`phone\`
`);
}

}
28 changes: 28 additions & 0 deletions server/src/migrations/1787300000001-UpdateYemotTextsTeacherCode.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { MigrationInterface, QueryRunner } from "typeorm"

export class UpdateYemotTextsTeacherCode1787300000001 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<void> {
const texts = [
{ name: 'SEMINAR.TEACHER_CODE_PROMPT', text: 'כיתה {klassName}, הקישי קוד מורה. לבחירת כיתה אחרת הקישי כוכבית וסולמית' },
{ name: 'SEMINAR.INVALID_TEACHER_CODE', 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 (?, ?)',
[
'SEMINAR.TEACHER_CODE_PROMPT',
'SEMINAR.INVALID_TEACHER_CODE',
],
);
}
}
Loading
Loading