From 32a0e73c4aa34083b34c1f8525761e0b598b6f3f Mon Sep 17 00:00:00 2001 From: yael-miller Date: Mon, 1 Jun 2026 14:05:39 +0000 Subject: [PATCH] Add file upload capability for absence reports --- .../StudentView/student-event-report.jsx | 6 ++++- client/src/domainTranslations.js | 2 ++ client/src/entities/absenceType.jsx | 12 ++++++--- client/src/entities/known-absence.jsx | 12 ++++++--- server/src/db/entities/AbsenceType.entity.ts | 4 +++ server/src/db/entities/KnownAbsence.entity.ts | 3 +++ .../1780311399994-addFileToKnownAbsence.ts | 27 +++++++++++++++++++ .../1780316945862-AddFileRequiredColumn.ts | 22 +++++++++++++++ 8 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 server/src/migrations/1780311399994-addFileToKnownAbsence.ts create mode 100644 server/src/migrations/1780316945862-AddFileRequiredColumn.ts diff --git a/client/src/components/StudentView/student-event-report.jsx b/client/src/components/StudentView/student-event-report.jsx index 3ed978b2..dbe314f3 100644 --- a/client/src/components/StudentView/student-event-report.jsx +++ b/client/src/components/StudentView/student-event-report.jsx @@ -24,6 +24,7 @@ import CommonAutocompleteInput from '@shared/components/fields/CommonAutocomplet import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil'; import SignatureInput from '@shared/components/fields/signature/SignatureInput'; import { useObjectStore } from "src/utils/storeUtil"; +import { CommonFileInput } from '@shared/components/fields/CommonFileInput'; const DynamicFields = ({ absenceType, isLoading }) => { if (isLoading) return ; @@ -59,7 +60,9 @@ const extractBasePayload = (rootValues, reportValues, userId, studentId, absence isApproved: true, reason: finalReason, absenceTypeId: rootValues.absenceTypeId, - absnceCode: rootValues.absnceCode + absnceCode: rootValues.absnceCode, + fileData: rootValues.fileData + }; }; @@ -208,6 +211,7 @@ const StudentEventReport = (props) => { + diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index 9f0cc81e..cdfdbb07 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -142,6 +142,7 @@ export default { comment: 'הערה', isApproved: 'מאושר', absenceTypeId: 'סוג אירוע', + fileData: 'קובץ מצורף', } }, lesson: { @@ -217,6 +218,7 @@ export default { name: 'שם האירוע', quota: 'מכסה שנתית', requiredLabels: 'שדות חובה לדיווח', + isFileRequired:'חובה לצרף קובץ', } }, text: { diff --git a/client/src/entities/absenceType.jsx b/client/src/entities/absenceType.jsx index dfb876c0..5f316b64 100644 --- a/client/src/entities/absenceType.jsx +++ b/client/src/entities/absenceType.jsx @@ -10,6 +10,8 @@ import { SelectField, ArrayInput, SimpleFormIterator, + BooleanInput, + BooleanField, } from "react-admin"; import { CommonDatagrid } from "@shared/components/crudContainers/CommonList"; import { getResourceComponents } from "@shared/components/crudContainers/CommonEntity"; @@ -38,9 +40,10 @@ const Datagrid = ({ isAdmin, children, ...props }) => { + - + {isAdmin && } {isAdmin && } @@ -53,8 +56,8 @@ const Inputs = ({ isCreate, isAdmin }) => { return ( <> {!isCreate && isAdmin && } - {isAdmin && ( )} - + {isAdmin && ()} + @@ -62,6 +65,7 @@ const Inputs = ({ isCreate, isAdmin }) => { + {!isCreate && isAdmin && } {!isCreate && isAdmin && } @@ -72,7 +76,7 @@ const Inputs = ({ isCreate, isAdmin }) => { const Representation = 'name'; const importer = { - fields: ["name", "quota", "requiredLabels", "year"], + fields: ["name", "quota", "requiredLabels", "year", "isFileRequired"], }; const entity = { diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx index 964c1d00..1368b4ab 100644 --- a/client/src/entities/known-absence.jsx +++ b/client/src/entities/known-absence.jsx @@ -10,6 +10,9 @@ import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDat import { BulkApproveAbsences } from 'src/components/BulkApproveAbsences'; import { commonAdminFilters } from '@shared/components/fields/PermissionFilter'; +import CommonFileField from '@shared/components/fields/CommonFileField'; +import { CommonFileDownloadButton } from '@shared/components/fields/CommonFilePreviewButton'; + const filters = [ ...commonAdminFilters, , @@ -50,6 +53,8 @@ const Datagrid = ({ isAdmin, children, ...props }) => { + + {isAdmin && } @@ -74,7 +79,8 @@ const Inputs = ({ isCreate, isAdmin }) => { - + + {!isCreate && isAdmin && } {!isCreate && isAdmin && } @@ -82,7 +88,7 @@ const Inputs = ({ isCreate, isAdmin }) => { } const importer = { - fields: ['studentTz', 'klassId', 'lessonId', 'absenceTypeId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'], + fields: ['studentTz', 'klassId', 'lessonId', 'absenceTypeId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved', 'fileData'], } const additionalListActions = [ @@ -102,4 +108,4 @@ const entity = { additionalListActions, }; -export default getResourceComponents(entity); +export default getResourceComponents(entity); \ No newline at end of file diff --git a/server/src/db/entities/AbsenceType.entity.ts b/server/src/db/entities/AbsenceType.entity.ts index 40d67e60..3a6aecab 100644 --- a/server/src/db/entities/AbsenceType.entity.ts +++ b/server/src/db/entities/AbsenceType.entity.ts @@ -56,6 +56,10 @@ export class AbsenceType implements IHasUserId { }) requiredLabels: string[] | null; + @IsOptional({ always: true }) + @Column('boolean', { name: 'is_file_required', default: false }) + isFileRequired: boolean; + @CreatedAtColumn() createdAt: Date; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 0471011b..f029d689 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -26,6 +26,7 @@ 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"; +import { FileData } from "@shared/entities/Image.entity"; @Index("known_users_idx", ["userId"], {}) @Index(['studentReferenceId', 'year']) @@ -146,6 +147,8 @@ export class KnownAbsence implements IHasUserId { @Column("int", { name: "absence_type_id", nullable: true }) absenceTypeId: number | null; + @Column(() => FileData) + fileData: FileData; @CreatedAtColumn() createdAt: Date; diff --git a/server/src/migrations/1780311399994-addFileToKnownAbsence.ts b/server/src/migrations/1780311399994-addFileToKnownAbsence.ts new file mode 100644 index 00000000..364acbbe --- /dev/null +++ b/server/src/migrations/1780311399994-addFileToKnownAbsence.ts @@ -0,0 +1,27 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class addFileToKnownAbsence1780311399994 implements MigrationInterface { + name = 'addFileToKnownAbsence1780311399994' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE \`known_absences\` + ADD \`fileDataSrc\` mediumtext NOT NULL + `); + await queryRunner.query(` + ALTER TABLE \`known_absences\` + ADD \`fileDataTitle\` text NOT NULL + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE \`known_absences\` DROP COLUMN \`fileDataTitle\` + `); + await queryRunner.query(` + ALTER TABLE \`known_absences\` DROP COLUMN \`fileDataSrc\` + `); + + } + +} diff --git a/server/src/migrations/1780316945862-AddFileRequiredColumn.ts b/server/src/migrations/1780316945862-AddFileRequiredColumn.ts new file mode 100644 index 00000000..4b7698c2 --- /dev/null +++ b/server/src/migrations/1780316945862-AddFileRequiredColumn.ts @@ -0,0 +1,22 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddFileRequiredColumn1780316945862 implements MigrationInterface { + name = 'AddFileRequiredColumn1780316945862' + + public async up(queryRunner: QueryRunner): Promise { + + await queryRunner.query(` + ALTER TABLE \`absenceTypes\` + ADD \`is_file_required\` tinyint NOT NULL DEFAULT 0 + `); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(` + ALTER TABLE \`absenceTypes\` DROP COLUMN \`is_file_required\` + `); + + + } + +}