diff --git a/client/src/App.jsx b/client/src/App.jsx
index 7322b810..dae6876c 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -35,6 +35,7 @@ import lesson from "src/entities/lesson";
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 studentKlassesReport from "src/entities/student-klasses-report";
import reportMonth from "src/entities/report-month";
import teacherReportStatus from "src/entities/teacher-report-status";
@@ -64,7 +65,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 } from 'src/utils/appPermissions';
+import { isLessonSignature, isOnlyInLessonReport, isTeacherView, isTransportation } 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';
@@ -104,6 +105,7 @@ import PermContactCalendarIcon from '@mui/icons-material/PermContactCalendar';
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';
const i18nProvider = getI18nProvider(domainTranslations);
@@ -156,6 +158,7 @@ const App = () => (
} />
+ {(isTransportation(permissions) || isAdmin(permissions)) && }
diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index 5d3660d5..1a6f2815 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -199,6 +199,15 @@ export default {
displayName: 'שם לתעודה'
}
},
+ transportation: {
+ name: 'הסעה |||| הסעות',
+ fields: {
+ ...generalResourceFieldsTranslation,
+ key: 'שילוט',
+ departureTime: 'שעת יציאה',
+ description: 'תיאור נסיעה',
+ }
+ },
text: {
name: 'הודעה |||| הודעות - טבלת אדמין',
fields: {
diff --git a/client/src/entities/transportation.jsx b/client/src/entities/transportation.jsx
new file mode 100644
index 00000000..aede2528
--- /dev/null
+++ b/client/src/entities/transportation.jsx
@@ -0,0 +1,93 @@
+import {
+ DateField,
+ DateTimeInput,
+ ReferenceField,
+ required,
+ TextField,
+ TextInput,
+ NumberInput,
+ maxLength,
+ SelectField,
+} 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";
+import CommonTimeInput from "@shared/components/fields/CommonTimeInput";
+
+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 = 'key';
+
+const importer = {
+ fields: ["key", "departureTime", "description"],
+};
+
+const entity = {
+ Datagrid,
+ Inputs,
+ Representation,
+ filters,
+ filterDefaultValues,
+ importer,
+};
+
+export default getResourceComponents(entity);
diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js
index b4464197..eef789d7 100644
--- a/client/src/utils/appPermissions.js
+++ b/client/src/utils/appPermissions.js
@@ -10,6 +10,7 @@ export const appPermissions = {
lessonSignature: 'lessonSignature',
approvedAbsencesBulk: 'approvedAbsencesBulk',
teacherView: 'teacherView',
+ transportation: 'transportation',
};
export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
@@ -39,3 +40,6 @@ export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.a
export const isTeacherView = (permissions) => hasPermissionLogic(permissions, appPermissions.teacherView);
export const useIsTeacherView = () => useHasPermission(appPermissions.teacherView);
+export const isTransportation = (permissions) => hasPermissionLogic(permissions, appPermissions.transportation);
+export const useIsTransportation = () => useHasPermission(appPermissions.transportation);
+
diff --git a/server/src/db/entities/Transportation.entity.ts b/server/src/db/entities/Transportation.entity.ts
new file mode 100644
index 00000000..69f7a7be
--- /dev/null
+++ b/server/src/db/entities/Transportation.entity.ts
@@ -0,0 +1,73 @@
+import {
+ Column,
+ CreateDateColumn,
+ Entity,
+ Index,
+ JoinColumn,
+ PrimaryGeneratedColumn,
+ UpdateDateColumn,
+ BeforeInsert,
+ BeforeUpdate,
+} from 'typeorm';
+import { IHasUserId } from '@shared/base-entity/interface';
+import { User } from 'src/db/entities/User.entity';
+import { IsOptional } 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";
+
+@Index('transportations_users_idx', ['userId'], {})
+@Index(['userId', 'key', 'year'], { unique: true })
+@Entity('transportations')
+export class Transportation 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;
+
+ @IsOptional({ groups: [CrudValidationGroups.UPDATE] })
+ @NumberType
+ @IsNumber({ maxDecimalPlaces: 0 }, { always: true })
+ @IsUniqueCombination(['userId', 'year'], [Transportation, User], {
+ always: true,
+ })
+ @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] })
+ @Column('int', { name: 'key' })
+ key: number;
+
+ @IsOptional({ groups: [CrudValidationGroups.UPDATE] })
+ @StringType
+ @MaxLength(500, { always: true })
+ @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] })
+ @IsOptional({ always: true })
+ @StringType
+ @MaxLength(255, { always: true })
+ @Column('varchar', { name: 'departure_time', nullable: true, length: 255 })
+ departureTime: string | null;
+
+ @IsOptional({ always: true })
+ @StringType
+ @MaxLength(1000, { always: true })
+ @Column('varchar', { name: 'description', nullable: true, length: 1000 })
+ description: string | null;
+
+ @CreateDateColumn({ name: 'created_at', type: 'timestamp' })
+ createdAt: Date;
+
+ @UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
+ updatedAt: Date;
+
+ @JoinColumn([{ name: 'user_id', referencedColumnName: 'id' }])
+ user: User;
+}
diff --git a/server/src/db/entities/User.entity.ts b/server/src/db/entities/User.entity.ts
index 70834f96..19652790 100644
--- a/server/src/db/entities/User.entity.ts
+++ b/server/src/db/entities/User.entity.ts
@@ -13,16 +13,17 @@ import { Teacher } from "src/db/entities/Teacher.entity";
export class User extends BaseUser {
// @OneToMany(() => Grade, (grades) => grades.user)
grades: Grade[];
-
+
// @OneToMany(() => KlassType, (klassTypes) => klassTypes.user)
klassTypes: KlassType[];
-
+
// @OneToMany(() => KnownAbsence, (knownAbsences) => knownAbsences.user)
knownAbsences: KnownAbsence[];
-
+
// @OneToMany(() => Student, (students) => students.user)
students: Student[];
-
+
// @OneToMany(() => Teacher, (teachers) => teachers.user)
teachers: Teacher[];
+
}
\ No newline at end of file
diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts
index c23b8e21..5867a683 100644
--- a/server/src/entities.module.ts
+++ b/server/src/entities.module.ts
@@ -42,6 +42,7 @@ import { StudentSpeciality } from "./db/view-entities/StudentSpeciality.entity";
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';
@Module({
imports: [
@@ -86,6 +87,7 @@ import reportGroupSessionConfig from "./entity-modules/report-group-session.conf
BaseEntityModule.register({ entity: GradeEffectByUser }),
BaseEntityModule.register({ entity: AbsCountEffectByUser }),
BaseEntityModule.register({ entity: LessonKlassName }),
+ BaseEntityModule.register(transportationConfig),
]
})
export class EntitiesModule { }
diff --git a/server/src/entity-modules/transportation.config.ts b/server/src/entity-modules/transportation.config.ts
new file mode 100644
index 00000000..97946af3
--- /dev/null
+++ b/server/src/entity-modules/transportation.config.ts
@@ -0,0 +1,21 @@
+import { BaseEntityModuleOptions } from '@shared/base-entity/interface';
+import { IHeader } from '@shared/utils/exporter/types';
+import { Transportation } from 'src/db/entities/Transportation.entity';
+
+function getConfig(): BaseEntityModuleOptions {
+ return {
+ entity: Transportation,
+ exporter: {
+ getExportHeaders(): IHeader[] {
+ return [
+ { value: 'key', label: 'שילוט' },
+ { value: 'year', label: 'שנה' },
+ { value: 'departureTime', label: 'שעת יציאה' },
+ { value: 'description', label: 'תיאור נסיעה' },
+ ];
+ },
+ },
+ };
+}
+
+export default getConfig();