Skip to content
Merged
44 changes: 22 additions & 22 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,28 +68,28 @@ import InLessonReport from 'src/reports/InLessonReport';
import MichlolFileHelper from '@shared/components/views/MichlolFileHelper';
import ApprovedAbsencesUpload from 'src/components/ApprovedAbsencesUpload';

import BadgeIcon from '@mui/icons-material/Badge';
import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircle';
import SchoolIcon from '@mui/icons-material/School';
import EventNoteIcon from '@mui/icons-material/EventNote';
import PortraitIcon from '@mui/icons-material/Portrait';
import WorkspacesIcon from '@mui/icons-material/Workspaces';
import GroupWorkIcon from '@mui/icons-material/GroupWork';
import ViewListIcon from '@mui/icons-material/ViewList';
import GradingIcon from '@mui/icons-material/Grading';
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemove';
import RuleIcon from '@mui/icons-material/Rule';
import SummarizeIcon from '@mui/icons-material/Summarize';
import CategoryIcon from '@mui/icons-material/Category';
import DateRangeIcon from '@mui/icons-material/DateRange';
import LabelIcon from '@mui/icons-material/Label';
import CalculateIcon from '@mui/icons-material/Calculate';
import UploadFileIcon from '@mui/icons-material/UploadFile';
import PermContactCalendarIcon from '@mui/icons-material/PermContactCalendar';
import LocalAtmIcon from '@mui/icons-material/LocalAtm';
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
import CelebrationIcon from '@mui/icons-material/Celebration';
import BadgeIcon from '@mui/icons-material/BadgeOutlined';
import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircleOutlined';
import SchoolIcon from '@mui/icons-material/SchoolOutlined';
import EventNoteIcon from '@mui/icons-material/EventNoteOutlined';
import PortraitIcon from '@mui/icons-material/PortraitOutlined';
import WorkspacesIcon from '@mui/icons-material/WorkspacesOutlined';
import GroupWorkIcon from '@mui/icons-material/GroupWorkOutlined';
import ViewListIcon from '@mui/icons-material/ViewListOutlined';
import GradingIcon from '@mui/icons-material/GradingOutlined';
import PlaylistRemoveIcon from '@mui/icons-material/PlaylistRemoveOutlined';
import RuleIcon from '@mui/icons-material/RuleOutlined';
import SummarizeIcon from '@mui/icons-material/SummarizeOutlined';
import CategoryIcon from '@mui/icons-material/CategoryOutlined';
import DateRangeIcon from '@mui/icons-material/DateRangeOutlined';
import LabelIcon from '@mui/icons-material/LabelOutlined';
import CalculateIcon from '@mui/icons-material/CalculateOutlined';
import UploadFileIcon from '@mui/icons-material/UploadFileOutlined';
import PermContactCalendarIcon from '@mui/icons-material/PermContactCalendarOutlined';
import LocalAtmIcon from '@mui/icons-material/LocalAtmOutlined';
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettingsOutlined';
import DirectionsBusIcon from '@mui/icons-material/DirectionsBusOutlined';
import CelebrationIcon from '@mui/icons-material/CelebrationOutlined';

const themeOptions = { primary: blue[700], secondary: purple[500] };

