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
2 changes: 1 addition & 1 deletion client/shared
11 changes: 3 additions & 8 deletions client/src/components/StudentView/student-event-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -231,12 +231,7 @@ const StudentEventReport = (props) => {
</SimpleFormIterator>
</ArrayInput>
<NumberInput source="absnceCode" validate={required()} />
<CommonAutocompleteInput
source="year"
choices={yearChoices}
defaultValue={defaultYearFilter.year}
disabled
/>
<CommonYearInput disabled />
<BooleanInput source="isApproved" defaultValue={true} disabled />
<SignatureInput
source="signatureData"
Expand Down
18 changes: 6 additions & 12 deletions client/src/entities/absenceType.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,21 @@ import {
TextInput,
NumberInput,
maxLength,
SelectField,
ArrayInput,
SimpleFormIterator,
SimpleFormIterator
} 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 { CommonRepresentation } from '@shared/components/CommonRepresentation';

const filters = [
...commonAdminFilters,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
<TextInput source="name:$cont" />,
];

Expand All @@ -39,7 +38,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {

<TextField source="name" />
<TextField source="quota" />
<SelectField source="year" choices={yearChoices} />
<CommonYearField />

<TextField source="requiredLabels" />

Expand All @@ -56,12 +55,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<TextInput source="name" validate={[required(), maxLength(100)]} />
<NumberInput source="quota" step={1} validate={[required()]} />
<CommonAutocompleteInput
source="year"
choices={yearChoices}
validate={required()}
defaultValue={defaultYearFilter.year}
/>
<CommonYearInput validate={required()} />
<ArrayInput source="requiredLabels">
<SimpleFormIterator>
<TextInput fullWidth />
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -68,7 +67,7 @@ const filters = [
}}
/>,
<CommonReferenceInput source="reportMonthReferenceId" reference="report_month" dynamicFilter={filterByUserId} />,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
Expand All @@ -79,7 +78,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
const additionalBulkButtons = [
<BulkActionButton label="שינוי כיתה" icon={<ClassIcon />} name="bulkChangeKlass" key="bulkChangeKlass" reloadOnEnd>
{isAdmin && <CommonReferenceInput source="userId" reference="user" />}
{isAdmin && <CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />}
{isAdmin && <CommonYearInput />}
<CommonReferenceInput source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />
</BulkActionButton>,
<BulkActionButton label="הוספת חיסורים מאושרים" icon={<PlaylistRemoveIcon />} name="bulkKnownAbsences">
Expand Down Expand Up @@ -158,7 +157,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
</ReferenceField>
)}
<MultiReferenceField source="reportMonthReferenceId" sortBy="reportMonth.name" reference="report_month" />
<SelectField source="year" choices={yearChoices} />
<CommonYearField />
<DateField source="reportDate" />
<CommonHebrewDateField source="reportDate" />
<NumberField source="howManyLessons" />
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/att-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';

Expand Down Expand Up @@ -53,7 +52,7 @@ const filters = [
'klassReferenceIds:$cont': 'klassReferenceId',
}}
/>,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
Expand Down Expand Up @@ -116,7 +115,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
<TextField source="topic" />
</ReferenceField>
)}
<SelectField source="year" choices={yearChoices} />
<CommonYearField />
<DateField source="reportDate" />
<CommonHebrewDateField source="reportDate" />
<NumberField source="howManyLessons" />
Expand Down Expand Up @@ -168,7 +167,7 @@ export const Inputs = ({ isCreate, isAdmin }) => {
<NumberInput source="absCount" defaultValue={0} />
{/* <NumberInput source="approvedAbsCount" defaultValue={0} /> */}
<TextInput source="comments" validate={maxLength(500)} />
<CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />
<CommonYearInput />
{/* <TextInput source="sheetName" validate={maxLength(100)} /> */}
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/grade.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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 = [
Expand All @@ -47,7 +46,7 @@ const filters = [
'klassReferenceIds:$cont': 'klassReferenceId',
}}
/>,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
Expand Down Expand Up @@ -89,7 +88,7 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
reference="lesson"
optionalTarget="key"
/>
<SelectField source="year" choices={yearChoices} />
<CommonYearField />
<DateField source="reportDate" />
{/* <NumberField source="howManyLessons" /> */}
<NumberField source="grade" />
Expand Down Expand Up @@ -135,7 +134,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<NumberInput source="grade" validate={required()} />
<TextInput source="estimation" validate={maxLength(500)} />
<TextInput source="comments" validate={maxLength(500)} />
<CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />
<CommonYearInput />
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/klass.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
SelectField,
TextField,
TextInput,
ReferenceField,
Expand All @@ -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';
Expand All @@ -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';
Expand All @@ -41,7 +40,7 @@ const filters = [
reference="teacher"
dynamicFilter={filterByUserId}
/>,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
Expand Down Expand Up @@ -91,7 +90,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
optionalSource="teacherId"
optionalTarget="tz"
/>
<SelectField source="year" choices={yearChoices} />
<CommonYearField />
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
</CommonDatagrid>
Expand All @@ -114,7 +113,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
dynamicFilter={filterByUserId}
/>
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />
<CommonYearInput />
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand All @@ -51,7 +50,7 @@ const filters = [
<TextInput source="reason:$cont" label="סיבה" />,
<TextInput source="comment:$cont" label="הערות" />,
<NullableBooleanInput source="isApproved" />,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
<CommonReferenceInputFilter
source="absenceTypeId"
reference="absence_type"
Expand Down Expand Up @@ -100,7 +99,7 @@ const Datagrid = ({ isAdmin, children, isPreview, ...props }) => {
<TextField source="reason" />
<TextField source="comment" />
<BooleanField source="isApproved" />
{!isPreview && <SelectField source="year" choices={yearChoices} />}
{!isPreview && <CommonYearField />}
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
</CommonDatagrid>
Expand Down Expand Up @@ -144,7 +143,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<TextInput source="reason" validate={maxLength(500)} />
<TextInput source="comment" validate={maxLength(500)} />
<BooleanInput source="isApproved" defaultValue={true} />
<CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />
<CommonYearInput />
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
Expand Down
13 changes: 6 additions & 7 deletions client/src/entities/lesson.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand All @@ -45,7 +44,7 @@ const filters = [
dynamicFilter={filterByUserId}
alwaysOn
/>,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
<CommonYearInputFilter />,
];

const filterDefaultValues = {
Expand Down Expand Up @@ -76,7 +75,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
/>
<DateField source="startDate" />
<DateField source="endDate" />
<SelectField source="year" choices={yearChoices} />
<CommonYearField />
<TextField source="comment" />
<TextField source="howManyLessons" />
<TextField source="order" />
Expand All @@ -103,7 +102,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
<CommonReferenceInput source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />
<DateInput source="startDate" />
<DateInput source="endDate" />
<CommonAutocompleteInput source="year" choices={yearChoices} defaultValue={defaultYearFilter.year} />
<CommonYearInput />
<TextInput source="comment" validate={[maxLength(1000)]} />
<NumberInput source="howManyLessons" validate={minValue(0)} />
<NumberInput source="order" />
Expand Down
Loading
Loading