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
10 changes: 6 additions & 4 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -107,11 +108,12 @@ const App = () => (
<RTLStyle>
<Admin dataProvider={dataProvider} i18nProvider={i18nProvider} authProvider={authProvider}
theme={appTheme} title='נוכחות'
dashboard={Dashboard} layout={Layout} loginPage={LoginPage}
dashboard={RootDashboard} layout={Layout} loginPage={LoginPage}
requireAuth>
{permissions => {
const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions);
if (onlyInLesson) {
const teacherView = isTeacherView(permissions) && !isAdmin(permissions);
if (onlyInLesson || teacherView) {
return (
<>
<Resource name="teacher" />
Expand Down
62 changes: 62 additions & 0 deletions client/src/RootDashboard.jsx
Original file line number Diff line number Diff line change
@@ -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 (
<TeacherGuard>
<Dashboard {...props} />
</TeacherGuard>

);
}
else {
return <Dashboard {...props} />;
}
}

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

if (teacher) {
Comment thread
buzz-code marked this conversation as resolved.
Resolved
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>
);
}
7 changes: 6 additions & 1 deletion client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const appPermissions = {
absCountEffect: 'absCountEffect',
lessonSignature: 'lessonSignature',
approvedAbsencesBulk: 'approvedAbsencesBulk',
teacherView: 'teacherView',
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand All @@ -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);
export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk);

export const isTeacherView = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.teacherView);
export const useIsTeacherView = () => useHasPermission(appPermissions.teacherView);

26 changes: 26 additions & 0 deletions client/src/utils/storeUtil.ts
Original file line number Diff line number Diff line change
@@ -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<any | null>(storeKey, null);

const set = (nextValue: any) => {
setValue(nextValue);
};

const clear = () => {
setValue(null);
};

return {
value,
set,
clear,
};
};