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
5 changes: 5 additions & 0 deletions client/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"tabWidth": 4,
"printWidth": 120
}
362 changes: 249 additions & 113 deletions client/src/App.jsx

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions client/src/App.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
import App from 'src/App';

test('renders app component', () => {
render(<App />);
const anyElement = screen.getAllByText('');
expect(anyElement.at(-1)).toBeInTheDocument();
render(<App />);
const anyElement = screen.getAllByText('');
expect(anyElement.at(-1)).toBeInTheDocument();
});
145 changes: 119 additions & 26 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,137 @@ import PercentIcon from '@mui/icons-material/Percent';
import FileUploadIcon from '@mui/icons-material/FileUpload';
import ViewListIcon from '@mui/icons-material/ViewList';


import BaseLayout from "@shared/components/layout/Layout";
import BaseLayout from '@shared/components/layout/Layout';
import BaseDashboard from '@shared/components/views/Dashboard';
import { isInLessonReport, isScannerUpload, isOnlyInLessonReport, isTeacherView, isStudentView } from './utils/appPermissions';
import {
isInLessonReport,
isScannerUpload,
isOnlyInLessonReport,
isTeacherView,
isStudentView,
} from './utils/appPermissions';
import { useDashboardItems } from './settings/settingsUtil';

const isStandardView = (permissions) => !isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && !isStudentView(permissions);
const shouldShowLessonReports = (permissions) => (isInLessonReport(permissions) || isTeacherView(permissions));
const isStandardView = (permissions) =>
!isOnlyInLessonReport(permissions) && !isTeacherView(permissions) && !isStudentView(permissions);
const shouldShowLessonReports = (permissions) => isInLessonReport(permissions) || isTeacherView(permissions);

const customMenuItems = [
// static items: render only when NOT restricted to lesson-report-only
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="pages-view" to="/pages-view" primaryText="הסברים נוספים" leftIcon={<ImportContactsIcon />} />,
({ permissions }) =>
isStandardView(permissions) && (
<MenuItemLink key="tutorial" to="/tutorial" primaryText="מדריך למשתמש" leftIcon={<HelpIcon />} />
),
({ permissions }) =>
isStandardView(permissions) && (
<MenuItemLink
key="pages-view"
to="/pages-view"
primaryText="הסברים נוספים"
leftIcon={<ImportContactsIcon />}
/>
),
// admin-only
({ isAdmin, permissions }) => isStandardView(permissions) && isAdmin && <MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />,
({ isAdmin, permissions }) =>
isStandardView(permissions) &&
isAdmin && (
<MenuItemLink key="yemot-simulator" to="/yemot-simulator" primaryText="סימולטור" leftIcon={<CallIcon />} />
),
// permission-based items: show only when not restricted
({ permissions }) => isStandardView(permissions) && isScannerUpload(permissions) && <MenuItemLink key="scanner-upload" to="/scanner-upload" primaryText="העלאת קבצי סורק" leftIcon={<DocumentScannerIcon />} />,
({ permissions }) =>
isStandardView(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 }) => (shouldShowLessonReports(permissions)) && <MenuItemLink key="in-lesson-report-att" to="/in-lesson-report-att" primaryText="טופס נוכחות" leftIcon={<EventAvailableIcon />} />,
({ permissions }) => (shouldShowLessonReports(permissions)) && <MenuItemLink key="in-lesson-report-grade" to="/in-lesson-report-grade" primaryText="טופס ציונים" leftIcon={<EditCalendarIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="michlol-file-helper" to="/michlol-file-helper" primaryText="עדכון קבצי מכלול" leftIcon={<ContentPasteSearchIcon />} />,
({ permissions }) => isStandardView(permissions) && <MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />,
({ permissions }) =>
shouldShowLessonReports(permissions) && (
<MenuItemLink
key="in-lesson-report-att"
to="/in-lesson-report-att"
primaryText="טופס נוכחות"
leftIcon={<EventAvailableIcon />}
/>
),
({ permissions }) =>
shouldShowLessonReports(permissions) && (
<MenuItemLink
key="in-lesson-report-grade"
to="/in-lesson-report-grade"
primaryText="טופס ציונים"
leftIcon={<EditCalendarIcon />}
/>
),
({ permissions }) =>
isStandardView(permissions) && (
<MenuItemLink key="roadmap" to="/roadmap" primaryText="פיתוחים עתידיים" leftIcon={<MapIcon />} />
),
({ permissions }) =>
isStandardView(permissions) && (
<MenuItemLink
key="michlol-file-helper"
to="/michlol-file-helper"
primaryText="עדכון קבצי מכלול"
leftIcon={<ContentPasteSearchIcon />}
/>
),
({ permissions }) =>
isStandardView(permissions) && (
<MenuItemLink key="settings" to="/settings" primaryText="הגדרות משתמש" leftIcon={<SettingsIcon />} />
),
];

