diff --git a/client/shared b/client/shared
index 45b2dad3..27d435f6 160000
--- a/client/shared
+++ b/client/shared
@@ -1 +1 @@
-Subproject commit 45b2dad3c51184c6d45f93b3b553a8981d6ebc0b
+Subproject commit 27d435f60f5a713362fa837fca5770ab4a76d07b
diff --git a/client/src/components/StudentView/student-event-report.jsx b/client/src/components/StudentView/student-event-report.jsx
index 3d195ad8..e7668bdf 100644
--- a/client/src/components/StudentView/student-event-report.jsx
+++ b/client/src/components/StudentView/student-event-report.jsx
@@ -19,8 +19,8 @@ import {
} from 'react-admin';
import { filterByUserIdAndYear } from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearInput } from '@shared/components/fields/CommonYear';
import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil';
import SignatureInput from '@shared/components/fields/signature/SignatureInput';
import { useObjectStore } from 'src/utils/storeUtil';
@@ -231,12 +231,7 @@ const StudentEventReport = (props) => {
-
+
,
+ ,
,
];
@@ -39,7 +38,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
@@ -56,12 +55,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
{isAdmin && }
-
+
diff --git a/client/src/entities/att-report-with-report-month.jsx b/client/src/entities/att-report-with-report-month.jsx
index a660ef22..43a4b28b 100644
--- a/client/src/entities/att-report-with-report-month.jsx
+++ b/client/src/entities/att-report-with-report-month.jsx
@@ -5,12 +5,11 @@ import {
TextField,
TextInput,
ReferenceField,
- SelectField,
required,
NumberInput,
BooleanInput,
NullableBooleanInput,
- maxLength,
+ maxLength
} from 'react-admin';
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove';
import HelpIcon from '@mui/icons-material/Help';
@@ -24,8 +23,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { Inputs } from './att-report';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
@@ -68,7 +67,7 @@ const filters = [
}}
/>,
,
- ,
+ ,
];
const filterDefaultValues = {
@@ -79,7 +78,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
const additionalBulkButtons = [
} name="bulkChangeKlass" key="bulkChangeKlass" reloadOnEnd>
{isAdmin && }
- {isAdmin && }
+ {isAdmin && }
,
} name="bulkKnownAbsences">
@@ -158,7 +157,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
)}
-
+
diff --git a/client/src/entities/att-report.jsx b/client/src/entities/att-report.jsx
index cb3c0076..347f1b78 100644
--- a/client/src/entities/att-report.jsx
+++ b/client/src/entities/att-report.jsx
@@ -9,8 +9,7 @@ import {
ReferenceField,
required,
minValue,
- maxLength,
- SelectField,
+ maxLength
} from 'react-admin';
import { useIsLessonSignature, useIsTeacherView } from 'src/utils/appPermissions';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
@@ -22,8 +21,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
@@ -53,7 +52,7 @@ const filters = [
'klassReferenceIds:$cont': 'klassReferenceId',
}}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -116,7 +115,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
)}
-
+
@@ -168,7 +167,7 @@ export const Inputs = ({ isCreate, isAdmin }) => {
{/* */}
-
+
{/* */}
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
diff --git a/client/src/entities/grade.jsx b/client/src/entities/grade.jsx
index 57b36efd..6739e0d1 100644
--- a/client/src/entities/grade.jsx
+++ b/client/src/entities/grade.jsx
@@ -9,8 +9,7 @@ import {
ReferenceField,
required,
maxLength,
- SelectField,
- NullableBooleanInput,
+ NullableBooleanInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -21,8 +20,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
const filters = [
@@ -47,7 +46,7 @@ const filters = [
'klassReferenceIds:$cont': 'klassReferenceId',
}}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -89,7 +88,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
reference="lesson"
optionalTarget="key"
/>
-
+
{/* */}
@@ -135,7 +134,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
>
diff --git a/client/src/entities/klass.jsx b/client/src/entities/klass.jsx
index bd07411a..7f585917 100644
--- a/client/src/entities/klass.jsx
+++ b/client/src/entities/klass.jsx
@@ -1,5 +1,4 @@
import {
- SelectField,
TextField,
TextInput,
ReferenceField,
@@ -8,7 +7,7 @@ import {
DateTimeInput,
NumberInput,
required,
- maxLength,
+ maxLength
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -20,8 +19,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { useUnique } from '@shared/utils/useUnique';
import { BulkReportButton } from '@shared/components/crudContainers/BulkReportButton';
import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton';
@@ -41,7 +40,7 @@ const filters = [
reference="teacher"
dynamicFilter={filterByUserId}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -91,7 +90,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
optionalSource="teacherId"
optionalTarget="tz"
/>
-
+
{isAdmin && }
{isAdmin && }
@@ -114,7 +113,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
dynamicFilter={filterByUserId}
/>
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
>
diff --git a/client/src/entities/known-absence.jsx b/client/src/entities/known-absence.jsx
index 69017a4b..25b0cb43 100644
--- a/client/src/entities/known-absence.jsx
+++ b/client/src/entities/known-absence.jsx
@@ -10,9 +10,8 @@ import {
NumberInput,
ReferenceField,
required,
- SelectField,
TextField,
- TextInput,
+ TextInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -23,8 +22,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
import { BulkApproveAbsences } from 'src/components/BulkApproveAbsences';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
@@ -51,7 +50,7 @@ const filters = [
,
,
,
- ,
+ ,
{
- {!isPreview && }
+ {!isPreview && }
{isAdmin && }
{isAdmin && }
@@ -144,7 +143,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
>
diff --git a/client/src/entities/lesson.jsx b/client/src/entities/lesson.jsx
index cdd43dfb..68ca7a38 100644
--- a/client/src/entities/lesson.jsx
+++ b/client/src/entities/lesson.jsx
@@ -10,8 +10,7 @@ import {
required,
TextField,
TextInput,
- SelectField,
- minValue,
+ minValue
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField, MultiReferenceArrayField } from '@shared/components/fields/CommonReferenceField';
@@ -23,8 +22,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import { useUnique } from '@shared/utils/useUnique';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
@@ -45,7 +44,7 @@ const filters = [
dynamicFilter={filterByUserId}
alwaysOn
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -76,7 +75,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
/>
-
+
@@ -103,7 +102,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
diff --git a/client/src/entities/report-group.jsx b/client/src/entities/report-group.jsx
index 49c35526..95d6f454 100644
--- a/client/src/entities/report-group.jsx
+++ b/client/src/entities/report-group.jsx
@@ -2,12 +2,11 @@ import {
DateField,
TextField,
TextInput,
- SelectField,
ReferenceField,
ReferenceManyCount,
DateTimeInput,
required,
- maxLength,
+ maxLength
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
@@ -16,8 +15,8 @@ import {
filterByUserId,
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput } from '@shared/components/fields/CommonYear';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { BulkReportButton } from '@shared/components/crudContainers/BulkReportButton';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
@@ -52,7 +51,7 @@ const filters = [
,
,
,
- ,
+ ,
...commonAdminFilters,
];
@@ -70,7 +69,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
{isAdmin && }
@@ -102,7 +101,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
dynamicFilter={filterByUserIdAndYear}
validate={required()}
/>
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
diff --git a/client/src/entities/report-month.jsx b/client/src/entities/report-month.jsx
index 5b693a9a..d077423d 100644
--- a/client/src/entities/report-month.jsx
+++ b/client/src/entities/report-month.jsx
@@ -6,16 +6,16 @@ import {
NumberInput,
ReferenceField,
required,
- SelectField,
TextField,
- TextInput,
+ TextInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
const filters = [
@@ -23,7 +23,7 @@ const filters = [
,
,
,
- ,
+ ,
];
const filterDefaultValues = {
@@ -40,7 +40,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
{isAdmin && }
{isAdmin && }
@@ -59,7 +59,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
>
diff --git a/client/src/entities/student-klass.jsx b/client/src/entities/student-klass.jsx
index 6a93c6a5..ec17ace7 100644
--- a/client/src/entities/student-klass.jsx
+++ b/client/src/entities/student-klass.jsx
@@ -6,8 +6,7 @@ import {
ReferenceField,
required,
TextField,
- TextInput,
- SelectField,
+ TextInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -18,8 +17,8 @@ import {
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
@@ -29,7 +28,7 @@ const filters = [
,
,
,
- ,
+ ,
];
const filterDefaultValues = {
@@ -71,7 +70,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
reference="klass"
optionalTarget="key"
/>
-
+
{isAdmin && }
{isAdmin && }
@@ -95,7 +94,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
validate={required()}
dynamicFilter={filterByUserIdAndYear}
/>
-
+
{!isCreate && isAdmin && }
{!isCreate && isAdmin && }
>
diff --git a/client/src/entities/student-klasses-report.jsx b/client/src/entities/student-klasses-report.jsx
index 0b953a2c..5ca62a50 100644
--- a/client/src/entities/student-klasses-report.jsx
+++ b/client/src/entities/student-klasses-report.jsx
@@ -2,8 +2,8 @@ import { ReferenceField, TextField, SelectField } from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceArrayField, MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import {
CommonReferenceInputFilter,
@@ -35,7 +35,7 @@ const filters = [
reference="klass"
dynamicFilter={filterByUserIdAndYear}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -69,7 +69,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
>
-
+
{/*
diff --git a/client/src/entities/student-percent-report.jsx b/client/src/entities/student-percent-report.jsx
index af4d795f..906eaef1 100644
--- a/client/src/entities/student-percent-report.jsx
+++ b/client/src/entities/student-percent-report.jsx
@@ -4,8 +4,7 @@ import {
TextField,
ReferenceField,
useRecordContext,
- SelectField,
- TextInput,
+ TextInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -15,9 +14,9 @@ import {
filterByUserId,
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import { ShowMatchingRecordsButton } from '@shared/components/fields/ShowMatchingRecordsButton';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
const filters = [
@@ -41,7 +40,7 @@ const filters = [
'klassReferenceIds:$cont': 'klassReferenceId',
}}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -83,7 +82,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
reference="lesson"
optionalTarget="key"
/>
-
+
diff --git a/client/src/entities/student.jsx b/client/src/entities/student.jsx
index 1b1fe3f4..3e9b56ed 100644
--- a/client/src/entities/student.jsx
+++ b/client/src/entities/student.jsx
@@ -10,16 +10,15 @@ import {
ReferenceField,
ReferenceManyField,
required,
- SelectField,
SelectInput,
TextField,
- TextInput,
+ TextInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { useUnique } from '@shared/utils/useUnique';
import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
@@ -27,6 +26,7 @@ import StudentReportCardReactButton from 'src/reports/studentReportCardReactButt
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
+import { CommonYearField } from '@shared/components/fields/CommonYear';
const filters = [
...commonAdminFilters,
@@ -98,7 +98,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
reference="klass"
optionalTarget="key"
/>
-
+
diff --git a/client/src/entities/teacher-grade-report-status.jsx b/client/src/entities/teacher-grade-report-status.jsx
index ffdbae35..10c2cd4c 100644
--- a/client/src/entities/teacher-grade-report-status.jsx
+++ b/client/src/entities/teacher-grade-report-status.jsx
@@ -3,10 +3,9 @@ import {
ReferenceArrayField,
TextField,
required,
- SelectField,
BooleanInput,
TextInput,
- useGetList,
+ useGetList
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
@@ -16,8 +15,8 @@ import { BulkActionButton } from '@shared/components/crudContainers/BulkActionBu
import AttachEmailIcon from '@mui/icons-material/AttachEmail';
import BrowserUpdatedIcon from '@mui/icons-material/BrowserUpdated';
import { CommonRichTextInput } from '@shared/components/fields/CommonRichTextInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
const filters = [
@@ -28,7 +27,7 @@ const filters = [
reference="report_month"
dynamicFilter={filterByUserId}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -86,7 +85,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
diff --git a/client/src/entities/teacher-report-status.jsx b/client/src/entities/teacher-report-status.jsx
index 7aeb11f8..6e283f60 100644
--- a/client/src/entities/teacher-report-status.jsx
+++ b/client/src/entities/teacher-report-status.jsx
@@ -3,10 +3,9 @@ import {
ReferenceArrayField,
TextField,
required,
- SelectField,
BooleanInput,
TextInput,
- useGetList,
+ useGetList
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
@@ -16,8 +15,8 @@ import { BulkActionButton } from '@shared/components/crudContainers/BulkActionBu
import AttachEmailIcon from '@mui/icons-material/AttachEmail';
import BrowserUpdatedIcon from '@mui/icons-material/BrowserUpdated';
import { CommonRichTextInput } from '@shared/components/fields/CommonRichTextInput';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
const filters = [
@@ -28,7 +27,7 @@ const filters = [
reference="report_month"
dynamicFilter={filterByUserId}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -86,7 +85,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
diff --git a/client/src/entities/teacher-salary-report.jsx b/client/src/entities/teacher-salary-report.jsx
index 969bc29e..a51169dd 100644
--- a/client/src/entities/teacher-salary-report.jsx
+++ b/client/src/entities/teacher-salary-report.jsx
@@ -2,8 +2,8 @@ import { ReferenceField, TextField, SelectField, NumberField } from 'react-admin
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { CommonReferenceInputFilter, filterByUserId } from '@shared/components/fields/CommonReferenceInputFilter';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
@@ -20,7 +20,7 @@ const filters = [
reference="klass_type"
dynamicFilter={filterByUserId}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -48,7 +48,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
);
};
diff --git a/client/src/entities/transportation.jsx b/client/src/entities/transportation.jsx
index 9c275a05..21494105 100644
--- a/client/src/entities/transportation.jsx
+++ b/client/src/entities/transportation.jsx
@@ -6,21 +6,20 @@ import {
TextField,
TextInput,
NumberInput,
- maxLength,
- SelectField,
+ maxLength
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { useUnique } from '@shared/utils/useUnique';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearField, CommonYearInput, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import CommonTimeInput from '@shared/components/fields/CommonTimeInput';
const filters = [
...commonAdminFilters,
- ,
+ ,
,
,
];
@@ -38,7 +37,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
-
+
{isAdmin && }
{isAdmin && }
@@ -54,12 +53,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
-
+
diff --git a/client/src/pivots/PercentReportWithDatesList.jsx b/client/src/pivots/PercentReportWithDatesList.jsx
index 70c96dc0..dcc126a4 100644
--- a/client/src/pivots/PercentReportWithDatesList.jsx
+++ b/client/src/pivots/PercentReportWithDatesList.jsx
@@ -4,13 +4,12 @@ import {
TextField,
ReferenceField,
useRecordContext,
- SelectField,
useListFilterContext,
TextInput,
useAuthState,
usePermissions,
BooleanInput,
- NullableBooleanInput,
+ NullableBooleanInput
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
@@ -20,9 +19,9 @@ import {
filterByUserId,
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import { ShowMatchingRecordsButton } from '@shared/components/fields/ShowMatchingRecordsButton';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
import { isTeacherView } from 'src/utils/appPermissions';
@@ -65,7 +64,7 @@ const filters = [
label="חוץ משיעור"
dynamicFilter={lessonFilter}
/>,
- ,
+ ,
];
const filterDefaultValues = {
@@ -107,7 +106,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
reference="lesson"
optionalTarget="key"
/>
-
+
diff --git a/client/src/pivots/StudentAttendanceByKlassList.jsx b/client/src/pivots/StudentAttendanceByKlassList.jsx
index 9589db66..9eaa71f6 100644
--- a/client/src/pivots/StudentAttendanceByKlassList.jsx
+++ b/client/src/pivots/StudentAttendanceByKlassList.jsx
@@ -13,10 +13,10 @@ import {
TextInput,
DateInput,
NullableBooleanInput,
- SelectField,
} from 'react-admin';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { semesterChoices } from 'src/entities/report-month';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
@@ -56,7 +56,7 @@ const filters = [
reference="klass_type"
dynamicFilter={filterByUserId}
/>,
- ,
+ ,
,
,
{
-
+
{klassHeaders.map((h) => (
diff --git a/client/src/pivots/StudentAttendanceList.jsx b/client/src/pivots/StudentAttendanceList.jsx
index 52dafcfa..46d1b6db 100644
--- a/client/src/pivots/StudentAttendanceList.jsx
+++ b/client/src/pivots/StudentAttendanceList.jsx
@@ -14,10 +14,10 @@ import {
DateInput,
BooleanInput,
NullableBooleanInput,
- SelectField,
} from 'react-admin';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { CommonSelectArrayField } from '@shared/components/fields/CommonSelectArrayField';
import { semesterChoices } from 'src/entities/report-month';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
@@ -60,7 +60,7 @@ const filters = [
label="סנן לפי מקצועות"
dynamicFilter={filterByUserIdAndYear}
/>,
- ,
+ ,
,
,
{
-
+
{getPivotColumns(data)}
);
diff --git a/client/src/reports/studentReportCardReactButton.jsx b/client/src/reports/studentReportCardReactButton.jsx
index c0dac8ee..2d28c5f5 100644
--- a/client/src/reports/studentReportCardReactButton.jsx
+++ b/client/src/reports/studentReportCardReactButton.jsx
@@ -1,6 +1,6 @@
import { TextInput, DateInput, NumberInput } from 'react-admin';
-import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { defaultYearFilter } from '@shared/utils/yearFilter';
+import { CommonYearInput } from '@shared/components/fields/CommonYear';
import NoteAltIcon from '@mui/icons-material/NoteAlt';
import { BulkReportButton } from '@shared/components/crudContainers/BulkReportButton';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
@@ -24,7 +24,7 @@ export default ({ defaultRequestValues }) => {
defaultRequestValues={{ ...defaultValues, ...defaultRequestValues }}
requestValues={reportCardSettings}
>
-
+