diff --git a/client/shared b/client/shared
index d852588f..3d743786 160000
--- a/client/shared
+++ b/client/shared
@@ -1 +1 @@
-Subproject commit d852588fe84c0d264c89ba48fbb146e5b07ad63e
+Subproject commit 3d74378646c64e93aa3304786fa7679572506ad6
diff --git a/client/src/App.jsx b/client/src/App.jsx
index 380aa6d3..bc8e8db2 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -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] };
diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx
index 9e5e3a1f..81c73e7e 100644
--- a/client/src/GeneralLayout.jsx
+++ b/client/src/GeneralLayout.jsx
@@ -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';
diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js
index 0f332073..8421be52 100644
--- a/client/src/domainTranslations.js
+++ b/client/src/domainTranslations.js
@@ -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': 'סוג טקסט',
diff --git a/client/src/settings/DashboardItemsInput.jsx b/client/src/settings/DashboardItemsInput.jsx
deleted file mode 100644
index 72a5848e..00000000
--- a/client/src/settings/DashboardItemsInput.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import { Typography, Accordion, AccordionSummary, AccordionDetails } from '@mui/material';
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import { ArrayInput, SimpleFormIterator, required, TextInput } from 'react-admin';
-import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
-import { CommonEntityNameInput } from '@shared/components/fields/CommonEntityNameInput';
-import { CommonJsonInput } from '@shared/components/fields/CommonJsonItem';
-
-export function DashboardItemsInput() {
- return (
-
- }
- aria-controls="dashboard-items-content"
- id="dashboard-items-header"
- >
- הגדרות לוח מחוונים
-
-
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/client/src/settings/GeneralSettingsInput.jsx b/client/src/settings/GeneralSettingsInput.jsx
index 9f6cd58e..45861568 100644
--- a/client/src/settings/GeneralSettingsInput.jsx
+++ b/client/src/settings/GeneralSettingsInput.jsx
@@ -1,7 +1,6 @@
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';
@@ -9,24 +8,24 @@ const pageSizeOptions = PAGE_SIZE_OPTIONS.map((option) => ({ id: option, name: o
export function GeneralSettingsInput() {
return (
-
- }
- aria-controls="general-settings-content"
- id="general-settings-header"
- >
- הגדרות כלליות
-
-
-
-
-
-
+
+
+
+
);
}
diff --git a/client/src/settings/ReportCardSettingsInput.jsx b/client/src/settings/ReportCardSettingsInput.jsx
index 283b2045..31c07a2f 100644
--- a/client/src/settings/ReportCardSettingsInput.jsx
+++ b/client/src/settings/ReportCardSettingsInput.jsx
@@ -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 (
-
- }
- aria-controls="report-card-settings-content"
- id="report-card-settings-header"
- >
- הגדרות ברירת מחדל לתעודה
-
-
-
-
- להגדרת תמונות
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ להגדרת תמונות
+
+
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/client/src/settings/ReportStylesInput.jsx b/client/src/settings/ReportStylesInput.jsx
index fb550e18..37fe435c 100644
--- a/client/src/settings/ReportStylesInput.jsx
+++ b/client/src/settings/ReportStylesInput.jsx
@@ -1,8 +1,11 @@
import React from 'react';
-import { Typography, Accordion, AccordionSummary, AccordionDetails } from '@mui/material';
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import { ArrayInput, BooleanInput, NumberInput, SimpleFormIterator, required } from 'react-admin';
+import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material';
+import RestartAltIcon from '@mui/icons-material/RestartAltOutlined';
+import { useFormContext } from 'react-hook-form';
+import { BooleanInput, NumberInput } from 'react-admin';
+import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
+import { REPORT_STYLE_TYPES, REPORT_STYLE_DEFAULTS } from './settingsUtil';
// Common Google Fonts list
const fontOptions = [
@@ -23,39 +26,93 @@ const fontOptions = [
{ id: 'Georgia', name: 'Georgia' },
].sort((a, b) => a.name.localeCompare(b.name));
+// The grey placeholder text showing each default is easy to miss, so this
+// gives users a one-click way to actually fill the blank fields with those
+// same defaults instead of just eyeballing the placeholder.
+const LoadDefaultsButton = () => {
+ const { getValues, setValue } = useFormContext();
+
+ const handleClick = () => {
+ REPORT_STYLE_TYPES.forEach(({ id }, index) => {
+ const defaults = REPORT_STYLE_DEFAULTS[id];
+ const current = getValues(`reportStyles.${index}`) || {};
+ if (!current.fontFamily && defaults.fontFamily) {
+ setValue(`reportStyles.${index}.fontFamily`, defaults.fontFamily, { shouldDirty: true });
+ }
+ if (!current.fontSize && defaults.fontSize) {
+ setValue(`reportStyles.${index}.fontSize`, defaults.fontSize, { shouldDirty: true });
+ }
+ if (!current.isBold && defaults.isBold) {
+ setValue(`reportStyles.${index}.isBold`, true, { shouldDirty: true });
+ }
+ });
+ };
+
+ return (
+ } onClick={handleClick}>
+ טען ערכי ברירת מחדל
+
+ );
+};
+
export function ReportStylesInput() {
return (
-
- }
- aria-controls="report-styles-content"
- id="report-styles-header"
- >
- הגדרות עיצוב תעודה
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ חלק בתעודה
+ גופן
+ גודל
+ מודגש
+ נטוי
+
+
+
+ {REPORT_STYLE_TYPES.map(({ id, label }, index) => (
+
+
+
+ {label}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
);
}
diff --git a/client/src/settings/Settings.jsx b/client/src/settings/Settings.jsx
index acc7c0b6..1c8c7f96 100644
--- a/client/src/settings/Settings.jsx
+++ b/client/src/settings/Settings.jsx
@@ -13,8 +13,9 @@ import {
} from 'react-admin';
import { useNavigate } from 'react-router-dom';
import { getDefaultPageSize } from '@shared/utils/settingsUtil';
-import { getLateValue, getDashboardItems, getReportStyles, getReportCardSettings } from './settingsUtil';
-import { DashboardItemsInput } from './DashboardItemsInput';
+import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
+import { DashboardItemsInput } from '@shared/components/settings/DashboardItemsInput';
+import { getLateValue, getDashboardItems, getReportStyles, getReportCardSettings, normalizeReportStyles } from './settingsUtil';
import { ReportStylesInput } from './ReportStylesInput';
import { GeneralSettingsInput } from './GeneralSettingsInput';
import { ReportCardSettingsInput } from './ReportCardSettingsInput';
@@ -38,7 +39,7 @@ export default function Settings() {
defaultPageSize: getDefaultPageSize(identity),
lateValue: getLateValue(identity),
dashboardItems: getDashboardItems(identity),
- reportStyles: getReportStyles(identity),
+ reportStyles: normalizeReportStyles(getReportStyles(identity)),
reportCardSettings: getReportCardSettings(identity),
phoneNumber: identity?.phoneNumber ?? '',
};
@@ -65,11 +66,17 @@ export default function Settings() {
}>
-
+
-
-
+
+
+
+
diff --git a/client/src/settings/settingsUtil.js b/client/src/settings/settingsUtil.js
index 31651390..0c386241 100644
--- a/client/src/settings/settingsUtil.js
+++ b/client/src/settings/settingsUtil.js
@@ -44,6 +44,46 @@ export function getReportStyles(identity) {
return identity?.additionalData?.reportStyles || [];
}
+// The report card only ever has these six style slots - it's a fixed set,
+// not an open-ended list, so the settings UI shouldn't ask users to add rows
+// and pick a "type" for each. `type` stays on each object (report generation
+// reads styles by type), it's just no longer a field the user edits.
+export const REPORT_STYLE_TYPES = [
+ { id: 'titlePrimary', label: 'כותרת ראשית' },
+ { id: 'titleSecondary', label: 'כותרת משנית (תאריכים)' },
+ { id: 'titleThird', label: 'כותרת שלישית' },
+ { id: 'tableHeader', label: 'כותרת טבלה' },
+ { id: 'tableCell', label: 'תא טבלה' },
+ { id: 'document', label: 'טקסט כללי' },
+];
+
+// What the report actually renders with when a field is left blank - mirrors
+// defaultReportStyles in server/src/reports/studentReportCardReact.tsx, so
+// keep the two in sync if that file's defaults ever change.
+export const REPORT_STYLE_DEFAULTS = {
+ titlePrimary: { fontSize: 18, isBold: true },
+ titleSecondary: { fontSize: 16, isBold: true },
+ titleThird: { fontSize: 16, isBold: true },
+ tableHeader: { fontSize: 16, isBold: true },
+ tableCell: { fontSize: 16 },
+ document: { fontFamily: 'Roboto', fontSize: 12 },
+};
+
+// Existing users may have 0-6 style entries, saved in whatever order they
+// were added in - re-map them onto the fixed 6 slots by `type` so a form
+// field bound to `reportStyles.` always edits the right slot.
+export function normalizeReportStyles(rawStyles = []) {
+ return REPORT_STYLE_TYPES.map(({ id }) => (
+ rawStyles.find((style) => style.type === id) || {
+ type: id,
+ fontFamily: '',
+ fontSize: null,
+ isBold: false,
+ isItalic: false,
+ }
+ ));
+}
+
export const useReportCardSettings = () => {
const { identity } = useGetIdentity();
return getReportCardSettings(identity);
@@ -65,6 +105,5 @@ export function getDefaultReportCardSettings() {
forceGrades: false,
downComment: false,
lastGrade: true,
- debug: true,
};
}