const menuGroups = [
({ permissions }) => (isStandardView(permissions)) && ({
name: 'data', icon: <DatasetIcon />, routes: [
<MenuItemLink key="approved-absences-upload" to="/approved-absences-upload" primaryText="העלאת חיסורים מאושרים" leftIcon={<FileUploadIcon />} />
]
}),
({ permissions }) => (!isOnlyInLessonReport(permissions) && (!isStudentView(permissions))) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
({ permissions }) => !isTeacherView(permissions) && <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 />} />,
({ permissions }) => isTeacherView(permissions) && <MenuItemLink key="att_report_with_report_month_lead" to="/att_report_with_report_month_lead" primaryText="דוח נוכחות לרכזת" leftIcon={<ViewListIcon />} />
]
}),
({ permissions }) =>
isStandardView(permissions) && {
name: 'data',
icon: <DatasetIcon />,
routes: [
<MenuItemLink
key="approved-absences-upload"
to="/approved-absences-upload"
primaryText="העלאת חיסורים מאושרים"
leftIcon={<FileUploadIcon />}
/>,
],
},
({ permissions }) =>
!isOnlyInLessonReport(permissions) &&
!isStudentView(permissions) && {
name: 'report',
icon: <AnalyticsIcon />,
routes: [
({ permissions }) =>
!isTeacherView(permissions) && (
<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 />}
/>,
({ permissions }) =>
isTeacherView(permissions) && (
<MenuItemLink
key="att_report_with_report_month_lead"
to="/att_report_with_report_month_lead"
primaryText="דוח נוכחות לרכזת"
leftIcon={<ViewListIcon />}
/>
),
],
},
{ name: 'settings', icon: <SettingsIcon /> },
{ name: 'admin', icon: <AdminPanelSettingsIcon /> },
];
Expand Down
36 changes: 16 additions & 20 deletions client/src/RootDashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,20 @@ import { StudentGuard } from './components/StudentView/StudentAccess';
import StudentEventReport from './components/StudentView/student-event-report';

export const RootDashboard = (props) => {
const isTeacherView = useIsTeacherView();
const isStudentView = useIsStudentView();
const isTeacherView = useIsTeacherView();
const isStudentView = useIsStudentView();

if (isTeacherView) {
return (
<TeacherGuard>
<Dashboard {...props} />
</TeacherGuard>

);
}
else if (isStudentView) {
return (
<StudentGuard>
<StudentEventReport />
</StudentGuard>
);
}
else return <Dashboard {...props} />;

}
if (isTeacherView) {
return (
<TeacherGuard>
<Dashboard {...props} />
</TeacherGuard>
);
} else if (isStudentView) {
return (
<StudentGuard>
<StudentEventReport />
</StudentGuard>
);
} else return <Dashboard {...props} />;
};
11 changes: 4 additions & 7 deletions client/src/components/ApprovedAbsencesUpload.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ const ApprovedAbsencesUpload = () => {
const [configValues, setConfigValues] = useState({
reason: 'התמחות מאושרת',
senderName: '',
comment: ''
comment: '',
});
const fileInputRef = useRef();

// Custom hooks
const { handleFileUpload } = useFileProcessor(setFileName, setPreviewData, setLoading);

const resetForm = () => {
setPreviewData(null);
setFileName('');
setConfigValues({
reason: 'התמחות מאושרת',
senderName: '',
comment: ''
comment: '',
});
};

Expand Down Expand Up @@ -100,10 +100,7 @@ const ApprovedAbsencesUpload = () => {
<Divider />

{/* Configuration Form */}
<ConfigurationForm
configValues={configValues}
onChange={setConfigValues}
/>
<ConfigurationForm configValues={configValues} onChange={setConfigValues} />

{/* Action Buttons */}
<ActionButtons
Expand Down
12 changes: 2 additions & 10 deletions client/src/components/ApprovedAbsencesUpload/ActionButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,10 @@ import Box from '@mui/material/Box';
const ActionButtons = ({ loading, matchedCount, onCancel, onApply }) => {
return (
<Box sx={{ display: 'flex', justifyContent: 'flex-end', gap: 2 }}>
<Button
onClick={onCancel}
disabled={loading}
>
<Button onClick={onCancel} disabled={loading}>
ביטול
</Button>
<Button
variant="contained"
color="primary"
onClick={onApply}
disabled={loading || matchedCount === 0}
>
<Button variant="contained" color="primary" onClick={onApply} disabled={loading || matchedCount === 0}>
אישור ויצירת חיסורים מאושרים
</Button>
</Box>
Expand Down
20 changes: 3 additions & 17 deletions client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,9 @@ const ConfigurationForm = ({ configValues, onChange }) => {
</Typography>
<Form record={configValues} onSubmit={() => {}} onChange={handleFormChange}>
<Stack spacing={2} sx={{ maxWidth: 600 }}>
<TextInput
source="reason"
label="סיבה"
fullWidth
/>
<TextInput
source="senderName"
label="שם השולח"
fullWidth
/>
<TextInput
source="comment"
label="הערה"
multiline
rows={3}
fullWidth
/>
<TextInput source="reason" label="סיבה" fullWidth />
<TextInput source="senderName" label="שם השולח" fullWidth />
<TextInput source="comment" label="הערה" multiline rows={3} fullWidth />
<Typography variant="caption" color="text.secondary">
הערה: תאריך ומספר חיסורים יילקחו מהדיווח המקורי
</Typography>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ const FileUploadSection = ({ fileInputRef, fileName, loading, onFileSelect, onDa
שלב 1: בחירת קובץ
</Typography>
<Stack direction="row" spacing={2} alignItems="center">
<Button
variant="contained"
startIcon={<FileUploadIcon />}
onClick={onFileSelect}
disabled={loading}
>
<Button variant="contained" startIcon={<FileUploadIcon />} onClick={onFileSelect} disabled={loading}>
בחר קובץ Excel
</Button>
<ExcelImportInput
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ const PreviewSummary = ({ previewData }) => {
<Typography variant="body2" color="text.secondary">
סך הכל שורות בקובץ
</Typography>
<Typography variant="h5">
{previewData.total || 0}
</Typography>
<Typography variant="h5">{previewData.total || 0}</Typography>
</Box>
<Box>
<Typography variant="body2" color="text.secondary">
Expand Down
Loading
Loading