From 8f1993a74f317a497ca1ba044dc8a34022caf310 Mon Sep 17 00:00:00 2001
From: yaely20 <145603125+yaely20@users.noreply.github.com>
Date: Tue, 13 Jan 2026 08:32:43 +0000
Subject: [PATCH 1/4] add transportation table and creation functionality
---
client/src/App.jsx | 7 +-
client/src/domainTranslations.js | 10 ++
client/src/entities/transportation.jsx | 104 ++++++++++++++++++
client/src/utils/appPermissions.js | 4 +
.../src/db/entities/Transportation.entity.ts | 69 ++++++++++++
server/src/db/entities/User.entity.ts | 12 +-
server/src/entities.module.ts | 2 +
.../entity-modules/transportation.config.ts | 21 ++++
8 files changed, 223 insertions(+), 6 deletions(-)
create mode 100644 client/src/entities/transportation.jsx
create mode 100644 server/src/db/entities/Transportation.entity.ts
create mode 100644 server/src/entity-modules/transportation.config.ts
diff --git a/client/src/App.jsx b/client/src/App.jsx
index 7322b810..d607e217 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);
@@ -117,6 +119,7 @@ const App = () => (
{permissions => {
const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions);
const teacherView = isTeacherView(permissions) && !isAdmin(permissions);
+ const transportationOnly = isTransportation(permissions) && !isAdmin(permissions);
if (onlyInLesson) {
return (
<>
@@ -156,10 +159,10 @@ const App = () => (
} />
+ {transportationOnly && }
-
diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index 5d3660d5..bdd9fde3 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -199,6 +199,16 @@ export default {
displayName: 'שם לתעודה'
}
},
+ transportation: {
+ name: 'הסעה |||| הסעות',
+ fields: {
+ ...generalResourceFieldsTranslation,
+ key: 'שילוט',
+ year: 'שנה',
+ 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..4e94eb18
--- /dev/null
+++ b/client/src/entities/transportation.jsx
@@ -0,0 +1,104 @@
+import {
+ DateField,
+ DateTimeInput,
+ ReferenceField,
+ required,
+ TextField,
+ TextInput,
+ NumberInput,
+ maxLength,
+ TimeInput,
+ FunctionField,
+ SelectField,
+} from "react-admin";
+import { CommonDatagrid } from "@shared/components/crudContainers/CommonList";
+import { CommonRepresentation } from "@shared/components/CommonRepresentation";
+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 Datagrid = ({ isAdmin, children, ...props }) => {
+ return (
+
+ {children}
+ {isAdmin && }
+ {isAdmin && }
+
+ {
+ if (!record.departureTime) return "";
+ const date = new Date(record.departureTime);
+ return date.toLocaleTimeString("he-IL", {
+ hour: "2-digit",
+ minute: "2-digit",
+ });
+ }}
+ />
+
+
+
+ {isAdmin && }
+ {isAdmin && }
+
+ );
+};
+
+const Inputs = ({ isCreate, isAdmin }) => {
+ const unique = useUnique();
+ return (
+ <>
+ {!isCreate && isAdmin && }
+ {isAdmin && (
+
+ )}
+
+
+
+
+
+
+
+ {!isCreate && isAdmin && }
+ {!isCreate && isAdmin && }
+ >
+ );
+};
+
+const Representation = CommonRepresentation;
+
+const importer = {
+ fields: ["key", "year", "departureTime", "description"],
+};
+
+const entity = {
+ Datagrid,
+ Inputs,
+ Representation,
+ filters,
+ filterDefaultValues: {
+ year: defaultYearFilter.year,
+ },
+ 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..7ab73818
--- /dev/null
+++ b/server/src/db/entities/Transportation.entity.ts
@@ -0,0 +1,69 @@
+import {
+ Column,
+ CreateDateColumn,
+ Entity,
+ Index,
+ JoinColumn,
+ ManyToOne,
+ PrimaryGeneratedColumn,
+ UpdateDateColumn,
+} 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';
+
+@Index('transportations_users_idx', ['userId'], {})
+@Index(['userId', 'key', 'year'], { unique: true })
+@Entity('transportations')
+export class Transportation implements IHasUserId {
+ @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;
+
+ @ManyToOne(() => User, (user) => user.transportations, {
+ onDelete: 'NO ACTION',
+ onUpdate: 'NO ACTION',
+ })
+ @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..637e7177 100644
--- a/server/src/db/entities/User.entity.ts
+++ b/server/src/db/entities/User.entity.ts
@@ -8,21 +8,25 @@ import { Lesson } from "src/db/entities/Lesson.entity";
import { StudentKlass } from "src/db/entities/StudentKlass.entity";
import { Student } from "src/db/entities/Student.entity";
import { Teacher } from "src/db/entities/Teacher.entity";
+import { Transportation } from "src/db/entities/Transportation.entity";
@Entity("users")
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[];
+
+ // @OneToMany(() => Transportation, (transportation) => transportation.user)
+ transportations: Transportation[];
}
\ 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();
From 0fb2daf5e6fb53144ea5567f4ee71edd2f8b5ddb Mon Sep 17 00:00:00 2001
From: yaely20 <145603125+yaely20@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:00:31 +0000
Subject: [PATCH 2/4] update transportation fields and filters
---
client/src/App.jsx | 9 +++++++--
client/src/domainTranslations.js | 1 -
client/src/entities/transportation.jsx | 8 +++++---
server/src/db/entities/Transportation.entity.ts | 9 +++++----
server/src/db/entities/User.entity.ts | 3 ---
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/client/src/App.jsx b/client/src/App.jsx
index d607e217..e8efb5de 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -119,7 +119,6 @@ const App = () => (
{permissions => {
const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions);
const teacherView = isTeacherView(permissions) && !isAdmin(permissions);
- const transportationOnly = isTransportation(permissions) && !isAdmin(permissions);
if (onlyInLesson) {
return (
<>
@@ -159,10 +158,16 @@ const App = () => (
} />
- {transportationOnly && }
+
+ {isTransportation(permissions) && !!isAdmin(permissions)&&
+ <>
+
+ >}
+
+
diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index bdd9fde3..1a6f2815 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -204,7 +204,6 @@ export default {
fields: {
...generalResourceFieldsTranslation,
key: 'שילוט',
- year: 'שנה',
departureTime: 'שעת יציאה',
description: 'תיאור נסיעה',
}
diff --git a/client/src/entities/transportation.jsx b/client/src/entities/transportation.jsx
index 4e94eb18..42c31374 100644
--- a/client/src/entities/transportation.jsx
+++ b/client/src/entities/transportation.jsx
@@ -27,6 +27,10 @@ const filters = [
,
];
+const filterDefaultValues = {
+ year: defaultYearFilter.year,
+};
+
const Datagrid = ({ isAdmin, children, ...props }) => {
return (
@@ -95,9 +99,7 @@ const entity = {
Inputs,
Representation,
filters,
- filterDefaultValues: {
- year: defaultYearFilter.year,
- },
+ filterDefaultValues,
importer,
};
diff --git a/server/src/db/entities/Transportation.entity.ts b/server/src/db/entities/Transportation.entity.ts
index 7ab73818..9f598538 100644
--- a/server/src/db/entities/Transportation.entity.ts
+++ b/server/src/db/entities/Transportation.entity.ts
@@ -14,11 +14,16 @@ 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 {
+ async fillFields() {
+ fillDefaultYearValue(this);
+ }
+
@PrimaryGeneratedColumn({ type: 'int', name: 'id' })
id: number;
@@ -60,10 +65,6 @@ export class Transportation implements IHasUserId {
@UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
updatedAt: Date;
- @ManyToOne(() => User, (user) => user.transportations, {
- onDelete: 'NO ACTION',
- onUpdate: 'NO ACTION',
- })
@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 637e7177..19652790 100644
--- a/server/src/db/entities/User.entity.ts
+++ b/server/src/db/entities/User.entity.ts
@@ -8,7 +8,6 @@ import { Lesson } from "src/db/entities/Lesson.entity";
import { StudentKlass } from "src/db/entities/StudentKlass.entity";
import { Student } from "src/db/entities/Student.entity";
import { Teacher } from "src/db/entities/Teacher.entity";
-import { Transportation } from "src/db/entities/Transportation.entity";
@Entity("users")
export class User extends BaseUser {
@@ -27,6 +26,4 @@ export class User extends BaseUser {
// @OneToMany(() => Teacher, (teachers) => teachers.user)
teachers: Teacher[];
- // @OneToMany(() => Transportation, (transportation) => transportation.user)
- transportations: Transportation[];
}
\ No newline at end of file
From 3a28c0869e907e9025da37c59d76e2a8eb12bb70 Mon Sep 17 00:00:00 2001
From: yaely20 <145603125+yaely20@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:35:31 +0000
Subject: [PATCH 3/4] address review remarks
---
client/src/App.jsx | 7 +------
client/src/entities/transportation.jsx | 2 +-
server/src/db/entities/Transportation.entity.ts | 5 ++++-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/client/src/App.jsx b/client/src/App.jsx
index e8efb5de..dae6876c 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -158,12 +158,7 @@ const App = () => (
} />
-
- {isTransportation(permissions) && !!isAdmin(permissions)&&
- <>
-
- >}
-
+ {(isTransportation(permissions) || isAdmin(permissions)) && }
diff --git a/client/src/entities/transportation.jsx b/client/src/entities/transportation.jsx
index 42c31374..9c85ffbd 100644
--- a/client/src/entities/transportation.jsx
+++ b/client/src/entities/transportation.jsx
@@ -91,7 +91,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
const Representation = CommonRepresentation;
const importer = {
- fields: ["key", "year", "departureTime", "description"],
+ fields: ["key", "departureTime", "description"],
};
const entity = {
diff --git a/server/src/db/entities/Transportation.entity.ts b/server/src/db/entities/Transportation.entity.ts
index 9f598538..69f7a7be 100644
--- a/server/src/db/entities/Transportation.entity.ts
+++ b/server/src/db/entities/Transportation.entity.ts
@@ -4,9 +4,10 @@ import {
Entity,
Index,
JoinColumn,
- ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
+ BeforeInsert,
+ BeforeUpdate,
} from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { User } from 'src/db/entities/User.entity';
@@ -20,6 +21,8 @@ import { fillDefaultYearValue } from "@shared/utils/entity/year.util";
@Index(['userId', 'key', 'year'], { unique: true })
@Entity('transportations')
export class Transportation implements IHasUserId {
+ @BeforeInsert()
+ @BeforeUpdate()
async fillFields() {
fillDefaultYearValue(this);
}
From 40ce04cda1c2a218b06c921a0955bbcabcbf6b7c Mon Sep 17 00:00:00 2001
From: yaely20 <145603125+yaely20@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:58:51 +0000
Subject: [PATCH 4/4] timeInput
---
client/src/entities/transportation.jsx | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/client/src/entities/transportation.jsx b/client/src/entities/transportation.jsx
index 9c85ffbd..aede2528 100644
--- a/client/src/entities/transportation.jsx
+++ b/client/src/entities/transportation.jsx
@@ -7,18 +7,16 @@ import {
TextInput,
NumberInput,
maxLength,
- TimeInput,
- FunctionField,
SelectField,
} from "react-admin";
import { CommonDatagrid } from "@shared/components/crudContainers/CommonList";
-import { CommonRepresentation } from "@shared/components/CommonRepresentation";
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,
@@ -38,18 +36,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
{isAdmin && }
{isAdmin && }
- {
- if (!record.departureTime) return "";
- const date = new Date(record.departureTime);
- return date.toLocaleTimeString("he-IL", {
- hour: "2-digit",
- minute: "2-digit",
- });
- }}
- />
-
+
{isAdmin && }
@@ -72,7 +59,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
)}
-
+
{
);
};
-const Representation = CommonRepresentation;
+const Representation = 'key';
const importer = {
fields: ["key", "departureTime", "description"],