From cca6ce7ed6dfe77b404f4d56bda8a88dfbc11bc6 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 20 Oct 2026 19:47:54 +0000 Subject: [PATCH 1/2] feat: attendance sheet import screen with prefilled template Add a permission-gated screen (attendanceSheetImport) to download a prefilled per-class attendance workbook and upload it back as att reports. - Parser reads one class per sheet, teacher blocks of any width (block starts at teacher name/tz/lesson key, merged cells ignored), dates as Excel dates or dd/mm/yy(yy) text, blank cell = present. - Import is all-or-nothing: every error is listed with sheet + cell; re-upload updates existing reports by student+teacher+lesson+date. - Template: class code, class students, teacher and lesson per block, 10 date columns per teacher, RTL, required cells highlighted, data validation and an instructions sheet. Fixes buzz-code/ops#8 Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01UUoaKDcFVwbF3KPZg1Kmm3 --- client/src/App.jsx | 5 + client/src/GeneralLayout.jsx | 11 + .../src/components/AttendanceSheetImport.jsx | 253 ++++++++++ .../components/AttendanceSheetImport.test.jsx | 74 +++ client/src/domainTranslations.js | 22 + client/src/roadmapFeatures.js | 1 + client/src/utils/appPermissions.js | 5 + .../__tests__/att-report.service.spec.ts | 91 ++++ .../src/entity-modules/att-report.config.ts | 49 +- .../__tests__/attendanceSheetTemplate.spec.ts | 164 +++++++ server/src/reports/attendanceSheetTemplate.ts | 228 +++++++++ .../__tests__/attendanceSheet.util.spec.ts | 400 ++++++++++++++++ server/src/utils/attendanceSheet.util.ts | 448 ++++++++++++++++++ 13 files changed, 1750 insertions(+), 1 deletion(-) create mode 100644 client/src/components/AttendanceSheetImport.jsx create mode 100644 client/src/components/AttendanceSheetImport.test.jsx create mode 100644 server/src/entity-modules/__tests__/att-report.service.spec.ts create mode 100644 server/src/reports/__tests__/attendanceSheetTemplate.spec.ts create mode 100644 server/src/reports/attendanceSheetTemplate.ts create mode 100644 server/src/utils/__tests__/attendanceSheet.util.spec.ts create mode 100644 server/src/utils/attendanceSheet.util.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index a15ba9d8..2d4414a0 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -66,11 +66,13 @@ import { isStudentView, isSeminarAttendanceYemot, isAttendanceCleanupRules, + isAttendanceSheetImport, } from 'src/utils/appPermissions'; import ScannerUpload from '@shared/components/views/ScannerUpload'; import InLessonReport from 'src/reports/InLessonReport'; import MichlolFileHelper from '@shared/components/views/MichlolFileHelper'; import ApprovedAbsencesUpload from 'src/components/ApprovedAbsencesUpload'; +import AttendanceSheetImport from 'src/components/AttendanceSheetImport'; import BadgeIcon from '@mui/icons-material/BadgeOutlined'; import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircleOutlined'; @@ -345,6 +347,9 @@ const App = () => ( } /> } /> } /> + {isAttendanceSheetImport(permissions) && ( + } /> + )} {CommonRoutes({ permissions, roadmapFeatures, settingsPage: })} diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx index c36ee0d4..b495b45b 100644 --- a/client/src/GeneralLayout.jsx +++ b/client/src/GeneralLayout.jsx @@ -18,6 +18,7 @@ import ViewListIcon from '@mui/icons-material/ViewListOutlined'; import GridOnIcon from '@mui/icons-material/GridOnOutlined'; import ContactMailIcon from '@mui/icons-material/ContactMailOutlined'; import TrackChangesIcon from '@mui/icons-material/TrackChangesOutlined'; +import TableViewIcon from '@mui/icons-material/TableViewOutlined'; import BaseLayout from '@shared/components/layout/Layout'; import BaseDashboard from '@shared/components/views/Dashboard'; @@ -29,6 +30,7 @@ import { isTeacherView, isStudentView, isStudentAttendanceByKlass, + isAttendanceSheetImport, } from './utils/appPermissions'; import { useDashboardItems } from './settings/settingsUtil'; @@ -121,6 +123,15 @@ const menuGroups = [ primaryText="העלאת חיסורים מאושרים" leftIcon={} />, + ({ permissions }) => + isAttendanceSheetImport(permissions) && ( + } + /> + ), ], }, ({ permissions }) => diff --git a/client/src/components/AttendanceSheetImport.jsx b/client/src/components/AttendanceSheetImport.jsx new file mode 100644 index 00000000..d8281af2 --- /dev/null +++ b/client/src/components/AttendanceSheetImport.jsx @@ -0,0 +1,253 @@ +import { useCallback, useMemo, useRef, useState } from 'react'; +import Container from '@mui/material/Container'; +import Paper from '@mui/material/Paper'; +import Stack from '@mui/material/Stack'; +import Box from '@mui/material/Box'; +import Divider from '@mui/material/Divider'; +import Typography from '@mui/material/Typography'; +import Autocomplete from '@mui/material/Autocomplete'; +import TextField from '@mui/material/TextField'; +import Alert from '@mui/material/Alert'; +import Table from '@mui/material/Table'; +import TableBody from '@mui/material/TableBody'; +import TableCell from '@mui/material/TableCell'; +import TableHead from '@mui/material/TableHead'; +import TableRow from '@mui/material/TableRow'; +import CircularProgress from '@mui/material/CircularProgress'; +import FileDownloadIcon from '@mui/icons-material/FileDownload'; +import FileUploadIcon from '@mui/icons-material/FileUpload'; +import { Button, useDataProvider, useGetList, useNotify, useTranslate } from 'react-admin'; +import { handleError } from '@shared/utils/notifyUtil'; +import { readAsDataURL } from '@shared/utils/fileUtil'; +import { getCurrentHebrewYear } from '@shared/utils/yearFilter'; + +const listParams = { + pagination: { page: 1, perPage: 1000 }, + sort: { field: 'key', order: 'ASC' }, + filter: { year: getCurrentHebrewYear() }, +}; + +const getOptionLabel = (option) => `${option.key} - ${option.name}`; + +const isLessonOfKlass = (lesson, klass) => + Boolean(klass) && (lesson.klassReferenceIds ?? []).map(String).includes(String(klass.id)); + +const IssuesTable = ({ issues }) => { + const translate = useTranslate(); + return ( + + + + {translate('attendance_sheet.sheet')} + {translate('attendance_sheet.cell')} + {translate('attendance_sheet.reason')} + + + + {issues.map((issue, index) => ( + + {issue.sheet} + {issue.cell} + {issue.message} + + ))} + +
+ ); +}; + +const ImportResult = ({ result }) => { + const translate = useTranslate(); + if (!result.success) { + return ( + + + {translate('attendance_sheet.errors_title', { count: result.errors.length })} + + + + ); + } + return ( + + + {translate('attendance_sheet.success', { created: result.created, updated: result.updated })} + + {result.details.length > 0 && ( + + + + {translate('attendance_sheet.sheet')} + {translate('attendance_sheet.teacher')} + {translate('attendance_sheet.lesson')} + {translate('attendance_sheet.created')} + {translate('attendance_sheet.updated')} + + + + {result.details.map((row, index) => ( + + {row.sheet} + {row.teacherName} + {`${row.lessonKey} - ${row.lessonName}`} + {row.created} + {row.updated} + + ))} + +
+ )} + {result.warnings.length > 0 && ( + <> + + {translate('attendance_sheet.warnings_title', { count: result.warnings.length })} + + + + )} +
+ ); +}; + +const AttendanceSheetImport = () => { + const translate = useTranslate(); + const dataProvider = useDataProvider(); + const notify = useNotify(); + const fileSelector = useRef(); + const [klass, setKlass] = useState(null); + const [lessons, setLessons] = useState([]); + const [loading, setLoading] = useState(false); + const [result, setResult] = useState(null); + + const { data: klasses = [] } = useGetList('klass', listParams); + const { data: allLessons = [] } = useGetList('lesson', listParams); + const lessonOptions = useMemo( + () => + allLessons + .map((lesson) => ({ ...lesson, isKlassLesson: isLessonOfKlass(lesson, klass) })) + .sort((a, b) => Number(b.isKlassLesson) - Number(a.isKlassLesson)), + [allLessons, klass] + ); + + const handleDownload = useCallback(() => { + const queryParams = { + 'extra.klassId': klass.id, + 'extra.lessonIds': lessons.map((lesson) => lesson.id).join(','), + }; + setLoading(true); + dataProvider + .actionAndDownload('att_report', 'attendanceSheetTemplate', queryParams) + .catch(handleError(notify)) + .finally(() => setLoading(false)); + }, [dataProvider, notify, klass, lessons]); + + const handleFileSelect = useCallback((e) => { + e.preventDefault(); + fileSelector.current?.click(); + }, []); + + const handleFileUpload = useCallback( + async (e) => { + const [file] = e.target.files ?? []; + e.target.value = null; + if (!file) return; + setLoading(true); + setResult(null); + try { + const dataUrl = await readAsDataURL(file); + const body = { fileName: file.name, fileData: dataUrl.split(',')[1] }; + const response = await dataProvider.action('att_report', 'attendanceSheetImport', {}, body); + setResult(response.json); + } catch (error) { + handleError(notify)(error); + } finally { + setLoading(false); + } + }, + [dataProvider, notify] + ); + + return ( + + + + + + {translate('attendance_sheet.title')} + + + {translate('attendance_sheet.description')} + + + + + + {translate('attendance_sheet.download_title')} + setKlass(value)} + renderInput={(params) => ( + + )} + /> + + translate( + option.isKlassLesson + ? 'attendance_sheet.klass_lessons' + : 'attendance_sheet.other_lessons' + ) + } + getOptionLabel={getOptionLabel} + isOptionEqualToValue={(option, value) => option.id === value.id} + value={lessons} + onChange={(e, value) => setLessons(value)} + renderInput={(params) => ( + + )} + /> + +