diff --git a/client/src/components/AbsenceReasonInput.jsx b/client/src/components/AbsenceReasonInput.jsx new file mode 100644 index 00000000..35420618 --- /dev/null +++ b/client/src/components/AbsenceReasonInput.jsx @@ -0,0 +1,46 @@ +import { useInput, FieldTitle, InputHelperText, useResourceContext } from 'react-admin'; +import Autocomplete from '@mui/material/Autocomplete'; +import TextField from '@mui/material/TextField'; +import { useAbsenceReasons } from 'src/settings/settingsUtil'; + +// Pick a reason from the user's settings list, or type any other text. Saves plain text either way. +export const AbsenceReasonAutocomplete = ({ value, onChange, label, helperText, error, onBlur, ...props }) => { + const reasons = useAbsenceReasons(); + return ( + onChange(newValue ?? '')} + onInputChange={(event, newValue, reason) => reason === 'input' && onChange(newValue)} + onBlur={onBlur} + renderInput={(params) => ( + + )} + /> + ); +}; + +export const AbsenceReasonInput = ({ source = 'reason', label, validate, ...props }) => { + const resource = useResourceContext(); + const { + field, + fieldState: { error, invalid }, + isRequired, + } = useInput({ source, validate }); + return ( + } + error={invalid} + helperText={invalid && } + variant="filled" + size="small" + margin="dense" + {...props} + /> + ); +}; diff --git a/client/src/components/AbsenceReasonInput.test.jsx b/client/src/components/AbsenceReasonInput.test.jsx new file mode 100644 index 00000000..34139d54 --- /dev/null +++ b/client/src/components/AbsenceReasonInput.test.jsx @@ -0,0 +1,49 @@ +import { useState } from 'react'; +import { render, screen, fireEvent } from '@testing-library/react'; +import { AbsenceReasonAutocomplete } from './AbsenceReasonInput'; + +jest.mock('src/settings/settingsUtil', () => ({ + useAbsenceReasons: () => ['חתונה', 'מחלה'], +})); + +const Wrapper = ({ initialValue = '', onChange }) => { + const [value, setValue] = useState(initialValue); + return ( + { + setValue(newValue); + onChange(newValue); + }} + /> + ); +}; + +describe('AbsenceReasonAutocomplete', () => { + it('picks a reason from the settings list', () => { + const onChange = jest.fn(); + render(); + const input = screen.getByLabelText('סיבה'); + fireEvent.mouseDown(input); + fireEvent.click(screen.getByText('מחלה')); + expect(onChange).toHaveBeenLastCalledWith('מחלה'); + expect(input.value).toBe('מחלה'); + }); + + it('keeps free text that is not in the list', () => { + const onChange = jest.fn(); + render(); + const input = screen.getByLabelText('סיבה'); + fireEvent.change(input, { target: { value: 'סיבה אחרת' } }); + expect(onChange).toHaveBeenLastCalledWith('סיבה אחרת'); + expect(input.value).toBe('סיבה אחרת'); + }); + + it('shows an existing value without changing it', () => { + const onChange = jest.fn(); + render(); + expect(screen.getByLabelText('סיבה').value).toBe('ברית'); + expect(onChange).not.toHaveBeenCalled(); + }); +}); diff --git a/client/src/components/ApproveFullDays.jsx b/client/src/components/ApproveFullDays.jsx index 19889241..e4e0a57f 100644 --- a/client/src/components/ApproveFullDays.jsx +++ b/client/src/components/ApproveFullDays.jsx @@ -10,6 +10,7 @@ import { } from 'react-admin'; import { ActionOrDialogButton } from '@shared/components/crudContainers/ActionOrDialogButton'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; +import { AbsenceReasonInput } from 'src/components/AbsenceReasonInput'; import { filterByUserIdAndYear } from '@shared/components/fields/CommonReferenceInputFilter'; import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil'; import { defaultYearFilter } from '@shared/utils/yearFilter'; @@ -63,7 +64,7 @@ export const ApproveFullDays = ({ label }) => { dynamicFilter={filterByUserIdAndYear} label="כיתה (לא חובה)" /> - + diff --git a/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx b/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx index eeabb8c9..5d79fae2 100644 --- a/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx +++ b/client/src/components/ApprovedAbsencesUpload/ConfigurationForm.jsx @@ -2,6 +2,7 @@ import Box from '@mui/material/Box'; import Stack from '@mui/material/Stack'; import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; +import { AbsenceReasonAutocomplete } from 'src/components/AbsenceReasonInput'; const ConfigurationForm = ({ configValues, onChange }) => { const handleChange = (event) => { @@ -14,7 +15,12 @@ const ConfigurationForm = ({ configValues, onChange }) => { שלב 2: הגדרות - + onChange({ ...configValues, reason })} + fullWidth + /> - + @@ -160,7 +161,7 @@ const Inputs = ({ isCreate, isAdmin }) => { - + diff --git a/client/src/roadmapFeatures.js b/client/src/roadmapFeatures.js index c5f73a6f..58eaf38d 100644 --- a/client/src/roadmapFeatures.js +++ b/client/src/roadmapFeatures.js @@ -43,4 +43,5 @@ export default [ { html: 'אישור חיסורים לפי תלמידה וטווח תאריכים: טופס "אישור ימים מלאים" והעלאת קובץ לפי ת.ז. ותאריך', status: 'בוצע', statusColor: 'success' }, { html: 'רשימות: כפתור "מיון" למיון מתקדם לפי כמה עמודות (למשל סדר כיתה ואז שם מורה), כולל בייצוא לאקסל. בדוח שכר למורה אפשר למיין גם לפי סדר כיתה ושיוך כיתה', status: 'בוצע', statusColor: 'success' }, { html: 'מסך "קליטת קובץ נוכחות מגמה": הורדת קובץ אקסל מלא מראש לכיתה עם בלוק עמודות לכל מורה, והעלאתו אחרי הסימון ליצירה ועדכון של דיווחי נוכחות (בהרשאה)', status: 'בוצע', statusColor: 'success' }, + { html: 'סיבות חיסור קבועות: בהגדרות מכניסים רשימת סיבות (חתונה, מחלה וכו\'), ובשדה "סיבה" בחיסורים מאושרים בוחרים מהרשימה או מקלידים סיבה אחרת', status: 'בוצע', statusColor: 'success' }, ].reverse(); diff --git a/client/src/settings/GeneralSettingsInput.jsx b/client/src/settings/GeneralSettingsInput.jsx index a036e662..3bee7251 100644 --- a/client/src/settings/GeneralSettingsInput.jsx +++ b/client/src/settings/GeneralSettingsInput.jsx @@ -1,4 +1,4 @@ -import { ArrayInput, CheckboxGroupInput, NumberInput, SimpleFormIterator, TimeInput, required } from 'react-admin'; +import { ArrayInput, CheckboxGroupInput, NumberInput, SimpleFormIterator, TextInput, TimeInput, maxLength, required } from 'react-admin'; import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion'; import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput'; import { PAGE_SIZE_OPTIONS } from '@shared/config/settings'; @@ -22,7 +22,7 @@ export function GeneralSettingsInput() { + + + + + ); } diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx index 4326a951..8081f577 100644 --- a/client/src/settings/Settings.jsx +++ b/client/src/settings/Settings.jsx @@ -14,7 +14,7 @@ import { useNavigate } from 'react-router-dom'; import { getDefaultPageSize } from '@shared/utils/settingsUtil'; import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion'; import { DashboardItemsInput } from '@shared/components/settings/DashboardItemsInput'; -import { getLateValue, getLessonTimes, getDashboardItems, getReportStyles, getReportCardSettings, normalizeReportStyles } from './settingsUtil'; +import { getLateValue, getLessonTimes, getAbsenceReasons, getDashboardItems, getReportStyles, getReportCardSettings, normalizeReportStyles } from './settingsUtil'; import { ReportStylesInput } from './ReportStylesInput'; import { GeneralSettingsInput } from './GeneralSettingsInput'; import { MailSettingsInput } from './MailSettingsInput'; @@ -40,6 +40,7 @@ export default function Settings() { defaultPageSize: getDefaultPageSize(identity), lateValue: getLateValue(identity), lessonTimes: getLessonTimes(identity), + absenceReasons: getAbsenceReasons(identity), dashboardItems: getDashboardItems(identity), reportStyles: normalizeReportStyles(getReportStyles(identity)), reportCardSettings: getReportCardSettings(identity), diff --git a/client/src/settings/settingsUtil.js b/client/src/settings/settingsUtil.js index 5e7bb7b7..62110f55 100644 --- a/client/src/settings/settingsUtil.js +++ b/client/src/settings/settingsUtil.js @@ -18,6 +18,15 @@ export function getLessonTimes(identity) { return identity?.additionalData?.lessonTimes || []; } +export function useAbsenceReasons() { + const { identity } = useGetIdentity(); + return getAbsenceReasons(identity); +} + +export function getAbsenceReasons(identity) { + return identity?.additionalData?.absenceReasons || []; +} + export const useDashboardItems = () => { const { identity } = useGetIdentity(); return getDashboardItems(identity);