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
11 changes: 11 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import klass from 'src/entities/klass';
import klassType from 'src/entities/klass-type';
import knownAbsence from 'src/entities/known-absence';
import lesson from 'src/entities/lesson';
import lessonSchedule from 'src/entities/lesson-schedule';
import studentKlass from 'src/entities/student-klass';
import student from 'src/entities/student';
import teacher from 'src/entities/teacher';
Expand Down Expand Up @@ -59,6 +60,7 @@ import {
isTeacherView,
isTransportation,
isAbsenceType,
isLessonSchedule,
isStudentView,
isStudentAttendanceByKlass,
} from 'src/utils/appPermissions';
Expand All @@ -70,6 +72,7 @@ import ApprovedAbsencesUpload from 'src/components/ApprovedAbsencesUpload';
import BadgeIcon from '@mui/icons-material/Badge';
import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircle';
import SchoolIcon from '@mui/icons-material/School';
import EventNoteIcon from '@mui/icons-material/EventNote';
import PortraitIcon from '@mui/icons-material/Portrait';
import WorkspacesIcon from '@mui/icons-material/Workspaces';
import GroupWorkIcon from '@mui/icons-material/GroupWork';
Expand Down Expand Up @@ -157,6 +160,14 @@ const App = () => (
<Resource name="klass_type" {...klassType} options={{ menuGroup: 'data' }} icon={CategoryIcon} />
<Resource name="klass" {...klass} options={{ menuGroup: 'data' }} icon={SupervisedUserCircleIcon} />
<Resource name="lesson" {...lesson} options={{ menuGroup: 'data' }} icon={SchoolIcon} />
{isLessonSchedule(permissions) && (
<Resource
name="lesson_schedule"
{...lessonSchedule}
options={{ menuGroup: 'data' }}
icon={EventNoteIcon}
/>
)}
<Resource name="student" {...student} options={{ menuGroup: 'data' }} icon={PortraitIcon}>
<Route path="student-attendance" element={<StudentAttendanceList />} />
{isStudentAttendanceByKlass(permissions) && (
Expand Down
91 changes: 91 additions & 0 deletions client/src/components/LessonScheduleImportButton.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import { useCallback, useState } from 'react';
import { TextField, useDataProvider } from 'react-admin';
import { ImportButton } from '@shared/components/import/ImportButton';
import { PreviewListWithSavingDialog } from '@shared/components/import/PreviewListWithSavingDialog';
import { useSavableData } from '@shared/components/import/util';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';

const RESOURCE = 'lesson_schedule';

const fields = ['organizationalYear', 'startTime', 'klassId', 'scheduleDate', 'lessonGroupCode', 'teacherId'];

const PreviewDatagrid = ({ children, ...props }) => (
<CommonDatagrid {...props} bulkActionButtons={false}>
{children}
<TextField source="organizationalYear" label="שנה אירגונית" />
<TextField source="startTime" label="משעה" />
<TextField source="scheduleDate" label="תאריך" />
<TextField source="klassId" label="התמחות" />
<TextField source="lessonId" label="שיעור" />
<TextField source="groupNumber" label="קבוצה" />
<TextField source="teacherId" label="ת. זהות מורה" />
</CommonDatagrid>
);

// The excel column "מספר שעור + קבוצה" combines two values (e.g. "7771109-02")
// that map to two separate entity fields, so it must be split before saving.
const splitLessonGroupCode = (row) => {
const { lessonGroupCode, teacherId, ...rest } = row;
const match = /^(\d+)-(\d+)$/.exec(String(lessonGroupCode ?? '').trim());
return {
...rest,
lessonId: match ? Number(match[1]) : undefined,
groupNumber: match ? Number(match[2]) : undefined,
teacherId: teacherId != null && teacherId !== '' ? String(teacherId) : undefined,
};
};

// This file is uploaded daily, so re-importing a date should replace that
// date's rows rather than duplicate them. Deletion runs only once the admin
// confirms the save (not at parse/preview time) to avoid data loss on cancel.
const useReplaceDatesPreSaveHook = () => {
const dataProvider = useDataProvider();
return useCallback(
async (data) => {
const scheduleDates = [...new Set(data.map((row) => row.scheduleDate).filter(Boolean))];
const idsToDelete = [];
for (const scheduleDate of scheduleDates) {
const { data: existing } = await dataProvider.getList(RESOURCE, {
filter: { scheduleDate },
pagination: { page: 1, perPage: 10000 },
sort: { field: 'id', order: 'ASC' },
});
idsToDelete.push(...existing.map((item) => item.id));
}
if (idsToDelete.length) {
await dataProvider.deleteMany(RESOURCE, { ids: idsToDelete });
}
},
[dataProvider],
);
};

export const LessonScheduleImportButton = () => {
const [uploadedData, setUploadedData] = useState(null);
const [fileName, setFileName] = useState(null);
const preSaveHook = useReplaceDatesPreSaveHook();
const { data, saveData } = useSavableData(RESOURCE, fileName, uploadedData, undefined, undefined, preSaveHook);

const handleDataParse = useCallback(({ name, data: parsedData }) => {
setUploadedData(parsedData.map(splitLessonGroupCode));
setFileName(name);
}, []);

const handlePreviewCancel = useCallback(() => {
setUploadedData(null);
setFileName(null);
}, []);

return (
<>
<ImportButton fields={fields} handleDataParse={handleDataParse} label="ייבוא מערכת שעות" />
<PreviewListWithSavingDialog
resource={RESOURCE}
datagrid={PreviewDatagrid}
data={data}
saveData={saveData}
handlePreviewCancel={handlePreviewCancel}
/>
</>
);
};
16 changes: 16 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,22 @@ export default {
order: 'סדר',
},
},
lesson_schedule: {
name: 'מערכת שעות |||| מערכת שעות',
fields: {
...generalResourceFieldsTranslation,
organizationalYear: 'שנה אירגונית',
startTime: 'משעה',
scheduleDate: 'תאריך',
klassId: 'התמחות',
klassReferenceId: 'התמחות',
lessonId: 'שיעור',
lessonReferenceId: 'שיעור',
groupNumber: 'קבוצה',
teacherId: 'מורה',
teacherReferenceId: 'מורה',
},
},
student_klass: {
name: 'רשומת שיוך תלמידות לכיתות |||| שיוך תלמידות לכיתות',
fields: {
Expand Down
118 changes: 118 additions & 0 deletions client/src/entities/lesson-schedule.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
import {
DateField,
DateInput,
DateTimeInput,
NumberInput,
ReferenceField,
required,
TextField,
TextInput,
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import {
CommonReferenceInputFilter,
filterByUserId,
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { defaultYearFilter } from '@shared/utils/yearFilter';
import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { CommonTimeInput } from '@shared/components/fields/CommonTimeInput';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { LessonScheduleImportButton } from 'src/components/LessonScheduleImportButton';

const filters = [
...commonAdminFilters,
<CommonReferenceInputFilter
source="teacherReferenceId"
reference="teacher"
dynamicFilter={filterByUserId}
alwaysOn
/>,
<CommonReferenceInputFilter
source="klassReferenceId"
reference="klass"
dynamicFilter={filterByUserIdAndYear}
/>,
<CommonReferenceInputFilter
source="lessonReferenceId"
reference="lesson"
dynamicFilter={filterByUserIdAndYear}
/>,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
...defaultYearFilter,
};

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
<CommonDatagrid {...props}>
{children}
{isAdmin && <TextField source="id" />}
{isAdmin && <ReferenceField source="userId" reference="user" />}
<TextField source="organizationalYear" />
<TextField source="startTime" />
<DateField source="scheduleDate" />
<ReferenceField source="klassReferenceId" reference="klass" />
<ReferenceField source="lessonReferenceId" reference="lesson" />
<TextField source="groupNumber" />
<ReferenceField source="teacherReferenceId" reference="teacher" sortBy="teacher.name" />
<CommonYearField />
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
</CommonDatagrid>
);
};

const Inputs = ({ isCreate, isAdmin }) => {
return (
<>
{!isCreate && isAdmin && <TextInput source="id" disabled />}
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<TextInput source="organizationalYear" />
<CommonTimeInput source="startTime" />
<DateInput source="scheduleDate" validate={required()} />
<CommonReferenceInput
source="klassReferenceId"
reference="klass"
dynamicFilter={filterByUserIdAndYear}
validate={required()}
/>
<CommonReferenceInput
source="lessonReferenceId"
reference="lesson"
dynamicFilter={filterByUserIdAndYear}
validate={required()}
/>
<NumberInput source="groupNumber" />
<CommonReferenceInput
source="teacherReferenceId"
reference="teacher"
dynamicFilter={filterByUserId}
validate={required()}
/>
<CommonYearInput />
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
);
};

const Representation = CommonRepresentation;

const additionalListActions = [<LessonScheduleImportButton key="lessonScheduleImport" />];

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

export default getResourceComponents(entity);
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default [
{ html: 'הוספת סינון לפי ציון נמוך מ בתעודה', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת אפשרות לדיווח נוכחות סמינר בטלפון', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת אפשרות לעדכון מספר טלפון בהגדרות', status: 'בוצע', statusColor: 'success' },
{ html: 'העלאת קובץ אקסל של מערכת שעות וזיהוי אוטומטי של השיעור בדיווח נוכחות בטלפון', status: 'בוצע', statusColor: 'success' },

// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
Expand Down
5 changes: 5 additions & 0 deletions client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const appPermissions = {
studentView: 'studentView',
studentAttendanceByKlass: 'studentAttendanceByKlass',
seminarAttendanceYemot: 'seminarAttendanceYemot',
lessonSchedule: 'lessonSchedule',
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand Down Expand Up @@ -66,3 +67,7 @@ export const useIsStudentAttendanceByKlass = () => useHasPermission(appPermissio
export const isSeminarAttendanceYemot = (permissions) =>
hasPermissionLogic(permissions, appPermissions.seminarAttendanceYemot);
export const useIsSeminarAttendanceYemot = () => useHasPermission(appPermissions.seminarAttendanceYemot);

export const isLessonSchedule = (permissions) =>
isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.lessonSchedule);
export const useIsLessonSchedule = () => useHasPermission(appPermissions.lessonSchedule);
Loading
Loading