diff --git a/client/src/App.jsx b/client/src/App.jsx index cd41ee5e..536e88b4 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -17,7 +17,8 @@ const appTheme = createTheme({ isRtl: true }); -import { Dashboard, Layout } from 'src/GeneralLayout'; +import { Layout } from 'src/GeneralLayout'; +import { RootDashboard } from 'src/RootDashboard'; import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityGuesser'; import attReport from "src/entities/att-report"; @@ -59,7 +60,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 } from 'src/utils/appPermissions'; +import { isLessonSignature, isOnlyInLessonReport, isTeacherView } 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'; @@ -107,11 +108,12 @@ const App = () => ( {permissions => { const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions); - if (onlyInLesson) { + const teacherView = isTeacherView(permissions) && !isAdmin(permissions); + if (onlyInLesson || teacherView) { return ( <> diff --git a/client/src/RootDashboard.jsx b/client/src/RootDashboard.jsx new file mode 100644 index 00000000..e366cb9b --- /dev/null +++ b/client/src/RootDashboard.jsx @@ -0,0 +1,62 @@ +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'; + +export const RootDashboard = (props) => { + const isTeacherView = useIsTeacherView(); + if (isTeacherView) { + return ( + + + + + ); + } + else { + return ; + } +} + +const TeacherGuard = ({ children }) => { + const dataProvider = useDataProvider(); + const notify = useNotify(); + const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher'); + + if (teacher) { + return
+ שלום המורה {teacher.name} + + {children} +
+ } + + 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 ( + + + }> + + + ); +} diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 8202c44c..6f62e0c7 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -9,6 +9,7 @@ export const appPermissions = { absCountEffect: 'absCountEffect', lessonSignature: 'lessonSignature', approvedAbsencesBulk: 'approvedAbsencesBulk', + teacherView: 'teacherView', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -33,4 +34,8 @@ export const isLessonSignature = (permissions) => isAdmin(permissions) || hasPer export const useIsLessonSignature = () => useHasPermission(appPermissions.lessonSignature); export const isApprovedAbsencesBulk = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.approvedAbsencesBulk); -export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); \ No newline at end of file +export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); + +export const isTeacherView = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.teacherView); +export const useIsTeacherView = () => useHasPermission(appPermissions.teacherView); + diff --git a/client/src/utils/storeUtil.ts b/client/src/utils/storeUtil.ts new file mode 100644 index 00000000..f6084c0c --- /dev/null +++ b/client/src/utils/storeUtil.ts @@ -0,0 +1,26 @@ +import { useStore } from 'react-admin'; + +export interface ObjectStore { + value: any | null; + set: (value: any) => void; + clear: () => void; +} + +export const useObjectStore = (storeKey: string): ObjectStore => { + const [value, setValue] = useStore(storeKey, null); + + const set = (nextValue: any) => { + setValue(nextValue); + }; + + const clear = () => { + setValue(null); + }; + + return { + value, + set, + clear, + }; +}; +