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
15 changes: 14 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
<Resource name="teacher" />
Expand All @@ -125,6 +125,19 @@ const App = () => (
</>
);
}
if (teacherView) {
return (
<>
<Resource name="teacher" />
<Resource name="lesson" />
<CustomRoutes>
<Route path="/in-lesson-report-att/*" element={<InLessonReport />} />
<Route path="/in-lesson-report-grade/*" element={<InLessonReport gradeMode />} />
</CustomRoutes>
</>
);
}


return (
<>
Expand Down
24 changes: 12 additions & 12 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) && <MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && <MenuItemLink key="pages-view" to="/pages-view" primaryText="הסברים נוספים" leftIcon={<ImportContactsIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="pages-view" to="/pages-view" primaryText="הסברים נוספים" leftIcon={<ImportContactsIcon />} />,
// admin-only
({ isAdmin, permissions }) => !isOnlyInLessonReport(permissions) && isAdmin && <MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />,
({ isAdmin, permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isAdmin && <MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />,
// permission-based items: show only when not restricted
({ permissions }) => !isOnlyInLessonReport(permissions) && isScannerUpload(permissions) && <MenuItemLink key="scanner-upload" to="/scanner-upload" primaryText="העלאת קבצי סורק" leftIcon={<DocumentScannerIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && isScannerUpload(permissions) && <MenuItemLink key="scanner-upload" to="/scanner-upload" primaryText="העלאת קבצי סורק" leftIcon={<DocumentScannerIcon />} />,
// lesson report links: show when user has lesson-report permission OR when they're in-only mode
({ permissions }) => (isInLessonReport(permissions)) && <MenuItemLink key="in-lesson-report-att" to="/in-lesson-report-att" primaryText="טופס נוכחות" leftIcon={<EventAvailableIcon />} />,
({ permissions }) => (isInLessonReport(permissions)) && <MenuItemLink key="in-lesson-report-grade" to="/in-lesson-report-grade" primaryText="טופס ציונים" leftIcon={<EditCalendarIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && <MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && <MenuItemLink key="michlol-file-helper" to="/michlol-file-helper" primaryText="עדכון קבצי מכלול" leftIcon={<ContentPasteSearchIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && <MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />,
({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && <MenuItemLink key="in-lesson-report-att" to="/in-lesson-report-att" primaryText="טופס נוכחות" leftIcon={<EventAvailableIcon />} />,
({ permissions }) => ((isInLessonReport(permissions)) || (isTeacherView(permissions))) && <MenuItemLink key="in-lesson-report-grade" to="/in-lesson-report-grade" primaryText="טופס ציונים" leftIcon={<EditCalendarIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="michlol-file-helper" to="/michlol-file-helper" primaryText="עדכון קבצי מכלול" leftIcon={<ContentPasteSearchIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && <MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />,
];

const menuGroups = [
({ permissions }) => (!isOnlyInLessonReport(permissions)) && ({
({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
name: 'data', icon: <DatasetIcon />, routes: [
<MenuItemLink key="approved-absences-upload" to="/approved-absences-upload" primaryText="העלאת חיסורים מאושרים" leftIcon={<FileUploadIcon />} />
]
}),
({ permissions }) => (!isOnlyInLessonReport(permissions)) && ({
({ permissions }) => (!isOnlyInLessonReport(permissions)) && (!isTeacherView(permissions)) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
<MenuItemLink key="student-attendance" to="/student/student-attendance" primaryText="דוח נוכחות (פיבוט)" leftIcon={<SummarizeIcon />} />,
<MenuItemLink key="percent-report-with-dates" to="/percent-report-with-dates" primaryText="דוח אחוזים לתלמידה" leftIcon={<PercentIcon />} />,
Expand Down
3 changes: 3 additions & 0 deletions client/src/reports/InLessonReport.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -143,6 +145,7 @@ export default ({ gradeMode = false }) => {
dataProvider={dataProvider}
hasReportGroupPermission={hasReportGroupPermission}
preSaveHook={preSaveHook}
teacher={teacher}
/>
);
};
15 changes: 8 additions & 7 deletions client/src/reports/in-lesson-report/LessonSelector.jsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 {
Expand Down
28 changes: 17 additions & 11 deletions client/src/reports/in-lesson-report/index.jsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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);
Expand All @@ -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 = [];
Expand All @@ -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) {
Expand Down