diff --git a/client/src/App.jsx b/client/src/App.jsx
index 536e88b4..59d38419 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -113,7 +113,7 @@ const App = () => (
{permissions => {
const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions);
const teacherView = isTeacherView(permissions) && !isAdmin(permissions);
- if (onlyInLesson || teacherView) {
+ if (onlyInLesson) {
return (
<>
@@ -125,6 +125,19 @@ const App = () => (
>
);
}
+ if (teacherView) {
+ return (
+ <>
+
+
+
+ } />
+ } />
+
+ >
+ );
+ }
+
return (
<>
diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx
index 44aa4cca..50b628c5 100644
--- a/client/src/GeneralLayout.jsx
+++ b/client/src/GeneralLayout.jsx
@@ -17,32 +17,32 @@ import FileUploadIcon from '@mui/icons-material/FileUpload';
import BaseLayout from "@shared/components/layout/Layout";
import BaseDashboard from '@shared/components/views/Dashboard';
-import { isInLessonReport, isScannerUpload, isOnlyInLessonReport } from './utils/appPermissions';
+import { isInLessonReport, isScannerUpload, isOnlyInLessonReport, isTeacherView } from './utils/appPermissions';
import { useDashboardItems } from './settings/settingsUtil';
const customMenuItems = [
// static items: render only when NOT restricted to lesson-report-only
- ({ permissions }) => !isOnlyInLessonReport(permissions) && } />,
- ({ permissions }) => !isOnlyInLessonReport(permissions) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && } />,
// admin-only
- ({ isAdmin, permissions }) => !isOnlyInLessonReport(permissions) && isAdmin && } />,
+ ({ isAdmin, permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isAdmin && } />,
// permission-based items: show only when not restricted
- ({ permissions }) => !isOnlyInLessonReport(permissions) && isScannerUpload(permissions) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isScannerUpload(permissions) && } />,
// lesson report links: show when user has lesson-report permission OR when they're in-only mode
- ({ permissions }) => (isInLessonReport(permissions)) && } />,
- ({ permissions }) => (isInLessonReport(permissions)) && } />,
- ({ permissions }) => !isOnlyInLessonReport(permissions) && } />,
- ({ permissions }) => !isOnlyInLessonReport(permissions) && } />,
- ({ permissions }) => !isOnlyInLessonReport(permissions) && } />,
+ ({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && } />,
+ ({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && } />,
+ ({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && } />,
];
const menuGroups = [
- ({ permissions }) => (!isOnlyInLessonReport(permissions)) && ({
+ ({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
name: 'data', icon: , routes: [
} />
]
}),
- ({ permissions }) => (!isOnlyInLessonReport(permissions)) && ({
+ ({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
name: 'report', icon: , routes: [
} />,
} />,
diff --git a/client/src/reports/InLessonReport.jsx b/client/src/reports/InLessonReport.jsx
index bbff798d..0cd53201 100644
--- a/client/src/reports/InLessonReport.jsx
+++ b/client/src/reports/InLessonReport.jsx
@@ -6,6 +6,7 @@ import { Datagrid as GradeDatagrid } from 'src/entities/grade';
import { useIsInLessonReportWithLate, useIsInLessonReportStartWithTeacher, useIsLessonSignature } from '../utils/appPermissions';
import { InLessonReport } from './in-lesson-report';
import { getCurrentHebrewYear } from '@shared/utils/yearFilter';
+import { useObjectStore } from 'src/utils/storeUtil';
const entityConfig = [
{
@@ -37,6 +38,7 @@ export default ({ gradeMode = false }) => {
const fileName = useMemo(() => 'דיווח ' + entityLabel + ' ' + new Date().toISOString().split('T')[0], [entityLabel]);
const [dataToSave, setDataToSave] = useState(null);
const [signatureMetadata, setSignatureMetadata] = useState(null);
+ const { value: teacher } = useObjectStore('teacher');
// Pre-save hook: creates ReportGroup & Sessions only when actually saving
const preSaveHook = useCallback(async (data) => {
@@ -143,6 +145,7 @@ export default ({ gradeMode = false }) => {
dataProvider={dataProvider}
hasReportGroupPermission={hasReportGroupPermission}
preSaveHook={preSaveHook}
+ teacher={teacher}
/>
);
};
\ No newline at end of file
diff --git a/client/src/reports/in-lesson-report/LessonSelector.jsx b/client/src/reports/in-lesson-report/LessonSelector.jsx
index 71733a41..ee5cc1df 100644
--- a/client/src/reports/in-lesson-report/LessonSelector.jsx
+++ b/client/src/reports/in-lesson-report/LessonSelector.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useMemo } from 'react';
import { Box, Typography, Divider } from '@mui/material';
import { TabbedForm, Toolbar, SaveButton, TextInput, useDataProvider, useNotify } from 'react-admin';
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
@@ -19,12 +19,13 @@ export const LessonSelector = ({ onLessonFound, selectedTeacher }) => {
const notify = useNotify();
const [lessonKey, setLessonKey] = useState(null);
- const lessonFilter = {
- ...defaultYearFilter,
- };
- if (selectedTeacher) {
- lessonFilter.teacherReferenceId = selectedTeacher.id;
- }
+ const lessonFilter = useMemo(() => {
+ const filter = { ...defaultYearFilter };
+ if (selectedTeacher) {
+ filter.teacherReferenceId = selectedTeacher.id;
+ }
+ return filter;
+ }, [selectedTeacher]);
const handleGetLesson = useCallback(async () => {
try {
diff --git a/client/src/reports/in-lesson-report/index.jsx b/client/src/reports/in-lesson-report/index.jsx
index ff0ec8a7..1438d79b 100644
--- a/client/src/reports/in-lesson-report/index.jsx
+++ b/client/src/reports/in-lesson-report/index.jsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useState, useEffect } from 'react';
import { Container, Paper, Stack } from '@mui/material';
import { useNotify, useStore } from 'react-admin';
import { ReportContext, defaultContextValue } from './context';
@@ -23,15 +23,21 @@ export const InLessonReport = ({
dataProvider,
hasReportGroupPermission,
preSaveHook,
+ teacher,
}) => {
const storePrefix = gradeMode ? 'InLessonReport.Grade' : 'InLessonReport.Att';
const [lessonContext, setLessonContext] = useStore(`${storePrefix}.context`, null);
const { lesson, students } = lessonContext || {};
- const [selectedTeacher, setSelectedTeacher] = useStore(`${storePrefix}.selectedTeacher`, null);
+ const [selectedTeacher, setSelectedTeacher] = useStore(`${storePrefix}.selectedTeacher`, teacher || null);
const [, setFormData] = useStore(`${storePrefix}.form`, null);
const [, setReportDates] = useStore(`${storePrefix}.reportDates`, null);
const lateValue = useLateValue();
const notify = useNotify();
+ useEffect(() => {
+ if (teacher && !selectedTeacher) {
+ setSelectedTeacher(teacher);
+ }
+ }, [teacher]);
const handleTeacherSelect = useCallback((teacher) => {
setSelectedTeacher(teacher);
@@ -43,23 +49,23 @@ export const InLessonReport = ({
const handleCancel = useCallback(() => {
setLessonContext(null);
- setSelectedTeacher(null);
+ setSelectedTeacher(teacher || null);
setDataToSave(null);
setFormData(null);
setReportDates(null);
- }, [setLessonContext, setSelectedTeacher, setDataToSave, setFormData, setReportDates]);
+ }, [teacher, setLessonContext, setSelectedTeacher, setDataToSave, setFormData, setReportDates]);
const handleSuccessWrapped = useCallback(() => {
setLessonContext(null);
- setSelectedTeacher(null);
+ setSelectedTeacher(teacher || null);
setFormData(null);
setReportDates(null);
handleSuccess();
- }, [handleSuccess, setLessonContext, setSelectedTeacher, setFormData, setReportDates]);
+ }, [teacher, handleSuccess, setLessonContext, setSelectedTeacher, setFormData, setReportDates]);
const handleSave = useCallback(async (formData) => {
const { reportDates, howManyLessons, lessonDetails, signatureData, ...rest } = formData;
-
+
// Build dataToSave array WITHOUT reportGroupSessionId
// The preSaveHook will add it when actually saving
const dataToSave = [];
@@ -68,15 +74,15 @@ export const InLessonReport = ({
klassReferenceId: lesson.klassReferenceIds[0],
lessonReferenceId: lesson.id,
};
-
+
reportDates.forEach((reportDate, index) => {
- const reportDateEntry = {
- ...entry,
+ const reportDateEntry = {
+ ...entry,
reportDate,
// Store index for preSaveHook to match with sessions
_dateIndex: index,
};
-
+
Object.keys(rest).forEach((studentId) => {
const newEntry = { ...reportDateEntry, studentReferenceId: studentId };
if (gradeMode) {