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
4 changes: 3 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ const appTheme = createTheme({

import { Layout } from 'src/GeneralLayout';
import { RootDashboard } from 'src/RootDashboard';
import { TeacherGuard } from './components/TeacherView/TeacherAccess';

import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityGuesser';
import attReport from "src/entities/att-report";
import attReportWithReportMonth from './entities/att-report-with-report-month';
import teacherAttReportList from 'src/components/TeacherView/taecher-att-report-list';
import grade from "src/entities/grade";
import klass from "src/entities/klass";
import klassType from "src/entities/klass-type";
Expand Down Expand Up @@ -100,7 +102,6 @@ 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,6 +132,7 @@ const App = () => (
<>
<Resource name="teacher" />
<Resource name="lesson" />
<Resource name="att_report_with_report_month" {...teacherAttReportList} icon={ViewListIcon} />
<CustomRoutes>
<Route path="/in-lesson-report-att/*" element={<TeacherGuard> <InLessonReport /> </TeacherGuard>} />
<Route path="/in-lesson-report-grade/*" element={<TeacherGuard> <InLessonReport gradeMode /> </TeacherGuard>} />
Expand Down
2 changes: 1 addition & 1 deletion client/src/RootDashboard.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Dashboard } from 'src/GeneralLayout';
import { useIsTeacherView } from 'src/utils/appPermissions';
import { TeacherGuard } from 'src/components/TeacherAccess';
import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess';

export const RootDashboard = (props) => {
const isTeacherView = useIsTeacherView();
Expand Down
17 changes: 17 additions & 0 deletions client/src/components/TeacherView/taecher-att-report-list.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import attReport from '../../entities/att-report-with-report-month.jsx';
import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess.jsx';
import { useObjectStore } from 'src/utils/storeUtil';

const BaseList = attReport.list;

const teacherAttReportList = (props) => {
const { value: teacher } = useObjectStore('teacher');
const teacherFilter = {
teacherReferenceId: teacher?.id
};

return <TeacherGuard> <BaseList {...props} filter={teacherFilter} /> </TeacherGuard>;


}
export default { list: teacherAttReportList };