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
11 changes: 11 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import attendanceName from 'src/entities/attendance-name';
import attGradeEffect from './entities/att-grade-effect';
import reportGroup from './entities/report-group';
import reportGroupSession from './entities/report-group-session';
import teacherReportedToday from './entities/teacher-reported-today';
import Settings from 'src/settings/Settings';

import StudentAttendanceList from 'src/pivots/StudentAttendanceList';
Expand All @@ -62,6 +63,7 @@ import {
isAbsenceType,
isLessonSchedule,
isStudentView,
isSeminarAttendanceYemot,
} from 'src/utils/appPermissions';
import ScannerUpload from '@shared/components/views/ScannerUpload';
import InLessonReport from 'src/reports/InLessonReport';
Expand Down Expand Up @@ -90,6 +92,7 @@ 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';
import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedInOutlined';

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

Expand Down Expand Up @@ -218,6 +221,14 @@ const App = () => (
options={{ menuGroup: 'report' }}
icon={RuleIcon}
/>
{isSeminarAttendanceYemot(permissions) && (
<Resource
name="teacher_reported_today"
{...teacherReportedToday}
options={{ menuGroup: 'report' }}
icon={AssignmentTurnedInIcon}
/>
)}
<Resource
name="teacher_grade_report_status"
{...teacherGradeReportStatus}
Expand Down
11 changes: 11 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default {
lateValue: 'שווי איחור',
phoneNumber: 'מספר טלפון',
yemotApiKey: 'מפתח API של Yemot',
managerPhone: 'טלפון מנהלת',
dashboardItems: 'הגדרות תמונת מצב',
reportStyles: 'הגדרות עיצוב תעודה',
reportCardSettings: 'הגדרות ברירת מחדל לתעודה',
Expand Down Expand Up @@ -299,6 +300,16 @@ export default {
notReportedLessons: 'שיעורים שלא דווחו',
},
},
teacher_reported_today: {
name: 'מורות שדיווחו נוכחות',
fields: {
...generalResourceFieldsTranslation,
teacherReferenceId: 'מורה',
reportDate: 'תאריך דיווח',
lessonReferenceId: 'שיעור',
reportHour: 'שעת דיווח',
},
},
teacher_grade_report_status: {
name: 'ציונים למורה',
fields: {
Expand Down
92 changes: 92 additions & 0 deletions client/src/entities/teacher-reported-today.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { ChipField, DateInput, ReferenceField, RecordContextProvider, TextField, useListContext } from 'react-admin';
import { Box, Card, CardContent, Typography } from '@mui/material';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const todayDateOnly = new Date().toISOString().slice(0, 10);

const filters = [
adminUserFilter,
<DateInput source="reportDate:$gte" label="מתאריך" alwaysOn />,
<DateInput source="reportDate:$lte" label="עד תאריך" alwaysOn />,
];

const filterDefaultValues = {
'reportDate:$gte': todayDateOnly,
'reportDate:$lte': todayDateOnly,
};

const formatDate = (value) => (value ? new Date(value).toLocaleDateString('he-IL') : '');
const formatHour = (value) => (value ? new Date(value).toLocaleTimeString('he-IL', { hour: '2-digit', minute: '2-digit' }) : '');

// The view has one row per teacher+lesson+date; group rows sharing the same
// teacher+date into a single card, collecting their lesson rows.
function groupByTeacherAndDate(rows) {
const groups = new Map();
rows.forEach((row) => {
const key = `${row.userId}_${row.teacherReferenceId}_${row.reportDate}`;
if (!groups.has(key)) {
groups.set(key, { ...row, lessonRows: [] });
}
if (row.lessonReferenceId) {
groups.get(key).lessonRows.push(row);
}
});
return [...groups.values()];
}

const TeacherReportCards = ({ isAdmin }) => {
const { data } = useListContext();
const groups = groupByTeacherAndDate(data || []);

return (
<Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(320px, 1fr))', gap: 2, padding: 2 }}>
{groups.map((group) => (
<RecordContextProvider key={group.id} value={group}>
<Card variant="outlined">
<CardContent>
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', flexWrap: 'wrap', gap: 1 }}>
<Typography variant="h6">
<ReferenceField source="teacherReferenceId" reference="teacher">
<TextField source="name" />
</ReferenceField>
</Typography>
<Box sx={{ display: 'flex', gap: 1.5, alignItems: 'center' }}>
{isAdmin && <ReferenceField source="userId" reference="user" />}
<Typography variant="body2" color="text.secondary">{formatDate(group.reportDate)}</Typography>
<Typography variant="body2" color="text.secondary">{formatHour(group.reportHour)}</Typography>
</Box>
</Box>
<Box sx={{ display: 'flex', gap: 1, flexWrap: 'wrap', marginTop: 1.5 }}>
{group.lessonRows.length > 0 ? (
group.lessonRows.map((row) => (
<RecordContextProvider key={row.id} value={row}>
<ReferenceField source="lessonReferenceId" reference="lesson">
<ChipField source="name" size="small" color="primary" variant="outlined" />
</ReferenceField>
</RecordContextProvider>
))
) : (
<Typography variant="body2" color="text.secondary">ללא שיוך שיעור</Typography>
)}
</Box>
</CardContent>
</Card>
</RecordContextProvider>
))}
</Box>
);
};

const Datagrid = ({ isAdmin }) => <TeacherReportCards isAdmin={isAdmin} />;

const entity = {
Datagrid,
filters,
filterDefaultValues,
exporter: false,
configurable: false,
sort: { field: 'reportDate', order: 'DESC' },
};

export default getResourceComponents(entity);
3 changes: 3 additions & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ export default [
{ html: 'העלאת קובץ אקסל של מערכת שעות וזיהוי אוטומטי של השיעור בדיווח נוכחות בטלפון', status: 'בוצע', statusColor: 'success' },
{ html: 'אפשרות לבחור בין "וגם" ל"או" בין סינון נוכחות וציון בתעודה', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת דף בית פומבי המסביר את המערכת', status: 'בוצע', statusColor: 'success' },
{ html: 'הקראת שם התלמידה ואישור לפני שמירת חיסור בדיווח נוכחות בטלפון', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת אפשרות למנהלת להתקשר ולשמוע אילו מורות דיווחו נוכחות היום', status: 'בוצע', statusColor: 'success' },
{ html: 'הוספת דוח המציג אילו מורות דיווחו נוכחות בתאריך נבחר', status: 'בוצע', statusColor: 'success' },

// { html: 'הגדרת תקופת זמן לפי תאריכים', status: 'בקרוב', statusColor: 'warning' },
// { html: 'הגדרת תקופת זמן לפי יום בשבוע', status: 'בוצע', statusColor: 'success' },
Expand Down
31 changes: 31 additions & 0 deletions client/src/settings/ManagerPhoneSettingsInput.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { TextInput, maxLength, useGetIdentity } from 'react-admin';
import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
import { useIsSeminarAttendanceYemot } from 'src/utils/appPermissions';

export const ManagerPhoneSettingsInput = () => {
const { identity } = useGetIdentity();
const isSeminarAttendanceYemot = useIsSeminarAttendanceYemot();

if (!isSeminarAttendanceYemot) {
return null;
}

return (
<CommonSettingsAccordion
id="manager-phone-settings"
title="טלפון מנהלת"
subtitle="מספר הטלפון של המנהלת, לשמיעת דוח נוכחות מורות יומי בטלפון"
>
<TextInput
source="managerPhone"
label="resources.settings.fields.managerPhone"
helperText="מהמספר הזה ניתן יהיה להתקשר ולשמוע אילו מורות דיווחו היום ואילו לא"
fullWidth
validate={maxLength(11)}
defaultValue={identity?.additionalData?.managerPhone ?? ''}
/>
</CommonSettingsAccordion>
);
};

export default ManagerPhoneSettingsInput;
2 changes: 2 additions & 0 deletions client/src/settings/Settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { GeneralSettingsInput } from './GeneralSettingsInput';
import { ReportCardSettingsInput } from './ReportCardSettingsInput';
import { YemotSettingsInput } from '@shared/components/phone/YemotSettingsInput';
import { PhoneSettingsInput } from '@shared/components/phone/PhoneSettingsInput';
import { ManagerPhoneSettingsInput } from './ManagerPhoneSettingsInput';

const SettingsToolbar = () => (
<Toolbar>
Expand Down Expand Up @@ -76,6 +77,7 @@ export default function Settings() {
>
<DashboardItemsInput />
<YemotSettingsInput />
<ManagerPhoneSettingsInput />
</CommonSettingsAccordion>
</SimpleForm>
</ResourceContextProvider>
Expand Down
46 changes: 46 additions & 0 deletions server/src/db/view-entities/TeacherReportedToday.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { Column, DataSource, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { AttReport } from '../entities/AttReport.entity';

@ViewEntity('teacher_reported_today', {
expression: (dataSource: DataSource) =>
dataSource
.createQueryBuilder()
.select(
"CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate, '_', COALESCE(att_report.lessonReferenceId, 'null'))",
'id',
)
.addSelect('att_report.userId', 'userId')
.addSelect('att_report.reportDate', 'reportDate')
.addSelect('att_report.teacherReferenceId', 'teacherReferenceId')
.addSelect('att_report.lessonReferenceId', 'lessonReferenceId')
.addSelect(
'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, att_report.teacherReferenceId, att_report.reportDate)',
'reportHour',
)
.from(AttReport, 'att_report')
.where('att_report.teacherReferenceId IS NOT NULL')
.groupBy('att_report.userId')
.addGroupBy('att_report.teacherReferenceId')
.addGroupBy('att_report.reportDate')
.addGroupBy('att_report.lessonReferenceId'),
})
export class TeacherReportedToday implements IHasUserId {
@Column()
id: string;

@Column()
userId: number;

@Column('date')
reportDate: Date;

@Column()
teacherReferenceId: number;

@Column({ nullable: true })
lessonReferenceId: number;

@Column()
reportHour: Date;
}
2 changes: 2 additions & 0 deletions server/src/entities.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import phoneCampaignConfig from '@shared/entities/configs/phone-campaign.config'
import { Student } from './db/entities/Student.entity';
import { Teacher } from './db/entities/Teacher.entity';
import userConfig from '@shared/entities/configs/user.config';
import { TeacherReportedToday } from './db/view-entities/TeacherReportedToday.entity';

registerEntityNameMap({
att_report: 'נוכחות',
Expand Down Expand Up @@ -97,6 +98,7 @@ registerEntityNameMap({
BaseEntityModule.register(uploadedFileConfig),
BaseEntityModule.register(phoneTemplateConfig),
BaseEntityModule.register(phoneCampaignConfig),
BaseEntityModule.register({ entity: TeacherReportedToday }),
],
})
export class EntitiesModule {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { MigrationInterface, QueryRunner } from "typeorm"

export class UpdateYemotTextsNameConfirmAndManager1784143134666 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<void> {
const texts = [
{ name: 'SEMINAR.CONFIRM_STUDENT_NAME', text: 'התלמידה {studentName}. {yes} {no}' },
{ name: 'SEMINAR.STUDENT_NAME_REJECTED', text: 'נסי שוב להקיש את מספר התלמידה' },
{ name: 'MANAGER.NO_SCHEDULE_TODAY', text: 'אין מורות עם מערכת שעות היום.' },
{ name: 'MANAGER.REPORT_STATUS_TODAY', text: 'מורות שדיווחו היום: {reportedList}.\nמורות שלא דיווחו: {notReportedList}.' },
];

for (const text of texts) {
await queryRunner.query(
'INSERT INTO `texts` (`user_id`, `name`, `description`, `value`) VALUES (?, ?, ?, ?)',
[0, text.name, text.text, text.text],
);
}
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
'DELETE FROM `texts` WHERE `user_id` = 0 AND `name` IN (?, ?, ?, ?)',
[
'SEMINAR.CONFIRM_STUDENT_NAME',
'SEMINAR.STUDENT_NAME_REJECTED',
'MANAGER.NO_SCHEDULE_TODAY',
'MANAGER.REPORT_STATUS_TODAY',
],
);
}
}
16 changes: 16 additions & 0 deletions server/src/migrations/1784189504154-AddTeacherReportedTodayView.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddTeacherReportedTodayView1784189504154 implements MigrationInterface {
name = 'AddTeacherReportedTodayView1784189504154'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`teacherReferenceId\` AS \`teacherReferenceId\`, \`att_report\`.\`lessonReferenceId\` AS \`lessonReferenceId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`att_report\`.\`teacherReferenceId\`, '_', \`att_report\`.\`report_date\`, '_', COALESCE(\`att_report\`.\`lessonReferenceId\`, 'null')) AS \`id\`, MIN(MIN(\`att_report\`.\`created_at\`)) OVER (PARTITION BY \`att_report\`.\`user_id\`, \`att_report\`.\`teacherReferenceId\`, \`att_report\`.\`report_date\`) AS \`reportHour\` FROM \`att_reports\` \`att_report\` WHERE \`att_report\`.\`teacherReferenceId\` IS NOT NULL GROUP BY \`att_report\`.\`user_id\`, \`att_report\`.\`teacherReferenceId\`, \`att_report\`.\`report_date\`, \`att_report\`.\`lessonReferenceId\``);
await queryRunner.query(`INSERT INTO \`mysql_database\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, ["mysql_database","VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`teacherReferenceId` AS `teacherReferenceId`, `att_report`.`lessonReferenceId` AS `lessonReferenceId`, `att_report`.`report_date` AS `reportDate`, CONCAT(`att_report`.`user_id`, '_', `att_report`.`teacherReferenceId`, '_', `att_report`.`report_date`, '_', COALESCE(`att_report`.`lessonReferenceId`, 'null')) AS `id`, MIN(MIN(`att_report`.`created_at`)) OVER (PARTITION BY `att_report`.`user_id`, `att_report`.`teacherReferenceId`, `att_report`.`report_date`) AS `reportHour` FROM `att_reports` `att_report` WHERE `att_report`.`teacherReferenceId` IS NOT NULL GROUP BY `att_report`.`user_id`, `att_report`.`teacherReferenceId`, `att_report`.`report_date`, `att_report`.`lessonReferenceId`"]);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DELETE FROM \`mysql_database\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today","mysql_database"]);
await queryRunner.query(`DROP VIEW \`teacher_reported_today\``);
}

}
Loading
Loading