Expand Down
34 changes: 17 additions & 17 deletions client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { MenuItemLink } from 'react-admin';
import SummarizeIcon from '@mui/icons-material/Summarize';
import HelpIcon from '@mui/icons-material/Help';
import ImportContactsIcon from '@mui/icons-material/ImportContacts';
import CallIcon from '@mui/icons-material/Call';
import SettingsIcon from '@mui/icons-material/Settings';
import DocumentScannerIcon from '@mui/icons-material/DocumentScanner';
import DatasetIcon from '@mui/icons-material/Dataset';
import AnalyticsIcon from '@mui/icons-material/Analytics';
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
import MapIcon from '@mui/icons-material/Map';
import ContentPasteSearchIcon from '@mui/icons-material/ContentPasteSearch';
import EditCalendarIcon from '@mui/icons-material/EditCalendar';
import EventAvailableIcon from '@mui/icons-material/EventAvailable';
import PercentIcon from '@mui/icons-material/Percent';
import FileUploadIcon from '@mui/icons-material/FileUpload';
import ViewListIcon from '@mui/icons-material/ViewList';
import GridOnIcon from '@mui/icons-material/GridOn';
import SummarizeIcon from '@mui/icons-material/SummarizeOutlined';
import HelpIcon from '@mui/icons-material/HelpOutlined';
import ImportContactsIcon from '@mui/icons-material/ImportContactsOutlined';
import CallIcon from '@mui/icons-material/CallOutlined';
import SettingsIcon from '@mui/icons-material/SettingsOutlined';
import DocumentScannerIcon from '@mui/icons-material/DocumentScannerOutlined';
import DatasetIcon from '@mui/icons-material/DatasetOutlined';
import AnalyticsIcon from '@mui/icons-material/AnalyticsOutlined';
import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettingsOutlined';
import MapIcon from '@mui/icons-material/MapOutlined';
import ContentPasteSearchIcon from '@mui/icons-material/ContentPasteSearchOutlined';
import EditCalendarIcon from '@mui/icons-material/EditCalendarOutlined';
import EventAvailableIcon from '@mui/icons-material/EventAvailableOutlined';
import PercentIcon from '@mui/icons-material/PercentOutlined';
import FileUploadIcon from '@mui/icons-material/FileUploadOutlined';
import ViewListIcon from '@mui/icons-material/ViewListOutlined';
import GridOnIcon from '@mui/icons-material/GridOnOutlined';

