diff --git a/client/src/App.jsx b/client/src/App.jsx index 96a3b5ca..789a4fb4 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -25,6 +25,8 @@ import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityG 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 TeacherPercentReportWithDatesList from 'src/components/TeacherView/percent-report-with-dates-list'; +import TeacherStudentAttendanceList from 'src/components/TeacherView/student-attendance-list'; import grade from "src/entities/grade"; import klass from "src/entities/klass"; import klassType from "src/entities/klass-type"; @@ -136,6 +138,8 @@ const App = () => ( } /> } /> + } /> + } /> ); diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx index 1f76075e..3a1330bf 100644 --- a/client/src/GeneralLayout.jsx +++ b/client/src/GeneralLayout.jsx @@ -45,8 +45,8 @@ const menuGroups = [ } /> ] }), - ({ permissions }) => (isStandardView(permissions)) && ({ - name: 'report', icon: , routes: [ + ({ permissions }) => !isOnlyInLessonReport(permissions) && ({ + name: 'report', icon: , routes: [ } />, } />, ] diff --git a/client/src/components/TeacherView/percent-report-with-dates-list.jsx b/client/src/components/TeacherView/percent-report-with-dates-list.jsx new file mode 100644 index 00000000..74a15430 --- /dev/null +++ b/client/src/components/TeacherView/percent-report-with-dates-list.jsx @@ -0,0 +1,17 @@ +import PercentReportWithDatesList from "src/pivots/PercentReportWithDatesList"; +import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx"; +import { useObjectStore } from "src/utils/storeUtil"; + +const TeacherPercentReportWithDatesList = (props) => { + const { value: teacher } = useObjectStore("teacher"); + const teacherFilter = { + teacherReferenceId: teacher?.id, + }; + + return ( + + + + ); +}; +export default TeacherPercentReportWithDatesList; diff --git a/client/src/components/TeacherView/student-attendance-list.jsx b/client/src/components/TeacherView/student-attendance-list.jsx new file mode 100644 index 00000000..91fbe5b6 --- /dev/null +++ b/client/src/components/TeacherView/student-attendance-list.jsx @@ -0,0 +1,17 @@ +import StudentAttendanceList from "src/pivots/StudentAttendanceList.jsx"; +import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx"; +import { useObjectStore } from "src/utils/storeUtil"; + +const TeacherStudentAttendanceList = (props) => { + const { value: teacher } = useObjectStore("teacher"); + const teacherFilter = { + teacherReferenceId: teacher?.id, + }; + + return ( + + + + ); +}; +export default TeacherStudentAttendanceList; diff --git a/client/src/components/TeacherView/taecher-att-report-list.jsx b/client/src/components/TeacherView/taecher-att-report-list.jsx index bb95adaa..08cbd3ae 100644 --- a/client/src/components/TeacherView/taecher-att-report-list.jsx +++ b/client/src/components/TeacherView/taecher-att-report-list.jsx @@ -1,17 +1,19 @@ -import attReport from '../../entities/att-report-with-report-month.jsx'; -import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess.jsx'; -import { useObjectStore } from 'src/utils/storeUtil'; +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 - }; + const { value: teacher } = useObjectStore("teacher"); + const teacherFilter = { + teacherReferenceId: teacher?.id, + }; - return ; - - -} + return ( + + + + ); +}; export default { list: teacherAttReportList }; diff --git a/client/src/entities/att-report-with-report-month.jsx b/client/src/entities/att-report-with-report-month.jsx index f5779f0c..9c9fc15f 100644 --- a/client/src/entities/att-report-with-report-month.jsx +++ b/client/src/entities/att-report-with-report-month.jsx @@ -13,7 +13,7 @@ import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDat import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton'; import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton'; import { commonAdminFilters } from '@shared/components/fields/PermissionFilter'; -import { useIsLessonSignature } from 'src/utils/appPermissions'; +import { useIsLessonSignature, isTeacherView } from 'src/utils/appPermissions'; const filters = [ ...commonAdminFilters, @@ -22,7 +22,7 @@ const filters = [ , , , - , + ({ permissions }) => !isTeacherView(permissions) && (), , , , diff --git a/client/src/pivots/PercentReportWithDatesList.jsx b/client/src/pivots/PercentReportWithDatesList.jsx index 896fb2d6..d26dd659 100644 --- a/client/src/pivots/PercentReportWithDatesList.jsx +++ b/client/src/pivots/PercentReportWithDatesList.jsx @@ -7,6 +7,7 @@ import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter'; import { ShowMatchingRecordsButton } from '@shared/components/fields/ShowMatchingRecordsButton'; import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; +import { isTeacherView } from 'src/utils/appPermissions'; const filters = [ adminUserFilter, @@ -16,7 +17,7 @@ const filters = [ , , , - , + ({ permissions }) => !isTeacherView(permissions) && (), , , ,