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: 5 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@ import {
isStudentView,
isSeminarAttendanceYemot,
isAttendanceCleanupRules,
isAttendanceSheetImport,
} from 'src/utils/appPermissions';
import ScannerUpload from '@shared/components/views/ScannerUpload';
import InLessonReport from 'src/reports/InLessonReport';
import MichlolFileHelper from '@shared/components/views/MichlolFileHelper';
import ApprovedAbsencesUpload from 'src/components/ApprovedAbsencesUpload';
import AttendanceSheetImport from 'src/components/AttendanceSheetImport';

import BadgeIcon from '@mui/icons-material/BadgeOutlined';
import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircleOutlined';
Expand Down Expand Up @@ -345,6 +347,9 @@ const App = () => (
<Route path="/in-lesson-report-grade/*" element={<InLessonReport gradeMode />} />
<Route path="/michlol-file-helper" element={<MichlolFileHelper />} />
<Route path="/approved-absences-upload" element={<ApprovedAbsencesUpload />} />
{isAttendanceSheetImport(permissions) && (
<Route path="/attendance-sheet-import" element={<AttendanceSheetImport />} />
)}
</CustomRoutes>
{CommonRoutes({ permissions, roadmapFeatures, settingsPage: <Settings /> })}
</>
Expand Down
11 changes: 11 additions & 0 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import ViewListIcon from '@mui/icons-material/ViewListOutlined';
import GridOnIcon from '@mui/icons-material/GridOnOutlined';
import ContactMailIcon from '@mui/icons-material/ContactMailOutlined';
import TrackChangesIcon from '@mui/icons-material/TrackChangesOutlined';
import TableViewIcon from '@mui/icons-material/TableViewOutlined';

import BaseLayout from '@shared/components/layout/Layout';
import BaseDashboard from '@shared/components/views/Dashboard';
Expand All @@ -29,6 +30,7 @@ import {
isTeacherView,
isStudentView,
isStudentAttendanceByKlass,
isAttendanceSheetImport,
} from './utils/appPermissions';
import { useDashboardItems } from './settings/settingsUtil';

Expand Down Expand Up @@ -121,6 +123,15 @@ const menuGroups = [
primaryText="העלאת חיסורים מאושרים"
leftIcon={<FileUploadIcon />}
/>,
({ permissions }) =>
isAttendanceSheetImport(permissions) && (
<MenuItemLink
key="attendance-sheet-import"
to="/attendance-sheet-import"
primaryText="קליטת קובץ נוכחות מגמה"
leftIcon={<TableViewIcon />}
/>
),
],
},
({ permissions }) =>
Expand Down
Loading
Loading