import BaseLayout from '@shared/components/layout/Layout';
import BaseDashboard from '@shared/components/views/Dashboard';
Expand Down
4 changes: 2 additions & 2 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export default {
fields: {
defaultPageSize: 'מספר שורות בטבלה',
lateValue: 'שווי איחור',
dashboardItems: 'הגדרות לוח מחוונים',
dashboardItems: 'הגדרות תמונת מצב',
'dashboardItems.resource': 'מקור נתונים',
'dashboardItems.resourceHelperText': 'בחר את מקור הנתונים שברצונך להציג',
'dashboardItems.yearFilterType': 'סוג סינון שנה',
'dashboardItems.filter': 'פילטר נוסף בפורמט JSON (אופציונלי, ללא שנה)',
'dashboardItems.filter': 'סינון מותאם אישית (מתקדם)',
'dashboardItems.title': 'כותרת',
reportStyles: 'הגדרות עיצוב תעודה',
'reportStyles.type': 'סוג טקסט',
Expand Down
59 changes: 0 additions & 59 deletions client/src/settings/DashboardItemsInput.jsx

This file was deleted.

41 changes: 20 additions & 21 deletions client/src/settings/GeneralSettingsInput.jsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
import React from 'react';
import { Typography, Accordion, AccordionSummary, AccordionDetails } from '@mui/material';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import { NumberInput, required } from 'react-admin';
import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { PAGE_SIZE_OPTIONS } from '@shared/config/settings';

const pageSizeOptions = PAGE_SIZE_OPTIONS.map((option) => ({ id: option, name: option }));

export function GeneralSettingsInput() {
return (
<Accordion sx={{ width: '100%' }}>
<AccordionSummary
expandIcon={<ExpandMoreIcon />}
aria-controls="general-settings-content"
id="general-settings-header"
>
<Typography variant="h6">הגדרות כלליות</Typography>
</AccordionSummary>
<AccordionDetails>
<CommonAutocompleteInput
source="defaultPageSize"
choices={pageSizeOptions}
fullWidth
disableClearable
validate={required()}
/>
<NumberInput source="lateValue" fullWidth validate={required()} />
</AccordionDetails>
</Accordion>
<CommonSettingsAccordion
id="general-settings"
title="הגדרות כלליות"
subtitle="מספר שורות בטבלה ושווי איחור"
>
<CommonAutocompleteInput
source="defaultPageSize"
choices={pageSizeOptions}
fullWidth
disableClearable
validate={required()}
/>
<NumberInput
source="lateValue"
fullWidth
validate={required()}
helperText="המשקל של איחור אחד בחישוב החיסורים. לדוגמה, 0.3 אומר שכל איחור נספר כ-0.3 מחיסור (כלומר, כ-3-4 איחורים שווים לחיסור אחד)"
/>
</CommonSettingsAccordion>
);
}
86 changes: 57 additions & 29 deletions client/src/settings/ReportCardSettingsInput.jsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,64 @@
import React from 'react';
import { Typography, Accordion, AccordionSummary, AccordionDetails, Box } from '@mui/material';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import { Box } from '@mui/material';
import { BooleanInput, Link } from 'react-admin';
import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';

export function ReportCardSettingsInput() {
return (
<Accordion sx={{ width: '100%' }}>
<AccordionSummary
expandIcon={<ExpandMoreIcon />}
aria-controls="report-card-settings-content"
id="report-card-settings-header"
>
<Typography variant="h6">הגדרות ברירת מחדל לתעודה</Typography>
</AccordionSummary>
<AccordionDetails>
<Box sx={{ mb: 2 }}>
<Link to="/image" target="_blank">
להגדרת תמונות
</Link>
</Box>
<BooleanInput source="reportCardSettings.attendance" defaultChecked />
<BooleanInput source="reportCardSettings.grades" defaultChecked />
<BooleanInput source="reportCardSettings.showStudentTz" defaultChecked />
<BooleanInput source="reportCardSettings.groupByKlass" />
<BooleanInput source="reportCardSettings.hideAbsTotal" />
<BooleanInput source="reportCardSettings.minimalReport" />
<BooleanInput source="reportCardSettings.forceAtt" />
<BooleanInput source="reportCardSettings.forceGrades" />
<BooleanInput source="reportCardSettings.downComment" />
<BooleanInput source="reportCardSettings.lastGrade" defaultChecked />
<BooleanInput source="reportCardSettings.debug" defaultChecked />
</AccordionDetails>
</Accordion>
<CommonSettingsAccordion
id="report-card-settings"
title="הגדרות ברירת מחדל לתעודה"
subtitle="אילו נתונים יופיעו בתעודה כברירת מחדל"
>
<Box sx={{ mb: 2 }}>
<Link to="/image" target="_blank">
להגדרת תמונות
</Link>
</Box>
<BooleanInput
source="reportCardSettings.attendance"
defaultChecked
helperText="הצג את נתוני הנוכחות בתעודה"
/>
<BooleanInput
source="reportCardSettings.grades"
defaultChecked
helperText="הצג את הציונים בתעודה"
/>
<BooleanInput
source="reportCardSettings.showStudentTz"
defaultChecked
helperText="הצג את מספר תעודת הזהות של התלמידה בתעודה"
/>
<BooleanInput
source="reportCardSettings.groupByKlass"
helperText="קבץ את השורות בתעודה לפי כיתה"
/>
<BooleanInput
source="reportCardSettings.hideAbsTotal"
helperText="הסתר את שורת סיכום החיסורים הכללי בתחתית התעודה"
/>
<BooleanInput
source="reportCardSettings.minimalReport"
helperText="הצג רק את שורת הסיכום, ללא פירוט לפי שיעור"
/>
<BooleanInput
source="reportCardSettings.forceAtt"
helperText="הצג בתעודה רק שיעורים שיש בהם נתוני נוכחות"
/>
<BooleanInput
source="reportCardSettings.forceGrades"
helperText="הצג בתעודה רק שיעורים שיש בהם ציון"
/>
<BooleanInput
source="reportCardSettings.downComment"
helperText="הצג הערה חופשית מתחת לשם התלמידה בתעודה"
/>
<BooleanInput
source="reportCardSettings.lastGrade"
defaultChecked
helperText="הצג את הציון האחרון שנרשם, במקום ממוצע ציונים"
/>
</CommonSettingsAccordion>
);
}
Loading
Loading