Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 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";
Expand Down Expand Up @@ -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, 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';
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -162,6 +164,7 @@ const App = () => (
</Resource>
<Resource name="student_klass" {...studentKlass} options={{ menuGroup: 'data' }} icon={WorkspacesIcon} />
{(isTransportation(permissions) || isAdmin(permissions)) && <Resource name="transportation" {...transportation} options={{ menuGroup: 'data' }} icon={DirectionsBusIcon} />}
{(isAbsenceType(permissions) || isAdmin(permissions)) && <Resource name="absence_type" {...absenceType} options={{ menuGroup: 'data' }} icon={CelebrationIcon} />}
<Resource name="att_report_with_report_month" {...attReportWithReportMonth} options={{ menuGroup: 'data' }} icon={ViewListIcon} />
<Resource name="grade" {...grade} options={{ menuGroup: 'data' }} icon={GradingIcon} />
<Resource name="known_absence" {...knownAbsence} options={{ menuGroup: 'data' }} icon={PlaylistRemoveIcon} />
Expand Down
10 changes: 10 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export default {
reason: 'סיבה',
comment: 'הערה',
isApproved: 'מאושר',
absenceTypeId: 'סוג אירוע',
}
},
lesson: {
Expand Down Expand Up @@ -208,6 +209,15 @@ export default {
description: 'תיאור נסיעה',
}
},
absence_type: {
name: 'אירוע |||| אירועים',
fields: {
...generalResourceFieldsTranslation,
name: 'שם האירוע',
quota: 'מכסה שנתית',
requiredLabels: 'שדות חובה לדיווח',
}
},
text: {
name: 'הודעה |||| הודעות - טבלת אדמין',
fields: {
Expand Down
87 changes: 87 additions & 0 deletions client/src/entities/absenceType.jsx
Original file line number Diff line number Diff line change
@@ -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,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<TextInput source="name:$cont" />,
];

const filterDefaultValues = {
year: defaultYearFilter.year,
};

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}

<TextField source="name" />
<TextField source="quota" />
<SelectField source="year" choices={yearChoices} />

<TextField source="requiredLabels"/>

{isAdmin && <DateField source="createdAt" disabled />}
{isAdmin && <DateField source="updatedAt" disabled />}
</CommonDatagrid>
);
};

const Inputs = ({ isCreate, isAdmin }) => {
const unique = useUnique();
return (
<>
{!isCreate && isAdmin && <TextInput source="id" disabled />}
{isAdmin && ( <CommonReferenceInput source="userId" reference="user" validate={required()}/> )}
<TextInput source="name" validate={[required(), maxLength(100)]}/>
<NumberInput source="quota" step={1} validate={[required()]} />
<CommonAutocompleteInput source="year" choices={yearChoices} validate={required()} defaultValue={defaultYearFilter.year} />
<ArrayInput source="requiredLabels">
<SimpleFormIterator>
<TextInput fullWidth />
</SimpleFormIterator>
</ArrayInput>

{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
);
};

const Representation = 'name';

const importer = {
fields: ["name", "quota", "requiredLabels", "year"],
};

const entity = {
Datagrid,
Inputs,
Representation,
filters,
filterDefaultValues,
importer,
};

export default getResourceComponents(entity);
7 changes: 6 additions & 1 deletion client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const filters = [
<TextInput source="comment:$cont" label="הערות" />,
<NullableBooleanInput source="isApproved" />,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonReferenceInputFilter source="absenceTypeId" reference="absence_type" dynamicFilter={filterByUserIdAndYear} />,
];

const filterDefaultValues = {
Expand All @@ -39,6 +40,9 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
<MultiReferenceField source="studentReferenceId" sortBy="student.name" optionalSource="studentTz" reference="student" optionalTarget="tz" />
<MultiReferenceField source="klassReferenceId" sortBy="klass.name" optionalSource="klassId" reference="klass" optionalTarget="key" />
<MultiReferenceField source="lessonReferenceId" sortBy="lesson.name" optionalSource="lessonId" reference="lesson" optionalTarget="key" />
<ReferenceField source="absenceTypeId" reference="absence_type">
<TextField source="name" />
</ReferenceField>
<DateField source="reportDate" />
<CommonHebrewDateField source="reportDate" />
<NumberField source="absnceCount" />
Expand All @@ -63,6 +67,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<CommonReferenceInput source="studentReferenceId" reference="student_by_year" validate={required()} dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="klassReferenceId" reference="klass" validate={required()} dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" dynamicFilter={filterByUserIdAndYear} optionText={lessonKeyAndName} />
<CommonReferenceInput source="absenceTypeId" reference="absence_type" dynamicFilter={filterByUserIdAndYear}/>
<DateInput source="reportDate" validate={required()} />
<NumberInput source="absnceCount" validate={required()} />
<NumberInput source="absnceCode" />
Expand All @@ -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', 'absenceTypeId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'],
}

const additionalListActions = [
Expand Down
4 changes: 4 additions & 0 deletions client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const appPermissions = {
approvedAbsencesBulk: 'approvedAbsencesBulk',
teacherView: 'teacherView',
transportation: 'transportation',
absenceType: 'absenceType',
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand Down Expand Up @@ -43,3 +44,6 @@ export const useIsTeacherView = () => useHasPermission(appPermissions.teacherVie
export const isTransportation = (permissions) => hasPermissionLogic(permissions, appPermissions.transportation);
export const useIsTransportation = () => useHasPermission(appPermissions.transportation);

export const isAbsenceType = (permissions) => hasPermissionLogic(permissions, appPermissions.absenceType);
export const useIsisAbsenceType = () => useHasPermission(appPermissions.absenceType);

67 changes: 67 additions & 0 deletions server/src/db/entities/AbsenceType.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
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('absenceTypes_users_idx', ['userId'], {})
@Index(['userId', 'name', 'year'], { unique: true })
@Entity('absenceTypes')
export class AbsenceType 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: 'simple-array',
name: 'required_labels',
nullable: true,
})
Comment thread
buzz-code marked this conversation as resolved.
Resolved
requiredLabels: string[] | null;

@CreatedAtColumn()
createdAt: Date;

@UpdatedAtColumn()
updatedAt: Date;

@JoinColumn([{ name: 'user_id', referencedColumnName: 'id' }])
user: User;
}
15 changes: 14 additions & 1 deletion server/src/db/entities/KnownAbsence.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 { 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";
Expand All @@ -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, AbsenceType]);

