From 4f7076db473c2ce64bd3d18a9f4e491eb9fc5e53 Mon Sep 17 00:00:00 2001 From: yael-miller Date: Mon, 9 Feb 2026 19:22:38 +0000 Subject: [PATCH 1/6] add event types table and link to known absences --- client/src/App.jsx | 5 +- client/src/domainTranslations.js | 13 +++ client/src/entities/event.jsx | 87 +++++++++++++++++++ client/src/entities/known-absence.jsx | 7 +- client/src/utils/appPermissions.js | 5 ++ server/src/db/entities/Event.entity.ts | 69 +++++++++++++++ server/src/db/entities/KnownAbsence.entity.ts | 8 ++ server/src/entities.module.ts | 2 + server/src/entity-modules/event.config.ts | 21 +++++ .../entity-modules/known-absence.config.ts | 3 + 10 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 client/src/entities/event.jsx create mode 100644 server/src/db/entities/Event.entity.ts create mode 100644 server/src/entity-modules/event.config.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index 9e33eef7..703bf4e5 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -38,6 +38,7 @@ import studentKlass from "src/entities/student-klass"; import student from "src/entities/student"; import teacher from "src/entities/teacher"; import transportation from 'src/entities/transportation'; +import event from 'src/entities/event'; import studentKlassesReport from "src/entities/student-klasses-report"; import reportMonth from "src/entities/report-month"; import teacherReportStatus from "src/entities/teacher-report-status"; @@ -67,7 +68,7 @@ import paymentTrack from '@shared/components/common-entities/payment-track'; import yemotCall from '@shared/components/common-entities/yemot-call'; import { isShowUsersData, isEditPagesData, isEditPaymentTracksData, isAdmin } from "@shared/utils/permissionsUtil"; -import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation } from 'src/utils/appPermissions'; +import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation, isStudentView } from 'src/utils/appPermissions'; import YemotSimulator from "@shared/components/views/YemotSimulator"; import { RegisterPage } from '@shared/components/layout/RegisterPage'; import { LoginPage } from '@shared/components/layout/LoginPage'; @@ -108,6 +109,7 @@ import MonetizationOnIcon from '@mui/icons-material/MonetizationOn'; import LocalAtmIcon from '@mui/icons-material/LocalAtm'; import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings'; import DirectionsBusIcon from '@mui/icons-material/DirectionsBus'; +import CelebrationIcon from '@mui/icons-material/Celebration'; const i18nProvider = getI18nProvider(domainTranslations); @@ -162,6 +164,7 @@ const App = () => ( {(isTransportation(permissions) || isAdmin(permissions)) && } + {(isStudentView(permissions) || isAdmin(permissions)) && } diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index 1a6f2815..01278dc8 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -1,4 +1,5 @@ import { generalResourceFieldsTranslation } from "@shared/providers/i18nProvider" +import event from "./entities/event"; export default { menu_groups: { @@ -141,6 +142,8 @@ export default { reason: 'סיבה', comment: 'הערה', isApproved: 'מאושר', + eventId: 'סוג אירוע', + event: 'אירוע', } }, lesson: { @@ -208,6 +211,16 @@ export default { description: 'תיאור נסיעה', } }, + event: { + name: 'אירוע |||| אירועים', + fields: { + ...generalResourceFieldsTranslation, + name: 'שם האירוע', + year: 'שנה', + quota: 'מכסה שנתית', + requiredLabels: 'שדות חובה לדיווח', + } + }, text: { name: 'הודעה |||| הודעות - טבלת אדמין', fields: { diff --git a/client/src/entities/event.jsx b/client/src/entities/event.jsx new file mode 100644 index 00000000..290c27f0 --- /dev/null +++ b/client/src/entities/event.jsx @@ -0,0 +1,87 @@ +import { + DateField, + DateTimeInput, + ReferenceField, + required, + TextField, + TextInput, + NumberInput, + maxLength, + SelectField, + ArrayInput, + SimpleFormIterator, +} from "react-admin"; +import { CommonDatagrid } from "@shared/components/crudContainers/CommonList"; +import { getResourceComponents } from "@shared/components/crudContainers/CommonEntity"; +import CommonReferenceInput from "@shared/components/fields/CommonReferenceInput"; +import { useUnique } from "@shared/utils/useUnique"; +import { commonAdminFilters } from "@shared/components/fields/PermissionFilter"; +import { defaultYearFilter, yearChoices } from "@shared/utils/yearFilter"; +import CommonAutocompleteInput from "@shared/components/fields/CommonAutocompleteInput"; + +const filters = [ + ...commonAdminFilters, + , + , +]; + +const filterDefaultValues = { + year: defaultYearFilter.year, +}; + +const Datagrid = ({ isAdmin, children, ...props }) => { + return ( + + {children} + {isAdmin && } + {isAdmin && } + + + + + + + + {isAdmin && } + {isAdmin && } + + ); +}; + +const Inputs = ({ isCreate, isAdmin }) => { + const unique = useUnique(); + return ( + <> + {!isCreate && isAdmin && } + {isAdmin && ( )} + + + + + + + + + + {!isCreate && isAdmin && } + {!isCreate && isAdmin && } + + ); +}; + +const Representation = 'name'; + +const importer = { + fields: ["name", "quota", "year"], +}; + +const entity = { + Datagrid, + Inputs, + Representation, + filters, + filterDefaultValues, + importer, +}; + +export default getResourceComponents(entity); \ No newline at end of file diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 20f66309..5ef34d65 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -24,6 +24,7 @@ const filters = [ , , , + , ]; const filterDefaultValues = { @@ -39,6 +40,9 @@ const Datagrid = ({ isAdmin, children, ...props }) => { + + + @@ -63,6 +67,7 @@ const Inputs = ({ isCreate, isAdmin }) => { + @@ -77,7 +82,7 @@ const Inputs = ({ isCreate, isAdmin }) => { } const importer = { - fields: ['studentTz', 'klassId', 'lessonId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'], + fields: ['studentTz', 'klassId', 'lessonId', 'eventId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'], } const additionalListActions = [ diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index eef789d7..26c75986 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -1,4 +1,5 @@ import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; +import student from 'src/entities/student'; export const appPermissions = { scannerUpload: 'scannerUpload', @@ -11,6 +12,7 @@ export const appPermissions = { approvedAbsencesBulk: 'approvedAbsencesBulk', teacherView: 'teacherView', transportation: 'transportation', + studentView: 'studentView', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -43,3 +45,6 @@ export const useIsTeacherView = () => useHasPermission(appPermissions.teacherVie export const isTransportation = (permissions) => hasPermissionLogic(permissions, appPermissions.transportation); export const useIsTransportation = () => useHasPermission(appPermissions.transportation); +export const isStudentView = (permissions) => hasPermissionLogic(permissions, appPermissions.studentView); +export const useIsisStudentView = () => useHasPermission(appPermissions.studentView); + diff --git a/server/src/db/entities/Event.entity.ts b/server/src/db/entities/Event.entity.ts new file mode 100644 index 00000000..6e2f43f5 --- /dev/null +++ b/server/src/db/entities/Event.entity.ts @@ -0,0 +1,69 @@ +import { + Column, + Entity, + Index, + JoinColumn, + PrimaryGeneratedColumn, + BeforeInsert, + BeforeUpdate, +} from 'typeorm'; +import { IHasUserId } from '@shared/base-entity/interface'; +import { User } from 'src/db/entities/User.entity'; +import { IsOptional, Min } from 'class-validator'; +import { CrudValidationGroups } from '@dataui/crud'; +import { IsNotEmpty, IsUniqueCombination, MaxLength, IsNumber } from '@shared/utils/validation/class-validator-he'; +import { StringType, NumberType } from '@shared/utils/entity/class-transformer'; +import { fillDefaultYearValue } from "@shared/utils/entity/year.util"; +import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; + + +@Index('events_users_idx', ['userId'], {}) +@Index(['userId', 'name', 'year'], { unique: true }) +@Entity('events') +export class Event implements IHasUserId { + @BeforeInsert() + @BeforeUpdate() + async fillFields() { + fillDefaultYearValue(this); + } + + @PrimaryGeneratedColumn({ type: 'int', name: 'id' }) + id: number; + + @Column('int', { name: 'user_id' }) + userId: number; + + @Column({ nullable: true }) + year: number; + + @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @StringType + @MaxLength(100, { always: true }) + @Column('varchar', { name: 'name', length: 100 }) + name: string; + + @IsNumber({ maxDecimalPlaces: 1 }, { always: true }) + @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @Min(0, { always: true }) + @NumberType + @Column('decimal', { name: 'quota', precision: 5, scale: 1 }) + quota: number; + + @IsOptional({ always: true }) + @Column({ + type: 'json', + name: 'required_labels', + nullable: true, + comment: 'רשימת התוויות שיופיעו בטופס הדיווח' + }) + requiredLabels: string[] | null; + + @CreatedAtColumn() + createdAt: Date; + + @UpdatedAtColumn() + updatedAt: Date; + + @JoinColumn([{ name: 'user_id', referencedColumnName: 'id' }]) + user: User; +} \ No newline at end of file diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index b5c345d4..99365572 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -152,6 +152,9 @@ export class KnownAbsence implements IHasUserId { @JoinColumn([{ name: "user_id", referencedColumnName: "id" }]) user: User; + @Column('int', { name: 'event_id', nullable: true }) + eventId: number | null; + @ManyToOne(() => Student, { createForeignKeyConstraints: false }) @JoinColumn({ name: 'studentReferenceId' }) student: Student; @@ -163,4 +166,9 @@ export class KnownAbsence implements IHasUserId { @ManyToOne(() => Klass, { createForeignKeyConstraints: false }) @JoinColumn({ name: 'klassReferenceId' }) klass: Klass; + + @ManyToOne(() => Event) + @JoinColumn([{ name: 'event_id', referencedColumnName: 'id' }]) + event: Event; + } diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index 2b475933..b937ac24 100644 --- a/server/src/entities.module.ts +++ b/server/src/entities.module.ts @@ -43,6 +43,7 @@ import { AttendanceName } from "./db/entities/AttendanceName.entity"; import reportGroupConfig from "./entity-modules/report-group.config"; import reportGroupSessionConfig from "./entity-modules/report-group-session.config"; import transportationConfig from './entity-modules/transportation.config'; +import eventConfig from "./entity-modules/event.config"; import { Student } from "./db/entities/Student.entity"; import { Teacher } from "./db/entities/Teacher.entity"; import { registerEntityNameMap } from '@shared/entities/configs/import-file.config'; @@ -103,6 +104,7 @@ registerEntityNameMap({ BaseEntityModule.register({ entity: AbsCountEffectByUser }), BaseEntityModule.register({ entity: LessonKlassName }), BaseEntityModule.register(transportationConfig), + BaseEntityModule.register(eventConfig) ] }) export class EntitiesModule { } diff --git a/server/src/entity-modules/event.config.ts b/server/src/entity-modules/event.config.ts new file mode 100644 index 00000000..1efd338f --- /dev/null +++ b/server/src/entity-modules/event.config.ts @@ -0,0 +1,21 @@ +import { BaseEntityModuleOptions } from '@shared/base-entity/interface'; +import { IHeader } from '@shared/utils/exporter/types'; +import { Event } from 'src/db/entities/Event.entity'; + +function getConfig(): BaseEntityModuleOptions { + return { + entity: Event, + exporter: { + getExportHeaders(): IHeader[] { + return [ + { value: 'name', label: 'סוג חיסור' }, + { value: 'year', label: 'שנה' }, + { value: 'quota', label: 'מכסה שנתית' }, + { value: 'requiredLabels', label: 'שדות חובה לדיווח' }, + ]; + }, + }, + }; +} + +export default getConfig(); \ No newline at end of file diff --git a/server/src/entity-modules/known-absence.config.ts b/server/src/entity-modules/known-absence.config.ts index e88187f8..e14cba73 100644 --- a/server/src/entity-modules/known-absence.config.ts +++ b/server/src/entity-modules/known-absence.config.ts @@ -11,12 +11,14 @@ function getConfig(): BaseEntityModuleOptions { student: { eager: false }, lesson: { eager: false }, klass: { eager: false }, + event: { eager: false }, } }, exporter: { processReqForExport(req: CrudRequest, innerFunc) { req.options.query.join = { student: { eager: true }, + event: { eager: true }, }; return innerFunc(req); }, @@ -25,6 +27,7 @@ function getConfig(): BaseEntityModuleOptions { { value: 'student.name', label: 'תלמידה' }, { value: 'klass.name', label: 'כיתה' }, { value: 'lesson.name', label: 'שיעור' }, + { value: 'event.name', label: 'סוג אירוע' }, { value: 'reportDate', label: 'תאריך דיווח' }, { value: 'absnceCount', label: 'מספר היעדרויות' }, { value: 'absnceCode', label: 'קוד היעדרות' }, From 6b8183573411ab3bcc974341a6a6c962439d1a58 Mon Sep 17 00:00:00 2001 From: yael-miller Date: Mon, 9 Feb 2026 20:36:01 +0000 Subject: [PATCH 2/6] add absence types and quotas logic with dynamic labels --- client/src/domainTranslations.js | 2 -- client/src/entities/event.jsx | 4 +-- client/src/entities/known-absence.jsx | 2 +- client/src/utils/appPermissions.js | 1 - server/src/db/entities/Event.entity.ts | 3 +- server/src/db/entities/KnownAbsence.entity.ts | 29 ++++++++++++++----- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index 01278dc8..be71166d 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -1,5 +1,4 @@ import { generalResourceFieldsTranslation } from "@shared/providers/i18nProvider" -import event from "./entities/event"; export default { menu_groups: { @@ -216,7 +215,6 @@ export default { fields: { ...generalResourceFieldsTranslation, name: 'שם האירוע', - year: 'שנה', quota: 'מכסה שנתית', requiredLabels: 'שדות חובה לדיווח', } diff --git a/client/src/entities/event.jsx b/client/src/entities/event.jsx index 290c27f0..dfb876c0 100644 --- a/client/src/entities/event.jsx +++ b/client/src/entities/event.jsx @@ -40,7 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => { - + {isAdmin && } {isAdmin && } @@ -72,7 +72,7 @@ const Inputs = ({ isCreate, isAdmin }) => { const Representation = 'name'; const importer = { - fields: ["name", "quota", "year"], + fields: ["name", "quota", "requiredLabels", "year"], }; const entity = { diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 5ef34d65..7c65f056 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -40,7 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => { - + diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 26c75986..78f4c8d0 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -1,5 +1,4 @@ import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; -import student from 'src/entities/student'; export const appPermissions = { scannerUpload: 'scannerUpload', diff --git a/server/src/db/entities/Event.entity.ts b/server/src/db/entities/Event.entity.ts index 6e2f43f5..c87bb2ea 100644 --- a/server/src/db/entities/Event.entity.ts +++ b/server/src/db/entities/Event.entity.ts @@ -51,10 +51,9 @@ export class Event implements IHasUserId { @IsOptional({ always: true }) @Column({ - type: 'json', + type: 'simple-array', name: 'required_labels', nullable: true, - comment: 'רשימת התוויות שיופיעו בטופס הדיווח' }) requiredLabels: string[] | null; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 99365572..c142063b 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -22,6 +22,7 @@ import { Klass } from "./Klass.entity"; import { Lesson } from "./Lesson.entity"; import { KlassType } from "./KlassType.entity"; import { Teacher } from "./Teacher.entity"; +import { Event } from "./Event.entity"; import { DateType, NumberType, StringType } from "@shared/utils/entity/class-transformer"; import { LessonKlassName } from "../view-entities/LessonKlassName.entity"; import { CreatedAtColumn, UpdatedAtColumn } from "@shared/utils/entity/column-types.util"; @@ -39,7 +40,7 @@ export class KnownAbsence implements IHasUserId { let dataSource: DataSource; try { - dataSource = await getDataSource([Student, User, Klass, KlassType, Lesson, Teacher, LessonKlassName]); + dataSource = await getDataSource([Student, User, Klass, KlassType, Lesson, Teacher, LessonKlassName, Event]); this.studentReferenceId = await findOneAndAssignReferenceId( dataSource, Student, { tz: this.studentTz }, this.userId, this.studentReferenceId, this.studentTz @@ -50,6 +51,13 @@ export class KnownAbsence implements IHasUserId { this.lessonReferenceId = await findOneAndAssignReferenceId( dataSource, Lesson, { year: this.year, key: this.lessonId }, this.userId, this.lessonReferenceId, this.lessonId ); + if (this.eventId) { + this.eventReferenceId = await findOneAndAssignReferenceId( + dataSource, Event, { id: this.eventId }, this.userId, this.eventReferenceId, this.eventId + ); + } else { + this.eventReferenceId = null; + } } finally { dataSource?.destroy(); } @@ -139,6 +147,17 @@ export class KnownAbsence implements IHasUserId { @Column({ default: true }) isApproved: boolean; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) + @Column("int", { name: "event_id", nullable: true }) + eventId: number | null; + + @IsOptional({ always: true }) + @Column({ nullable: true }) + @Index("known_absences_event_reference_id_idx") + eventReferenceId: number | null; + @CreatedAtColumn() createdAt: Date; @@ -152,9 +171,6 @@ export class KnownAbsence implements IHasUserId { @JoinColumn([{ name: "user_id", referencedColumnName: "id" }]) user: User; - @Column('int', { name: 'event_id', nullable: true }) - eventId: number | null; - @ManyToOne(() => Student, { createForeignKeyConstraints: false }) @JoinColumn({ name: 'studentReferenceId' }) student: Student; @@ -167,8 +183,7 @@ export class KnownAbsence implements IHasUserId { @JoinColumn({ name: 'klassReferenceId' }) klass: Klass; - @ManyToOne(() => Event) - @JoinColumn([{ name: 'event_id', referencedColumnName: 'id' }]) + @ManyToOne(() => Event, { createForeignKeyConstraints: false }) + @JoinColumn({ name: 'eventReferenceId' }) event: Event; - } From 21c9a821ec685f4b4fa4423e0fb9c328017dedc8 Mon Sep 17 00:00:00 2001 From: yael-miller Date: Tue, 10 Feb 2026 15:54:22 +0000 Subject: [PATCH 3/6] Rename Event entity to AbsenceType --- client/src/App.jsx | 4 +-- client/src/domainTranslations.js | 5 ++-- .../entities/{event.jsx => absenceType.jsx} | 0 client/src/entities/known-absence.jsx | 8 +++--- ...{Event.entity.ts => AbsenceType.entity.ts} | 7 +++-- server/src/db/entities/KnownAbsence.entity.ts | 26 ++++++------------- server/src/entities.module.ts | 4 +-- ...{event.config.ts => absenceType.config.ts} | 4 +-- .../entity-modules/known-absence.config.ts | 6 ++--- 9 files changed, 26 insertions(+), 38 deletions(-) rename client/src/entities/{event.jsx => absenceType.jsx} (100%) rename server/src/db/entities/{Event.entity.ts => AbsenceType.entity.ts} (93%) rename server/src/entity-modules/{event.config.ts => absenceType.config.ts} (86%) diff --git a/client/src/App.jsx b/client/src/App.jsx index 703bf4e5..2b2ad4c4 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -38,7 +38,7 @@ import studentKlass from "src/entities/student-klass"; import student from "src/entities/student"; import teacher from "src/entities/teacher"; import transportation from 'src/entities/transportation'; -import event from 'src/entities/event'; +import absenceType from 'src/entities/absenceType'; import studentKlassesReport from "src/entities/student-klasses-report"; import reportMonth from "src/entities/report-month"; import teacherReportStatus from "src/entities/teacher-report-status"; @@ -164,7 +164,7 @@ const App = () => ( {(isTransportation(permissions) || isAdmin(permissions)) && } - {(isStudentView(permissions) || isAdmin(permissions)) && } + {(isStudentView(permissions) || isAdmin(permissions)) && } diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index be71166d..c519e69e 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -141,8 +141,7 @@ export default { reason: 'סיבה', comment: 'הערה', isApproved: 'מאושר', - eventId: 'סוג אירוע', - event: 'אירוע', + absenceTypeId: 'סוג אירוע', } }, lesson: { @@ -210,7 +209,7 @@ export default { description: 'תיאור נסיעה', } }, - event: { + absenceType: { name: 'אירוע |||| אירועים', fields: { ...generalResourceFieldsTranslation, diff --git a/client/src/entities/event.jsx b/client/src/entities/absenceType.jsx similarity index 100% rename from client/src/entities/event.jsx rename to client/src/entities/absenceType.jsx diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 7c65f056..53e76558 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -24,7 +24,7 @@ const filters = [ , , , - , + , ]; const filterDefaultValues = { @@ -40,7 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => { - + @@ -67,7 +67,7 @@ const Inputs = ({ isCreate, isAdmin }) => { - + @@ -82,7 +82,7 @@ const Inputs = ({ isCreate, isAdmin }) => { } const importer = { - fields: ['studentTz', 'klassId', 'lessonId', 'eventId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'], + fields: ['studentTz', 'klassId', 'lessonId', 'absenceTypeId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'], } const additionalListActions = [ diff --git a/server/src/db/entities/Event.entity.ts b/server/src/db/entities/AbsenceType.entity.ts similarity index 93% rename from server/src/db/entities/Event.entity.ts rename to server/src/db/entities/AbsenceType.entity.ts index c87bb2ea..40d67e60 100644 --- a/server/src/db/entities/Event.entity.ts +++ b/server/src/db/entities/AbsenceType.entity.ts @@ -16,11 +16,10 @@ import { StringType, NumberType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from "@shared/utils/entity/year.util"; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; - -@Index('events_users_idx', ['userId'], {}) +@Index('absenceTypes_users_idx', ['userId'], {}) @Index(['userId', 'name', 'year'], { unique: true }) -@Entity('events') -export class Event implements IHasUserId { +@Entity('absenceTypes') +export class AbsenceType implements IHasUserId { @BeforeInsert() @BeforeUpdate() async fillFields() { diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index c142063b..eb970f25 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -22,7 +22,7 @@ import { Klass } from "./Klass.entity"; import { Lesson } from "./Lesson.entity"; import { KlassType } from "./KlassType.entity"; import { Teacher } from "./Teacher.entity"; -import { Event } from "./Event.entity"; +import { AbsenceType } from "./AbsenceType.entity"; import { DateType, NumberType, StringType } from "@shared/utils/entity/class-transformer"; import { LessonKlassName } from "../view-entities/LessonKlassName.entity"; import { CreatedAtColumn, UpdatedAtColumn } from "@shared/utils/entity/column-types.util"; @@ -40,7 +40,7 @@ export class KnownAbsence implements IHasUserId { let dataSource: DataSource; try { - dataSource = await getDataSource([Student, User, Klass, KlassType, Lesson, Teacher, LessonKlassName, Event]); + dataSource = await getDataSource([Student, User, Klass, KlassType, Lesson, Teacher, LessonKlassName, AbsenceType]); this.studentReferenceId = await findOneAndAssignReferenceId( dataSource, Student, { tz: this.studentTz }, this.userId, this.studentReferenceId, this.studentTz @@ -51,13 +51,6 @@ export class KnownAbsence implements IHasUserId { this.lessonReferenceId = await findOneAndAssignReferenceId( dataSource, Lesson, { year: this.year, key: this.lessonId }, this.userId, this.lessonReferenceId, this.lessonId ); - if (this.eventId) { - this.eventReferenceId = await findOneAndAssignReferenceId( - dataSource, Event, { id: this.eventId }, this.userId, this.eventReferenceId, this.eventId - ); - } else { - this.eventReferenceId = null; - } } finally { dataSource?.destroy(); } @@ -150,13 +143,9 @@ export class KnownAbsence implements IHasUserId { @IsOptional({ always: true }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) - @Column("int", { name: "event_id", nullable: true }) - eventId: number | null; + @Column("int", { name: "absenceType_id", nullable: true }) + absenceTypeId: number | null; - @IsOptional({ always: true }) - @Column({ nullable: true }) - @Index("known_absences_event_reference_id_idx") - eventReferenceId: number | null; @CreatedAtColumn() createdAt: Date; @@ -183,7 +172,8 @@ export class KnownAbsence implements IHasUserId { @JoinColumn({ name: 'klassReferenceId' }) klass: Klass; - @ManyToOne(() => Event, { createForeignKeyConstraints: false }) - @JoinColumn({ name: 'eventReferenceId' }) - event: Event; + @ManyToOne(() => AbsenceType, { createForeignKeyConstraints: false }) + @JoinColumn({ name: 'absenceType_id' }) + absenceType: AbsenceType; + } diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index b937ac24..8da52e17 100644 --- a/server/src/entities.module.ts +++ b/server/src/entities.module.ts @@ -43,7 +43,7 @@ import { AttendanceName } from "./db/entities/AttendanceName.entity"; import reportGroupConfig from "./entity-modules/report-group.config"; import reportGroupSessionConfig from "./entity-modules/report-group-session.config"; import transportationConfig from './entity-modules/transportation.config'; -import eventConfig from "./entity-modules/event.config"; +import absenceTypeConfig from "./entity-modules/absenceType.config"; import { Student } from "./db/entities/Student.entity"; import { Teacher } from "./db/entities/Teacher.entity"; import { registerEntityNameMap } from '@shared/entities/configs/import-file.config'; @@ -104,7 +104,7 @@ registerEntityNameMap({ BaseEntityModule.register({ entity: AbsCountEffectByUser }), BaseEntityModule.register({ entity: LessonKlassName }), BaseEntityModule.register(transportationConfig), - BaseEntityModule.register(eventConfig) + BaseEntityModule.register(absenceTypeConfig) ] }) export class EntitiesModule { } diff --git a/server/src/entity-modules/event.config.ts b/server/src/entity-modules/absenceType.config.ts similarity index 86% rename from server/src/entity-modules/event.config.ts rename to server/src/entity-modules/absenceType.config.ts index 1efd338f..0f46cc72 100644 --- a/server/src/entity-modules/event.config.ts +++ b/server/src/entity-modules/absenceType.config.ts @@ -1,10 +1,10 @@ import { BaseEntityModuleOptions } from '@shared/base-entity/interface'; import { IHeader } from '@shared/utils/exporter/types'; -import { Event } from 'src/db/entities/Event.entity'; +import { AbsenceType } from 'src/db/entities/AbsenceType.entity'; function getConfig(): BaseEntityModuleOptions { return { - entity: Event, + entity: AbsenceType, exporter: { getExportHeaders(): IHeader[] { return [ diff --git a/server/src/entity-modules/known-absence.config.ts b/server/src/entity-modules/known-absence.config.ts index e14cba73..83bce94a 100644 --- a/server/src/entity-modules/known-absence.config.ts +++ b/server/src/entity-modules/known-absence.config.ts @@ -11,14 +11,14 @@ function getConfig(): BaseEntityModuleOptions { student: { eager: false }, lesson: { eager: false }, klass: { eager: false }, - event: { eager: false }, + absenceType: { eager: false }, } }, exporter: { processReqForExport(req: CrudRequest, innerFunc) { req.options.query.join = { student: { eager: true }, - event: { eager: true }, + absenceType: { eager: true }, }; return innerFunc(req); }, @@ -27,7 +27,7 @@ function getConfig(): BaseEntityModuleOptions { { value: 'student.name', label: 'תלמידה' }, { value: 'klass.name', label: 'כיתה' }, { value: 'lesson.name', label: 'שיעור' }, - { value: 'event.name', label: 'סוג אירוע' }, + { value: 'absenceType.name', label: 'סוג אירוע' }, { value: 'reportDate', label: 'תאריך דיווח' }, { value: 'absnceCount', label: 'מספר היעדרויות' }, { value: 'absnceCode', label: 'קוד היעדרות' }, From dc4ee0bb7b2d3d36cefa42cd0f1fad6ddbaa8503 Mon Sep 17 00:00:00 2001 From: yael-miller Date: Wed, 11 Feb 2026 06:41:01 +0000 Subject: [PATCH 4/6] rename variables --- client/src/App.jsx | 2 +- client/src/entities/known-absence.jsx | 6 +++--- server/src/db/entities/KnownAbsence.entity.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 2b2ad4c4..f85db857 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -164,7 +164,7 @@ const App = () => ( {(isTransportation(permissions) || isAdmin(permissions)) && } - {(isStudentView(permissions) || isAdmin(permissions)) && } + {(isStudentView(permissions) || isAdmin(permissions)) && } diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 53e76558..964c1d00 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -24,7 +24,7 @@ const filters = [ , , , - , + , ]; const filterDefaultValues = { @@ -40,7 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => { - + @@ -67,7 +67,7 @@ const Inputs = ({ isCreate, isAdmin }) => { - + diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index eb970f25..0471011b 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -143,7 +143,7 @@ export class KnownAbsence implements IHasUserId { @IsOptional({ always: true }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) - @Column("int", { name: "absenceType_id", nullable: true }) + @Column("int", { name: "absence_type_id", nullable: true }) absenceTypeId: number | null; @@ -173,7 +173,7 @@ export class KnownAbsence implements IHasUserId { klass: Klass; @ManyToOne(() => AbsenceType, { createForeignKeyConstraints: false }) - @JoinColumn({ name: 'absenceType_id' }) + @JoinColumn({ name: 'absence_type_id' }) absenceType: AbsenceType; } From 151ec2362541f5c4296098b12f518a263b39264a Mon Sep 17 00:00:00 2001 From: yael-miller Date: Wed, 11 Feb 2026 06:44:21 +0000 Subject: [PATCH 5/6] absence_type --- client/src/domainTranslations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index c519e69e..45972b2b 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -209,7 +209,7 @@ export default { description: 'תיאור נסיעה', } }, - absenceType: { + absence_type: { name: 'אירוע |||| אירועים', fields: { ...generalResourceFieldsTranslation, From 97f51f86fe1a0bc28054a32029dd604542b93c5d Mon Sep 17 00:00:00 2001 From: yael-miller Date: Thu, 12 Feb 2026 15:20:16 +0000 Subject: [PATCH 6/6] migration: create AbsenceType and rename permission to absenceType --- client/src/App.jsx | 4 +- client/src/utils/appPermissions.js | 6 +-- .../1770908593578-AddAbsenceTypeSupport.ts | 43 +++++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 server/src/migrations/1770908593578-AddAbsenceTypeSupport.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index f85db857..30399a52 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -68,7 +68,7 @@ import paymentTrack from '@shared/components/common-entities/payment-track'; import yemotCall from '@shared/components/common-entities/yemot-call'; import { isShowUsersData, isEditPagesData, isEditPaymentTracksData, isAdmin } from "@shared/utils/permissionsUtil"; -import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation, isStudentView } from 'src/utils/appPermissions'; +import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation, isAbsenceType } from 'src/utils/appPermissions'; import YemotSimulator from "@shared/components/views/YemotSimulator"; import { RegisterPage } from '@shared/components/layout/RegisterPage'; import { LoginPage } from '@shared/components/layout/LoginPage'; @@ -164,7 +164,7 @@ const App = () => ( {(isTransportation(permissions) || isAdmin(permissions)) && } - {(isStudentView(permissions) || isAdmin(permissions)) && } + {(isAbsenceType(permissions) || isAdmin(permissions)) && } diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 78f4c8d0..c938a286 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -11,7 +11,7 @@ export const appPermissions = { approvedAbsencesBulk: 'approvedAbsencesBulk', teacherView: 'teacherView', transportation: 'transportation', - studentView: 'studentView', + absenceType: 'absenceType', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -44,6 +44,6 @@ export const useIsTeacherView = () => useHasPermission(appPermissions.teacherVie export const isTransportation = (permissions) => hasPermissionLogic(permissions, appPermissions.transportation); export const useIsTransportation = () => useHasPermission(appPermissions.transportation); -export const isStudentView = (permissions) => hasPermissionLogic(permissions, appPermissions.studentView); -export const useIsisStudentView = () => useHasPermission(appPermissions.studentView); +export const isAbsenceType = (permissions) => hasPermissionLogic(permissions, appPermissions.absenceType); +export const useIsisAbsenceType = () => useHasPermission(appPermissions.absenceType); diff --git a/server/src/migrations/1770908593578-AddAbsenceTypeSupport.ts b/server/src/migrations/1770908593578-AddAbsenceTypeSupport.ts new file mode 100644 index 00000000..3faf4c42 --- /dev/null +++ b/server/src/migrations/1770908593578-AddAbsenceTypeSupport.ts @@ -0,0 +1,43 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddAbsenceTypeSupport1770908593578 implements MigrationInterface { + name = 'AddAbsenceTypeSupport1770908593578' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + CREATE TABLE \`absenceTypes\` ( + \`id\` int NOT NULL AUTO_INCREMENT, + \`user_id\` int NOT NULL, + \`year\` int NULL, + \`name\` varchar(100) NOT NULL, + \`quota\` decimal(5, 1) NOT NULL, + \`required_labels\` text NULL, + \`created_at\` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6), + \`updated_at\` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), + UNIQUE INDEX \`IDX_351f1bb198705b306e16462dcc\` (\`user_id\`, \`name\`, \`year\`), + INDEX \`absenceTypes_users_idx\` (\`user_id\`), + PRIMARY KEY (\`id\`) + ) ENGINE = InnoDB + `); + await queryRunner.query(` + ALTER TABLE \`known_absences\` + ADD \`absence_type_id\` int NULL + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE \`known_absences\` DROP COLUMN \`absence_type_id\` + `); + await queryRunner.query(` + DROP INDEX \`absenceTypes_users_idx\` ON \`absenceTypes\` + `); + await queryRunner.query(` + DROP INDEX \`IDX_351f1bb198705b306e16462dcc\` ON \`absenceTypes\` + `); + await queryRunner.query(` + DROP TABLE \`absenceTypes\` + `); + } + +}