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: 3 additions & 2 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,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 { TeacherGuard } from './components/TeacherAccess';

const i18nProvider = getI18nProvider(domainTranslations);

Expand Down Expand Up @@ -131,8 +132,8 @@ const App = () => (
<Resource name="teacher" />
<Resource name="lesson" />
<CustomRoutes>
<Route path="/in-lesson-report-att/*" element={<InLessonReport />} />
<Route path="/in-lesson-report-grade/*" element={<InLessonReport gradeMode />} />
<Route path="/in-lesson-report-att/*" element={<TeacherGuard> <InLessonReport /> </TeacherGuard>} />
<Route path="/in-lesson-report-grade/*" element={<TeacherGuard> <InLessonReport gradeMode /> </TeacherGuard>} />
</CustomRoutes>
</>
);
Expand Down
25 changes: 14 additions & 11 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,32 @@ import BaseDashboard from '@shared/components/views/Dashboard';
import { isInLessonReport, isScannerUpload, isOnlyInLessonReport, isTeacherView } from './utils/appPermissions';
import { useDashboardItems } from './settings/settingsUtil';

const isStandardView = (permissions) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions);
const shouldShowLessonReports = (permissions) => isInLessonReport(permissions) || isTeacherView(permissions);

const customMenuItems = [
// static items: render only when NOT restricted to lesson-report-only
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="pages-view" to="/pages-view" primaryText="הסברים נוספים" leftIcon={<ImportContactsIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="pages-view" to="/pages-view" primaryText="הסברים נוספים" leftIcon={<ImportContactsIcon />} />,
// admin-only
({ isAdmin, permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isAdmin && <MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />,
({ isAdmin, permissions }) => isStandardView(permissions) && isAdmin && <MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />,
// permission-based items: show only when not restricted
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isScannerUpload(permissions) && <MenuItemLink key="scanner-upload" to="/scanner-upload" primaryText="העלאת קבצי סורק" leftIcon={<DocumentScannerIcon />} />,
({ permissions }) => isStandardView(permissions) && isScannerUpload(permissions) && <MenuItemLink key="scanner-upload" to="/scanner-upload" primaryText="העלאת קבצי סורק" leftIcon={<DocumentScannerIcon />} />,
// lesson report links: show when user has lesson-report permission OR when they're in-only mode
({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && <MenuItemLink key="in-lesson-report-att" to="/in-lesson-report-att" primaryText="טופס נוכחות" leftIcon={<EventAvailableIcon />} />,
({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && <MenuItemLink key="in-lesson-report-grade" to="/in-lesson-report-grade" primaryText="טופס ציונים" leftIcon={<EditCalendarIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="michlol-file-helper" to="/michlol-file-helper" primaryText="עדכון קבצי מכלול" leftIcon={<ContentPasteSearchIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />,
({ permissions }) => (shouldShowLessonReports(permissions)) && <MenuItemLink key="in-lesson-report-att" to="/in-lesson-report-att" primaryText="טופס נוכחות" leftIcon={<EventAvailableIcon />} />,
({ permissions }) => (shouldShowLessonReports(permissions)) && <MenuItemLink key="in-lesson-report-grade" to="/in-lesson-report-grade" primaryText="טופס ציונים" leftIcon={<EditCalendarIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="michlol-file-helper" to="/michlol-file-helper" primaryText="עדכון קבצי מכלול" leftIcon={<ContentPasteSearchIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />,
];

const menuGroups = [
({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
({ permissions }) => (isStandardView(permissions)) && ({
name: 'data', icon: <DatasetIcon />, routes: [
<MenuItemLink key="approved-absences-upload" to="/approved-absences-upload" primaryText="העלאת חיסורים מאושרים" leftIcon={<FileUploadIcon />} />
]
}),
({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
({ permissions }) => (isStandardView(permissions)) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
<MenuItemLink key="student-attendance" to="/student/student-attendance" primaryText="דוח נוכחות (פיבוט)" leftIcon={<SummarizeIcon />} />,
<MenuItemLink key="percent-report-with-dates" to="/percent-report-with-dates" primaryText="דוח אחוזים לתלמידה" leftIcon={<PercentIcon />} />,
Expand Down
45 changes: 1 addition & 44 deletions client/src/RootDashboard.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React from 'react';
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import { Dashboard } from 'src/GeneralLayout';
import { useIsTeacherView } from 'src/utils/appPermissions';
import Button from '@mui/material/Button';
import { TeacherGuard } from 'src/components/TeacherAccess';

export const RootDashboard = (props) => {
const isTeacherView = useIsTeacherView();
Expand All @@ -19,44 +17,3 @@ export const RootDashboard = (props) => {
return <Dashboard {...props} />;
}
}

const TeacherGuard = ({ children }) => {
const dataProvider = useDataProvider();
const notify = useNotify();
const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher');

if (teacher) {
return <div key="view-dashboard">
שלום המורה {teacher.name}
<Button onClick={clear}>
התנתק
</Button>
{children}
</div>
}

const handleSubmit = async (values) => {
const { tz } = values;
const result = await dataProvider.getList('teacher', {
pagination: { page: 1, perPage: 1 },
filter: { tz }
});
const teacher = result.data[0] || null;

if (teacher) {
setTeacher(teacher);
}
else {
notify('Teacher not found', { type: 'warning' });
}
};

return (
<SimpleForm key="view-search-form" onSubmit={handleSubmit} resource="teacher"
toolbar={<Toolbar>
<SaveButton label="כניסה" />
</Toolbar>}>
<TextInput source="tz" label="ת.ז" />
</SimpleForm>
);
}
44 changes: 44 additions & 0 deletions client/src/components/TeacherAccess.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import Button from '@mui/material/Button';

export const TeacherGuard = ({ children }) => {
const dataProvider = useDataProvider();
const notify = useNotify();
const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher');

if (teacher) {
return <div key="view-dashboard">
שלום המורה {teacher.name}
<Button onClick={clear}>
התנתק
</Button>
{children}
</div>
}

const handleSubmit = async (values) => {
const { tz } = values;
const result = await dataProvider.getList('teacher', {
pagination: { page: 1, perPage: 1 },
filter: { tz }
});
const teacher = result.data[0] || null;

if (teacher) {
setTeacher(teacher);
}
else {
notify('Teacher not found', { type: 'warning' });
}
};

return (
<SimpleForm key="view-search-form" onSubmit={handleSubmit} resource="teacher"
toolbar={<Toolbar>
<SaveButton label="כניסה" />
</Toolbar>}>
<TextInput source="tz" label="ת.ז" />
</SimpleForm>
);
}