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
4 changes: 2 additions & 2 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { TeacherGuard } from './components/TeacherView/TeacherAccess';
import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityGuesser';
import attReport from "src/entities/att-report";
import attReportWithReportMonth from './entities/att-report-with-report-month';
import teacherAttReportList from 'src/components/TeacherView/taecher-att-report-list';
import teacherAttReport from 'src/components/TeacherView/taecher-att-report-list';
import TeacherPercentReportWithDatesList from 'src/components/TeacherView/percent-report-with-dates-list';
import TeacherStudentAttendanceList from 'src/components/TeacherView/student-attendance-list';
import grade from "src/entities/grade";
Expand Down Expand Up @@ -134,7 +134,7 @@ const App = () => (
<>
<Resource name="teacher" />
<Resource name="lesson" />
<Resource name="att_report_with_report_month" {...teacherAttReportList} icon={ViewListIcon} />
<Resource name="att_report_with_report_month" {...teacherAttReport} icon={ViewListIcon} />
<CustomRoutes>
<Route path="/in-lesson-report-att/*" element={<TeacherGuard> <InLessonReport /> </TeacherGuard>} />
<Route path="/in-lesson-report-grade/*" element={<TeacherGuard> <InLessonReport gradeMode /> </TeacherGuard>} />
Expand Down
9 changes: 5 additions & 4 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ const menuGroups = [
<MenuItemLink key="approved-absences-upload" to="/approved-absences-upload" primaryText="העלאת חיסורים מאושרים" leftIcon={<FileUploadIcon />} />
]
}),
({ permissions }) => !isOnlyInLessonReport(permissions) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
<MenuItemLink key="student-attendance" to="/student/student-attendance" primaryText="דוח נוכחות (פיבוט)" leftIcon={<SummarizeIcon />} />,
<MenuItemLink key="percent-report-with-dates" to="/percent-report-with-dates" primaryText="דוח אחוזים לתלמידה" leftIcon={<PercentIcon />} />,
({ permissions }) => !isOnlyInLessonReport(permissions) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
...(!isTeacherView(permissions) ? [
<MenuItemLink key="student-attendance" to="/student/student-attendance" primaryText="דוח נוכחות (פיבוט)" leftIcon={<SummarizeIcon />} />] : []),
<MenuItemLink key="percent-report-with-dates" to="/percent-report-with-dates" primaryText="דוח אחוזים לתלמידה" leftIcon={<PercentIcon />} />
]
}),
{ name: 'settings', icon: <SettingsIcon /> },
Expand Down
14 changes: 13 additions & 1 deletion client/src/components/TeacherView/taecher-att-report-list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx";
import { useObjectStore } from "src/utils/storeUtil";

const BaseList = attReport.list;
const BaseEdit = attReport.edit;

const teacherAttReportList = (props) => {
const { value: teacher } = useObjectStore("teacher");
Expand All @@ -16,4 +17,15 @@ const teacherAttReportList = (props) => {
</TeacherGuard>
);
};
export default { list: teacherAttReportList };

const teacherAttReportEdit = (props) => {
return (
<TeacherGuard>
<BaseEdit {...props} />
</TeacherGuard>
);
};
export default {
list: teacherAttReportList,
edit: teacherAttReportEdit,
};
6 changes: 4 additions & 2 deletions client/src/entities/att-report.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DateField, DateInput, DateTimeInput, NumberField, NumberInput, TextField, TextInput, ReferenceField, required, minValue, maxLength, SelectField } from 'react-admin';
import { useIsLessonSignature } from 'src/utils/appPermissions';
import { useIsLessonSignature, useIsTeacherView } from 'src/utils/appPermissions';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
Expand Down Expand Up @@ -62,11 +62,13 @@ export const Datagrid = ({ isAdmin, children, ...props }) => {
}

export const Inputs = ({ isCreate, isAdmin }) => {
const isTeacher = useIsTeacherView();

return <>
{!isCreate && isAdmin && <TextInput source="id" disabled />}
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<CommonReferenceInput source="studentReferenceId" reference="student_by_year" validate={required()} dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />
<CommonReferenceInput source="teacherReferenceId" reference="teacher" validate={required()} dynamicFilter={filterByUserId} />
{!isTeacher && <CommonReferenceInput source="teacherReferenceId" reference="teacher" validate={required()} dynamicFilter={filterByUserId} />}
<CommonReferenceInput source="klassReferenceId" reference="klass" validate={required()} dynamicFilter={filterByUserIdAndYear} />
<CommonReferenceInput source="lessonReferenceId" reference="lesson" validate={required()} dynamicFilter={filterByUserIdAndYear} />
<DateInput source="reportDate" validate={required()} />
Expand Down