this.studentReferenceId = await findOneAndAssignReferenceId(
dataSource, Student, { tz: this.studentTz }, this.userId, this.studentReferenceId, this.studentTz
Expand Down Expand Up @@ -139,6 +140,13 @@ export class KnownAbsence implements IHasUserId {
@Column({ default: true })
isApproved: boolean;

@IsOptional({ always: true })
@NumberType
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column("int", { name: "absence_type_id", nullable: true })
absenceTypeId: number | null;


@CreatedAtColumn()
createdAt: Date;

Expand All @@ -163,4 +171,9 @@ export class KnownAbsence implements IHasUserId {
@ManyToOne(() => Klass, { createForeignKeyConstraints: false })
@JoinColumn({ name: 'klassReferenceId' })
klass: Klass;

@ManyToOne(() => AbsenceType, { createForeignKeyConstraints: false })
@JoinColumn({ name: 'absence_type_id' })
absenceType: AbsenceType;

}
2 changes: 2 additions & 0 deletions server/src/entities.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 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';
Expand Down Expand Up @@ -103,6 +104,7 @@ registerEntityNameMap({
BaseEntityModule.register({ entity: AbsCountEffectByUser }),
BaseEntityModule.register({ entity: LessonKlassName }),
BaseEntityModule.register(transportationConfig),
BaseEntityModule.register(absenceTypeConfig)
]
})
export class EntitiesModule { }
21 changes: 21 additions & 0 deletions server/src/entity-modules/absenceType.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { BaseEntityModuleOptions } from '@shared/base-entity/interface';
import { IHeader } from '@shared/utils/exporter/types';
import { AbsenceType } from 'src/db/entities/AbsenceType.entity';

function getConfig(): BaseEntityModuleOptions {
return {
entity: AbsenceType,
exporter: {
getExportHeaders(): IHeader[] {
return [
{ value: 'name', label: 'סוג חיסור' },
{ value: 'year', label: 'שנה' },
{ value: 'quota', label: 'מכסה שנתית' },
{ value: 'requiredLabels', label: 'שדות חובה לדיווח' },
];
},
},
};
}

export default getConfig();
3 changes: 3 additions & 0 deletions server/src/entity-modules/known-absence.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ function getConfig(): BaseEntityModuleOptions {
student: { eager: false },
lesson: { eager: false },
klass: { eager: false },
absenceType: { eager: false },
}
},
exporter: {
processReqForExport(req: CrudRequest, innerFunc) {
req.options.query.join = {
student: { eager: true },
absenceType: { eager: true },
};
return innerFunc(req);
},
Expand All @@ -25,6 +27,7 @@ function getConfig(): BaseEntityModuleOptions {
{ value: 'student.name', label: 'תלמידה' },
{ value: 'klass.name', label: 'כיתה' },
{ value: 'lesson.name', label: 'שיעור' },
{ value: 'absenceType.name', label: 'סוג אירוע' },
{ value: 'reportDate', label: 'תאריך דיווח' },
{ value: 'absnceCount', label: 'מספר היעדרויות' },
{ value: 'absnceCode', label: 'קוד היעדרות' },
Expand Down
Loading