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: 4 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityG
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 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";
import klass from "src/entities/klass";
import klassType from "src/entities/klass-type";
Expand Down Expand Up @@ -136,6 +138,8 @@ const App = () => (
<CustomRoutes>
<Route path="/in-lesson-report-att/*" element={<TeacherGuard> <InLessonReport /> </TeacherGuard>} />
<Route path="/in-lesson-report-grade/*" element={<TeacherGuard> <InLessonReport gradeMode /> </TeacherGuard>} />
<Route path="/percent-report-with-dates" element={<TeacherPercentReportWithDatesList />} />
<Route path="/student/student-attendance" element={<TeacherStudentAttendanceList />} />
</CustomRoutes>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const menuGroups = [
<MenuItemLink key="approved-absences-upload" to="/approved-absences-upload" primaryText="העלאת חיסורים מאושרים" leftIcon={<FileUploadIcon />} />
]
}),
({ permissions }) => (isStandardView(permissions)) && ({
name: 'report', icon: <AnalyticsIcon />, routes: [
({ 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 />} />,
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import PercentReportWithDatesList from "src/pivots/PercentReportWithDatesList";
import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx";
import { useObjectStore } from "src/utils/storeUtil";

const TeacherPercentReportWithDatesList = (props) => {
const { value: teacher } = useObjectStore("teacher");
const teacherFilter = {
teacherReferenceId: teacher?.id,
};

return (
<TeacherGuard>
<PercentReportWithDatesList {...props} filter={teacherFilter} />
</TeacherGuard>
);
};
export default TeacherPercentReportWithDatesList;
17 changes: 17 additions & 0 deletions client/src/components/TeacherView/student-attendance-list.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import StudentAttendanceList from "src/pivots/StudentAttendanceList.jsx";
import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx";
import { useObjectStore } from "src/utils/storeUtil";

const TeacherStudentAttendanceList = (props) => {
const { value: teacher } = useObjectStore("teacher");
const teacherFilter = {
teacherReferenceId: teacher?.id,
};

return (
<TeacherGuard>
<StudentAttendanceList {...props} filter={teacherFilter} />
</TeacherGuard>
);
};
export default TeacherStudentAttendanceList;
24 changes: 13 additions & 11 deletions client/src/components/TeacherView/taecher-att-report-list.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import attReport from '../../entities/att-report-with-report-month.jsx';
import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess.jsx';
import { useObjectStore } from 'src/utils/storeUtil';
import attReport from "../../entities/att-report-with-report-month.jsx";
import { TeacherGuard } from "src/components/TeacherView/TeacherAccess.jsx";
import { useObjectStore } from "src/utils/storeUtil";

const BaseList = attReport.list;

const teacherAttReportList = (props) => {
const { value: teacher } = useObjectStore('teacher');
const teacherFilter = {
teacherReferenceId: teacher?.id
};
const { value: teacher } = useObjectStore("teacher");
const teacherFilter = {
teacherReferenceId: teacher?.id,
};

return <TeacherGuard> <BaseList {...props} filter={teacherFilter} /> </TeacherGuard>;


}
return (
<TeacherGuard>
<BaseList {...props} filter={teacherFilter} />
</TeacherGuard>
);
};
export default { list: teacherAttReportList };
4 changes: 2 additions & 2 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDat
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { useIsLessonSignature } from 'src/utils/appPermissions';
import { useIsLessonSignature, isTeacherView } from 'src/utils/appPermissions';

const filters = [
...commonAdminFilters,
Expand All @@ -22,7 +22,7 @@ const filters = [
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
<NullableBooleanInput source="student.isActive" label="תלמידה פעילה" />,
<TextInput source="studentBaseKlass.klassName:$cont" label="כיתת בסיס" />,
<CommonReferenceInputFilter source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />,
({ permissions }) => !isTeacherView(permissions) && (<CommonReferenceInputFilter source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />),
<CommonReferenceInputFilter source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
<CommonReferenceInputFilter source="klass.klassTypeReferenceId" reference="klass_type" dynamicFilter={filterByUserId} />,
<CommonReferenceInputFilter source="lessonReferenceId" reference="lesson" dynamicFilter={{ ...filterByUserIdAndYear, teacherReferenceId: 'teacherReferenceId', 'klassReferenceIds:$cont': 'klassReferenceId' }} />,
Expand Down
3 changes: 2 additions & 1 deletion client/src/pivots/PercentReportWithDatesList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import { ShowMatchingRecordsButton } from '@shared/components/fields/ShowMatchingRecordsButton';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
import { isTeacherView } from 'src/utils/appPermissions';

const filters = [
adminUserFilter,
Expand All @@ -16,7 +17,7 @@ const filters = [
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
<NullableBooleanInput source="student.isActive" label="תלמידה פעילה" />,
<TextInput source="studentBaseKlass.klassName:$cont" label="כיתת בסיס" />,
<CommonReferenceInputFilter source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />,
({ permissions }) => !isTeacherView(permissions) && (<CommonReferenceInputFilter source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />),
<CommonReferenceInputFilter source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
<CommonReferenceInputFilter source="klass.klassTypeReferenceId" reference="klass_type" dynamicFilter={filterByUserId} />,
<CommonReferenceInputFilter source="lessonReferenceId" reference="lesson" dynamicFilter={{ ...filterByUserIdAndYear, teacherReferenceId: 'teacherReferenceId', 'klassReferenceIds:$cont': 'klassReferenceId' }} />,
Expand Down