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
84 changes: 70 additions & 14 deletions client/src/components/TeacherView/TeacherAccess.jsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,51 @@
import React from 'react';
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import Button from '@mui/material/Button';
import Card from '@mui/material/Card';
import CardContent from '@mui/material/CardContent';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Avatar from '@mui/material/Avatar';
import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
import LogoutIcon from '@mui/icons-material/Logout';
import Paper from '@mui/material/Paper';

export const TeacherGuard = ({ children }) => {
const dataProvider = useDataProvider();
const notify = useNotify();
const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher');

if (teacher) {
return <div key="view-dashboard">
שלום המורה {teacher.name}
<Button onClick={clear}>
התנתק
</Button>
{children}
</div>
return (
<Box display="flex" flexDirection="column" width="100%">
<Paper
elevation={1}
sx={{
p: 2,
mb: 2,
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center'
}}
>
<Typography variant="h6" component="div">
שלום המורה <strong>{teacher.name}</strong>
</Typography>
<Button
variant="outlined"
color="secondary"
onClick={clear}
startIcon={<LogoutIcon />}
>
התנתק
</Button>
</Paper>
<Box flexGrow={1}>
{children}
</Box>
</Box>
);
}

const handleSubmit = async (values) => {
Expand All @@ -34,11 +65,36 @@ export const TeacherGuard = ({ children }) => {
};

return (
<SimpleForm key="view-search-form" onSubmit={handleSubmit} resource="teacher"
toolbar={<Toolbar>
<SaveButton label="כניסה" />
</Toolbar>}>
<TextInput source="tz" label="ת.ז" />
</SimpleForm>
<Box
display="flex"
flexDirection="column"
alignItems="center"
justifyContent="center"
minHeight="100vh"
bgcolor="grey.100"
>
<Card sx={{ minWidth: 300, maxWidth: 400, p: 2, boxShadow: 3 }}>
<Box display="flex" flexDirection="column" alignItems="center" mb={2}>
<Avatar sx={{ m: 1, bgcolor: 'secondary.main' }}>
<LockOutlinedIcon />
</Avatar>
<Typography component="h1" variant="h5">
כניסת מורה
</Typography>
</Box>
<CardContent>
<SimpleForm
key="view-search-form"
onSubmit={handleSubmit}
resource="teacher"
toolbar={<Toolbar sx={{ display: 'flex', justifyContent: 'center', width: '100%', bgcolor: 'transparent', p: 0 }}>
<SaveButton label="כניסה" variant="contained" fullWidth color="secondary" />
</Toolbar>}
>
<TextInput source="tz" label="ת.ז" fullWidth variant="outlined" />
</SimpleForm>
</CardContent>
</Card>
</Box>
);
}
}
4 changes: 2 additions & 2 deletions client/src/entities/att-grade-effect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { NumberInput, TextField, TextInput, ReferenceField, DateField, DateTimeI
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<NumberInput source="percents" />,
<NumberInput source="count" />,
<NumberInput source="effect" />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ import { Inputs } from './att-report';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';
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';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<DateInput source="reportDate:$gte" label="תאריך דיווח אחרי" alwaysOn />,
<DateInput source="reportDate:$lte" label="תאריך דיווח לפני" alwaysOn />,
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/att-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ import { CommonReferenceInputFilter, filterByUserId, filterByUserIdAndYear } fro
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';
import { CommonHebrewDateField } from '@shared/components/fields/CommonHebrewDateField';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<DateInput source="reportDate:$gte" label="תאריך דיווח אחרי" alwaysOn />,
<DateInput source="reportDate:$lte" label="תאריך דיווח לפני" alwaysOn />,
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
Expand Down
3 changes: 2 additions & 1 deletion client/src/entities/attendance-name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
];
Expand Down
4 changes: 2 additions & 2 deletions client/src/entities/grade-name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ 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 { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
];
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/grade.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ import { CommonReferenceInputFilter, filterByUserId, filterByUserIdAndYear } fro
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<DateInput source="reportDate:$gte" label="תאריך דיווח אחרי" alwaysOn />,
<DateInput source="reportDate:$lte" label="תאריך דיווח לפני" alwaysOn />,
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
Expand Down
3 changes: 2 additions & 1 deletion client/src/entities/klass-type.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { filterByUserId, CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
];
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/klass.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ import { useUnique } from '@shared/utils/useUnique';
import { BulkReportButton } from '@shared/components/crudContainers/BulkReportButton';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import AssignmentIcon from '@mui/icons-material/Assignment';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
<CommonReferenceInputFilter source="klassTypeReferenceId" reference="klass_type" dynamicFilter={filterByUserId} />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ 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';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
<NullableBooleanInput source="student.isActive" label="תלמידה פעילה" />,
<CommonReferenceInputFilter source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/lesson.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@ import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import { useUnique } from '@shared/utils/useUnique';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
<CommonReferenceInputFilter source="klassReferenceIds:$cont" label="כיתה" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
Expand Down
8 changes: 2 additions & 6 deletions client/src/entities/report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ 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 { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<TextInput source="name:$cont" alwaysOn />,
<DateInput source="startDate" />,
<DateInput source="endDate" />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/student-klass.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { BulkFixReferenceButton } from '@shared/components/crudContainers/BulkFixReferenceButton';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<CommonReferenceInputFilter source="studentReferenceId" reference="student" dynamicFilter={filterByUserId} />,
<CommonReferenceInputFilter source="klassReferenceId" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
<NullableBooleanInput source="student.isActive" label="תלמידה פעילה" />,
Expand Down
3 changes: 2 additions & 1 deletion client/src/entities/student-klasses-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { defaultYearFilter, yearChoices } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { CommonReferenceInputFilter, filterByUserId, filterByUserIdAndYear } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<CommonReferenceInputFilter source="studentReferenceId" reference="student" dynamicFilter={filterByUserId} />,
<CommonReferenceInputFilter source="klassReferenceId1:$cont" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
<CommonReferenceInputFilter source="klassReferenceId2:$cont" reference="klass" dynamicFilter={filterByUserIdAndYear} />,
Expand Down
3 changes: 2 additions & 1 deletion client/src/entities/student-percent-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { CommonReferenceInputFilter, filterByUserId, filterByUserIdAndYear } fro
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';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
// <DateInput source="reportDate:$gte" label="תאריך דיווח אחרי" alwaysOn />,
// <DateInput source="reportDate:$lte" label="תאריך דיווח לפני" alwaysOn />,
<CommonReferenceInputFilter source="studentReferenceId" reference="student_by_year" dynamicFilter={{ ...filterByUserId, 'year:$cont': filterByUserIdAndYear.year }} />,
Expand Down
7 changes: 2 additions & 5 deletions client/src/entities/student.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ import { CommonReferenceInputFilter } from '@shared/components/fields/CommonRefe
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import { commonAdminFilters } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="createdAt:$lte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$gte" />,
({ isAdmin }) => isAdmin && <DateInput source="updatedAt:$lte" />,
...commonAdminFilters,
<TextInput source="tz:$cont" label="תז" />,
<TextInput source="name:$cont" alwaysOn />,
<NullableBooleanInput source="isActive" alwaysOn />,,
Expand Down
3 changes: 2 additions & 1 deletion client/src/entities/teacher-grade-report-status.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ 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 { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [
({ isAdmin }) => isAdmin && <CommonReferenceInputFilter source="userId" reference="user" />,
adminUserFilter,
<CommonReferenceInputFilter source="teacherReferenceId" reference="teacher" dynamicFilter={filterByUserId} />,
<CommonReferenceInputFilter source="reportMonthReferenceId" reference="report_month" dynamicFilter={filterByUserId} />,
<CommonAutocompleteInput source="year" choices={yearChoices} alwaysOn />,
Expand Down
Loading