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
58 changes: 58 additions & 0 deletions client/src/components/BulkApproveAbsences.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { useDataProvider, useNotify, useResourceContext, useRefresh, SimpleForm, TextInput, NumberInput, BooleanInput, DateInput, required, maxLength, ArrayInput, SimpleFormIterator } from 'react-admin';
import { ActionOrDialogButton } from '@shared/components/crudContainers/ActionOrDialogButton';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil';
import { isApprovedAbsencesBulk } from 'src/utils/appPermissions';

export const BulkApproveAbsences = ({ label, name, permissions }) => {
const dataProvider = useDataProvider();
const resource = useResourceContext();
const refresh = useRefresh();
const notify = useNotify();
if (!isApprovedAbsencesBulk(permissions)) return null;

const handleSave = async (values, onClose) => {
const payload = values.approvedAbsences.map(row => ({
studentReferenceId: values.studentReferenceId,
reportDate: values.reportDate,
absnceCode: values.absnceCode || null,
senderName: values.senderName || null,
reason: values.reason || null,
comment: values.comment || null,
isApproved: values.isApproved,
klassReferenceId: row.klassReferenceId,
lessonReferenceId: row.lessonReferenceId || null,
absnceCount: row.absnceCount,
}));
try {
const response = await dataProvider.createMany(resource, payload);
handleActionSuccess(notify)(response);
refresh();
onClose?.();
}
catch (err) {
handleError(notify)(err);
}
};

return (
<ActionOrDialogButton label={label} name="approvedAbsences" dialogContent={({ onClose }) => (
<SimpleForm onSubmit={values => handleSave(values, onClose)}>
<CommonReferenceInput source="studentReferenceId" reference="student_by_year" validate={required()} label="תלמידה" />
<DateInput source="reportDate" validate={required()} label="תאריך" />
<NumberInput source="absnceCode" label="קוד חיסור" />
<TextInput source="senderName" validate={maxLength(500)} label="שולחת" />
<TextInput source="reason" validate={maxLength(500)} label="סיבה" />
<TextInput source="comment" validate={maxLength(500)} label="הערה" />
<BooleanInput source="isApproved" defaultValue label="מאושר" />
<ArrayInput source="approvedAbsences" initialValues={[{ absnceCount: 1 }]} label="חיסורים לאישור">
<SimpleFormIterator>
<CommonReferenceInput source="klassReferenceId" reference="klass" validate={required()} label="כיתה" />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" label="שיעור" />
<NumberInput source="absnceCount" validate={required()} label="מספר חיסורים" defaultValue={1} />
</SimpleFormIterator>
</ArrayInput>
</SimpleForm>
)} />
);
};
10 changes: 10 additions & 0 deletions client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput
import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
import { BulkApproveAbsences } from 'src/components/BulkApproveAbsences';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
Expand Down Expand Up @@ -82,12 +83,21 @@ const importer = {
fields: ['studentTz', 'klassId', 'lessonId', 'reportDate', 'absnceCount', 'absnceCode', 'senderName', 'reason', 'comment', 'isApproved'],
}

const additionalListActions = [
<BulkApproveAbsences
key="approvedAbsences"
label="חיסורים מאושרים"
name="approvedAbsences"
/>,
];

const entity = {
Datagrid,
Inputs,
filters,
importer,
filterDefaultValues,
additionalListActions,
};

export default getResourceComponents(entity);
4 changes: 4 additions & 0 deletions client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const appPermissions = {
inLessonReportStartWithTeacher: 'inLessonReport.startWithTeacher',
absCountEffect: 'absCountEffect',
lessonSignature: 'lessonSignature',
approvedAbsencesBulk:'approvedAbsencesBulk'
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand All @@ -30,3 +31,6 @@ export const useIsAbsCountEffect = () => useHasPermission(appPermissions.absCoun

export const isLessonSignature = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.lessonSignature);
export const useIsLessonSignature = () => useHasPermission(appPermissions.lessonSignature);

export const isApprovedAbsencesBulk = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.approvedAbsencesBulk);
export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk);