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
114 changes: 75 additions & 39 deletions client/src/entities/teacher-reported-today.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ 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 ISRAEL_TIMEZONE = 'Asia/Jerusalem';
const todayDateOnly = new Date().toLocaleDateString('en-CA', { timeZone: ISRAEL_TIMEZONE });

const filters = [
adminUserFilter,
Expand All @@ -16,15 +17,17 @@ const filterDefaultValues = {
'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' }) : '');
const formatDate = (value) => (value ? new Date(value).toLocaleDateString('he-IL', { timeZone: ISRAEL_TIMEZONE }) : '');
const formatHour = (value) => (value ? new Date(value).toLocaleTimeString('he-IL', { hour: '2-digit', minute: '2-digit', timeZone: ISRAEL_TIMEZONE }) : '');

// The view has one row per teacher+lesson+date; group rows sharing the same
// teacher+date into a single card, collecting their lesson rows.
const NO_KLASS_KEY = 'none';

// The view has one row per teacher+lesson+date+klass; group rows sharing the same
// teacher+date+klass 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}`;
const key = `${row.userId}_${row.teacherReferenceId}_${row.reportDate}_${row.klassReferenceId ?? NO_KLASS_KEY}`;
if (!groups.has(key)) {
groups.set(key, { ...row, lessonRows: [] });
}
Expand All @@ -35,44 +38,77 @@ function groupByTeacherAndDate(rows) {
return [...groups.values()];
}

// Split teacher cards into one column per class, so reports are easy to scan by class.
function groupByKlass(groups) {
const columns = new Map();
groups.forEach((group) => {
const key = group.klassReferenceId ?? NO_KLASS_KEY;
Comment thread
buzz-code marked this conversation as resolved.
Resolved
if (!columns.has(key)) {
columns.set(key, { klassReferenceId: group.klassReferenceId, groups: [] });
}
columns.get(key).groups.push(group);
});
return [...columns.values()].sort((a, b) => {
if (!a.klassReferenceId) return 1;
if (!b.klassReferenceId) return -1;
return a.klassReferenceId - b.klassReferenceId;
});
}

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

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 sx={{ display: 'flex', gap: 2, padding: 2, overflowX: 'auto', alignItems: 'flex-start' }}>
{columns.map((column) => (
<Box key={column.klassReferenceId ?? NO_KLASS_KEY} sx={{ minWidth: 320, flex: '0 0 320px' }}>
<Typography variant="subtitle1" sx={{ marginBottom: 1 }}>
{column.klassReferenceId ? (
<RecordContextProvider value={{ klassReferenceId: column.klassReferenceId }}>
<ReferenceField source="klassReferenceId" reference="klass">
<TextField source="name" />
</ReferenceField>
</RecordContextProvider>
) : 'ללא כיתה'}
</Typography>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
{column.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>
</Box>
))}
</Box>
);
Expand Down
11 changes: 8 additions & 3 deletions server/src/db/view-entities/TeacherReportedToday.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,25 @@ import { AttReport } from '../entities/AttReport.entity';
dataSource
.createQueryBuilder()
.select(
"CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate, '_', COALESCE(att_report.lessonReferenceId, 'null'))",
"CONCAT(att_report.userId, '_', att_report.teacherReferenceId, '_', att_report.reportDate, '_', COALESCE(att_report.lessonReferenceId, 'null'), '_', COALESCE(att_report.klassReferenceId, 'null'))",
'id',
)
.addSelect('att_report.userId', 'userId')
.addSelect('att_report.reportDate', 'reportDate')
.addSelect('att_report.teacherReferenceId', 'teacherReferenceId')
.addSelect('att_report.lessonReferenceId', 'lessonReferenceId')
.addSelect('att_report.klassReferenceId', 'klassReferenceId')
.addSelect(
'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, att_report.teacherReferenceId, att_report.reportDate)',
'MIN(MIN(att_report.createdAt)) OVER (PARTITION BY att_report.userId, att_report.teacherReferenceId, att_report.reportDate, att_report.klassReferenceId)',
'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'),
.addGroupBy('att_report.lessonReferenceId')
.addGroupBy('att_report.klassReferenceId'),
})
export class TeacherReportedToday implements IHasUserId {
@Column()
Expand All @@ -41,6 +43,9 @@ export class TeacherReportedToday implements IHasUserId {
@Column({ nullable: true })
lessonReferenceId: number;

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

@Column()
reportHour: Date;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddKlassToTeacherReportedTodayView1787600000000 implements MigrationInterface {
name = 'AddKlassToTeacherReportedTodayView1787600000000'

public async up(queryRunner: QueryRunner): Promise<void> {
const dbName = queryRunner.connection.options.database;
await queryRunner.query(`DELETE FROM \`${dbName}\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today",dbName]);
await queryRunner.query(`DROP VIEW IF EXISTS \`teacher_reported_today\``);
await queryRunner.query(`CREATE OR REPLACE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`teacherReferenceId\` AS \`teacherReferenceId\`, \`att_report\`.\`lessonReferenceId\` AS \`lessonReferenceId\`, \`att_report\`.\`klassReferenceId\` AS \`klassReferenceId\`, \`att_report\`.\`report_date\` AS \`reportDate\`, CONCAT(\`att_report\`.\`user_id\`, '_', \`att_report\`.\`teacherReferenceId\`, '_', \`att_report\`.\`report_date\`, '_', COALESCE(\`att_report\`.\`lessonReferenceId\`, 'null'), '_', COALESCE(\`att_report\`.\`klassReferenceId\`, 'null')) AS \`id\`, MIN(MIN(\`att_report\`.\`created_at\`)) OVER (PARTITION BY \`att_report\`.\`user_id\`, \`att_report\`.\`teacherReferenceId\`, \`att_report\`.\`report_date\`, \`att_report\`.\`klassReferenceId\`) 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\`, \`att_report\`.\`klassReferenceId\``);
await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","teacher_reported_today","SELECT `att_report`.`user_id` AS `userId`, `att_report`.`teacherReferenceId` AS `teacherReferenceId`, `att_report`.`lessonReferenceId` AS `lessonReferenceId`, `att_report`.`klassReferenceId` AS `klassReferenceId`, `att_report`.`report_date` AS `reportDate`, CONCAT(`att_report`.`user_id`, '_', `att_report`.`teacherReferenceId`, '_', `att_report`.`report_date`, '_', COALESCE(`att_report`.`lessonReferenceId`, 'null'), '_', COALESCE(`att_report`.`klassReferenceId`, 'null')) AS `id`, MIN(MIN(`att_report`.`created_at`)) OVER (PARTITION BY `att_report`.`user_id`, `att_report`.`teacherReferenceId`, `att_report`.`report_date`, `att_report`.`klassReferenceId`) 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`, `att_report`.`klassReferenceId`"]);
}

public async down(queryRunner: QueryRunner): Promise<void> {
const dbName = queryRunner.connection.options.database;
await queryRunner.query(`DELETE FROM \`${dbName}\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","teacher_reported_today",dbName]);
await queryRunner.query(`DROP VIEW IF EXISTS \`teacher_reported_today\``);
await queryRunner.query(`CREATE OR REPLACE 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 \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"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`"]);
}

}
Loading