diff --git a/client/src/entities/teacher.jsx b/client/src/entities/teacher.jsx
index 9c13f4de..73fd69b4 100644
--- a/client/src/entities/teacher.jsx
+++ b/client/src/entities/teacher.jsx
@@ -1,11 +1,15 @@
import {
+ ArrayInput,
DateField,
DateInput,
DateTimeInput,
+ email,
EmailField,
+ FunctionField,
maxLength,
ReferenceField,
required,
+ SimpleFormIterator,
TextField,
TextInput,
} from 'react-admin';
@@ -34,7 +38,14 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+ [].concat(record.email ?? []).map((addr) => (
+
+
+
+ ))}
+ />
{isAdmin && }
{isAdmin && }
@@ -54,7 +65,11 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
+
+
+
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
diff --git a/server/shared b/server/shared
index 4485fe78..332a24fe 160000
--- a/server/shared
+++ b/server/shared
@@ -1 +1 @@
-Subproject commit 4485fe78743aad9571101f56f22d519a196c480e
+Subproject commit 332a24fed4af74dbf356b694d5609fe2937a2f46
diff --git a/server/src/db/entities/Teacher.entity.ts b/server/src/db/entities/Teacher.entity.ts
index bc3fbfdf..706743bd 100644
--- a/server/src/db/entities/Teacher.entity.ts
+++ b/server/src/db/entities/Teacher.entity.ts
@@ -1,7 +1,8 @@
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';
+import { IsArray, IsEmail, IsOptional } from 'class-validator';
+import { Transform } from 'class-transformer';
import { CrudValidationGroups } from '@dataui/crud';
import { IsNotEmpty, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he';
import { StringType } from '@shared/utils/entity/class-transformer';
@@ -17,8 +18,9 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty
export class Teacher implements IHasUserId {
@BeforeInsert()
@BeforeUpdate()
- normalizeNumber() {
+ normalizeFields() {
if (this.number === '') this.number = null;
+ this.email = splitEmails(this.email);
}
@PrimaryGeneratedColumn({ type: 'int', name: 'id' })
@@ -65,10 +67,11 @@ export class Teacher implements IHasUserId {
number: string | null;
@IsOptional({ always: true })
- @StringType
- @MaxLength(500, { always: true })
- @Column('varchar', { name: 'email', nullable: true, length: 500 })
- email: string | null;
+ @IsArray({ always: true })
+ @IsEmail({}, { each: true, always: true })
+ @Transform(({ value }) => splitEmails(value))
+ @Column('simple-array', { name: 'email', nullable: true })
+ email: string[] | null;
@IsOptional({ always: true })
@StringType
@@ -95,3 +98,11 @@ export class Teacher implements IHasUserId {
@JoinColumn([{ name: 'user_id', referencedColumnName: 'id' }])
user: User;
}
+
+function splitEmails(value: unknown): string[] | null {
+ if (typeof value !== 'string') return value as string[] | null;
+ return value
+ .split(',')
+ .map((e) => e.trim())
+ .filter(Boolean);
+}
diff --git a/server/src/entity-modules/__tests__/teacher.config.spec.ts b/server/src/entity-modules/__tests__/teacher.config.spec.ts
index 8f649f6a..f9af2232 100644
--- a/server/src/entity-modules/__tests__/teacher.config.spec.ts
+++ b/server/src/entity-modules/__tests__/teacher.config.spec.ts
@@ -16,9 +16,17 @@ describe('TeacherConfig', () => {
{ value: 'name', label: 'שם' },
{ value: 'phone', label: 'טלפון' },
{ value: 'phone2', label: 'טלפון 2' },
- { value: 'email', label: 'כתובת מייל' },
+ { value: expect.any(Function), label: 'כתובת מייל' },
{ value: 'displayName', label: 'שם לתצוגה' },
]),
);
});
+
+ it('should join teacher emails into a comma separated string for export', () => {
+ const headers = teacherConfig.exporter.getExportHeaders([]);
+ const emailHeader = headers.find((h: any) => h.label === 'כתובת מייל') as any;
+
+ expect(emailHeader.value({ email: ['a@example.com', 'b@example.com'] })).toBe('a@example.com, b@example.com');
+ expect(emailHeader.value({ email: null })).toBe('');
+ });
});
diff --git a/server/src/entity-modules/teacher.config.ts b/server/src/entity-modules/teacher.config.ts
index 17e374c4..23825ab4 100644
--- a/server/src/entity-modules/teacher.config.ts
+++ b/server/src/entity-modules/teacher.config.ts
@@ -13,7 +13,7 @@ function getConfig(): BaseEntityModuleOptions {
{ value: 'number', label: 'מספר מורה' },
{ value: 'phone', label: 'טלפון' },
{ value: 'phone2', label: 'טלפון 2' },
- { value: 'email', label: 'כתובת מייל' },
+ { value: (record: any) => (record.email ?? []).join(', '), label: 'כתובת מייל' },
{ value: 'displayName', label: 'שם לתצוגה' },
];
},
diff --git a/server/src/migrations/1788633251783-ConvertTeacherEmailToArray.ts b/server/src/migrations/1788633251783-ConvertTeacherEmailToArray.ts
new file mode 100644
index 00000000..e25bf2d7
--- /dev/null
+++ b/server/src/migrations/1788633251783-ConvertTeacherEmailToArray.ts
@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ConvertTeacherEmailToArray1788633251783 implements MigrationInterface {
+ name = 'ConvertTeacherEmailToArray1788633251783'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ ALTER TABLE \`teachers\` MODIFY COLUMN \`email\` text NULL
+ `);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`
+ ALTER TABLE \`teachers\` MODIFY COLUMN \`email\` varchar(500) NULL
+ `);
+ }
+
+}