diff --git a/client/src/components/StudentView/student-event-report.jsx b/client/src/components/StudentView/student-event-report.jsx
index e7668bdf..491c4964 100644
--- a/client/src/components/StudentView/student-event-report.jsx
+++ b/client/src/components/StudentView/student-event-report.jsx
@@ -23,7 +23,8 @@ import { defaultYearFilter } from '@shared/utils/yearFilter';
import { CommonYearInput } from '@shared/components/fields/CommonYear';
import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil';
import SignatureInput from '@shared/components/fields/signature/SignatureInput';
-import { useObjectStore } from 'src/utils/storeUtil';
+import { useObjectStore } from "src/utils/storeUtil";
+import { CommonFileInput } from '@shared/components/fields/CommonFileInput';
const DynamicFields = ({ absenceType, isLoading }) => {
if (isLoading) return ;
@@ -63,6 +64,8 @@ const extractBasePayload = (rootValues, reportValues, userId, studentId, absence
reason: finalReason,
absenceTypeId: rootValues.absenceTypeId,
absnceCode: rootValues.absnceCode,
+ fileData: rootValues.fileData
+
};
};
@@ -230,6 +233,7 @@ const StudentEventReport = (props) => {
+
diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index ea253bb2..1d497c85 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -144,7 +144,8 @@ export default {
comment: 'הערה',
isApproved: 'מאושר',
absenceTypeId: 'סוג אירוע',
- },
+ fileData: 'קובץ מצורף',
+ }
},
lesson: {
name: 'שיעור |||| שיעורים',
@@ -219,6 +220,7 @@ export default {
name: 'שם האירוע',
quota: 'מכסה שנתית',
requiredLabels: 'שדות חובה לדיווח',
+ isFileRequired:'חובה לצרף קובץ',
},
},
student_klass_report: {
diff --git a/client/src/entities/absenceType.jsx b/client/src/entities/absenceType.jsx
index 38c1d82d..b7f2ee86 100644
--- a/client/src/entities/absenceType.jsx
+++ b/client/src/entities/absenceType.jsx
@@ -8,7 +8,9 @@ import {
NumberInput,
maxLength,
ArrayInput,
- SimpleFormIterator
+ SimpleFormIterator,
+ BooleanInput,
+ BooleanField,
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
@@ -38,6 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
+
@@ -61,6 +64,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
@@ -71,7 +75,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
const Representation = CommonRepresentation;
const importer = {
- fields: ['name', 'quota', 'requiredLabels', 'year'],
+ fields: ['name', 'quota', 'requiredLabels', 'year', 'isFileRequired'],
};
const entity = {
@@ -83,4 +87,4 @@ const entity = {
importer,
};
-export default getResourceComponents(entity);
+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 25b0cb43..93caaf99 100644
--- a/client/src/entities/known-absence.jsx
+++ b/client/src/entities/known-absence.jsx
@@ -29,6 +29,9 @@ import { BulkApproveAbsences } from 'src/components/BulkApproveAbsences';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { useIsAbsenceType } from 'src/utils/appPermissions';
+import CommonFileField from '@shared/components/fields/CommonFileField';
+import { CommonFileDownloadButton } from '@shared/components/fields/CommonFilePreviewButton';
+
const filters = [
...commonAdminFilters,
{
+
+
{!isPreview && }
{isAdmin && }
@@ -142,6 +147,8 @@ const Inputs = ({ isCreate, isAdmin }) => {
+
+
{!isCreate && isAdmin && }
@@ -155,6 +162,7 @@ const importer = {
'studentTz',
'klassId',
'lessonId',
+ 'absenceTypeId',
'reportDate',
'absnceCount',
'absnceCode',
@@ -162,6 +170,7 @@ const importer = {
'reason',
'comment',
'isApproved',
+ 'fileData',
],
};
@@ -178,4 +187,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 89fdb6ea..11ac8a68 100644
--- a/server/src/db/entities/AbsenceType.entity.ts
+++ b/server/src/db/entities/AbsenceType.entity.ts
@@ -48,6 +48,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 5f3b00fe..94f2e36e 100644
--- a/server/src/db/entities/KnownAbsence.entity.ts
+++ b/server/src/db/entities/KnownAbsence.entity.ts
@@ -8,26 +8,27 @@ import {
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
-} from 'typeorm';
-import { IHasUserId } from '@shared/base-entity/interface';
-import { User } from 'src/db/entities/User.entity';
-import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity/foreignKey.util';
-import { Student } from './Student.entity';
-import { IsOptional, ValidateIf } from 'class-validator';
-import { CrudValidationGroups } from '@dataui/crud';
-import { IsBoolean, IsDate, IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he';
-import { fillDefaultYearValue } from '@shared/utils/entity/year.util';
-import { fillDefaultReportDateValue } from '@shared/utils/entity/deafultValues.util';
-import { Klass } from './Klass.entity';
-import { Lesson } from './Lesson.entity';
-import { KlassType } from './KlassType.entity';
-import { Teacher } from './Teacher.entity';
-import { AbsenceType } from './AbsenceType.entity';
-import { BooleanType, 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';
-
-@Index('known_users_idx', ['userId'], {})
+} from "typeorm";
+import { IHasUserId } from "@shared/base-entity/interface";
+import { User } from "src/db/entities/User.entity";
+import { findOneAndAssignReferenceId, getDataSource } from "@shared/utils/entity/foreignKey.util";
+import { Student } from "./Student.entity";
+import { IsOptional, ValidateIf } from "class-validator";
+import { CrudValidationGroups } from "@dataui/crud";
+import { IsBoolean, IsDate, IsNotEmpty, IsNumber, MaxLength } from "@shared/utils/validation/class-validator-he";
+import { fillDefaultYearValue } from "@shared/utils/entity/year.util";
+import { fillDefaultReportDateValue } from "@shared/utils/entity/deafultValues.util";
+import { Klass } from "./Klass.entity";
+import { Lesson } from "./Lesson.entity";
+import { KlassType } from "./KlassType.entity";
+import { Teacher } from "./Teacher.entity";
+import { AbsenceType } from "./AbsenceType.entity";
+import { BooleanType, 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'])
@Index('known_absences_lookup_idx', ['userId', 'year', 'isApproved', 'studentReferenceId'])
@Entity('known_absences')
@@ -176,6 +177,9 @@ export class KnownAbsence implements IHasUserId {
@Column('int', { name: 'absence_type_id', nullable: true })
absenceTypeId: number | null;
+ @Column(() => FileData)
+ fileData: FileData;
+
@CreatedAtColumn()
createdAt: Date;
@@ -204,4 +208,4 @@ export class KnownAbsence implements IHasUserId {
@ManyToOne(() => AbsenceType, { createForeignKeyConstraints: false })
@JoinColumn({ name: 'absence_type_id' })
absenceType: AbsenceType;
-}
+}
\ No newline at end of file
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\`
+ `);
+
+
+ }
+
+}