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
12 changes: 6 additions & 6 deletions client/src/entities/teacher-reported-today.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ const formatHour = (value) => (value ? new Date(value).toLocaleTimeString('he-IL

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.
// The view has one row per lesson taught; each lesson gets its own card,
// so a teacher who taught two lessons shows as two cards.
function groupByTeacherAndDate(rows) {
const groups = new Map();
rows.forEach((row) => {
const key = `${row.userId}_${row.teacherReferenceId}_${row.reportDate}_${row.klassReferenceId ?? NO_KLASS_KEY}`;
const key = row.id;
if (!groups.has(key)) {
groups.set(key, { ...row, lessonRows: [] });
}
Expand Down Expand Up @@ -66,8 +66,8 @@ function groupByKlass(groups) {
// count when it has no per-lesson breakdown (the "ללא שיוך שיעור" case).
function getTotalMissingGirls(group) {
return group.lessonRows.length > 0
? group.lessonRows.reduce((sum, row) => sum + (row.missingGirlsCount || 0), 0)
: group.missingGirlsCount || 0;
? group.lessonRows.reduce((sum, row) => sum + (Number(row.missingGirlsCount) || 0), 0)
: Number(group.missingGirlsCount) || 0;
}

const TeacherReportCards = ({ isAdmin }) => {
Expand Down Expand Up @@ -116,7 +116,7 @@ const TeacherReportCards = ({ isAdmin }) => {
{group.lessonRows.length > 0 ? (
group.lessonRows.map((row) => (
<RecordContextProvider key={row.id} value={row}>
<Badge badgeContent={row.missingGirlsCount} color="error" title="מספר בנות שחסרו">
<Badge badgeContent={Number(row.missingGirlsCount)} color="error" title="מספר בנות שחסרו">
<ReferenceField source="lessonReferenceId" reference="lesson">
<ChipField source="name" size="small" color="primary" variant="outlined" />
</ReferenceField>
Expand Down
1 change: 1 addition & 0 deletions server/src/db/entities/AttReport.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty
{},
)
@Index('att_teacher_lesson_date_idx', ['teacherReferenceId', 'lessonReferenceId', 'reportDate'], {})
@Index('att_user_report_date_idx', ['userId', 'reportDate'], {})
@Entity('att_reports')
export class AttReport implements IHasUserId {
@BeforeInsert()
Expand Down
75 changes: 46 additions & 29 deletions server/src/db/view-entities/TeacherReportedToday.entity.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,52 @@
import { Column, DataSource, ViewEntity } from 'typeorm';
import { Column, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { AttReport } from '../entities/AttReport.entity';
import { getAddMinutesExpression, getConcatExpression } from '@shared/utils/entity/column-types.util';

// Reports of the same teacher+lesson+klass+date more than this many minutes apart are separate lessons.
const NEW_LESSON_GAP_MINUTES = 15;

const PREVIOUS_REPORT_TIME = `LAG(att_reports.created_at) OVER (
PARTITION BY att_reports.user_id, att_reports.teacherReferenceId, att_reports.report_date, att_reports.lessonReferenceId, att_reports.klassReferenceId
ORDER BY att_reports.created_at, att_reports.id
)`;

// One row per lesson taught: rows of the same teacher+lesson+klass+date are split into
// separate lessons wherever there is a gap of more than NEW_LESSON_GAP_MINUTES between
// consecutive reports. Works for every report source (phone saves a whole lesson at once,
// the web form saves each student separately a few seconds apart).
@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'), '_', 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, att_report.klassReferenceId)',
'reportHour',
)
.addSelect(
'COUNT(DISTINCT CASE WHEN att_report.absCount > 0 THEN att_report.studentReferenceId END)',
'missingGirlsCount',
)
.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.klassReferenceId'),
expression: `
SELECT ${getConcatExpression('lesson_reports.userId', "'_'", 'lesson_reports.teacherReferenceId', "'_'", 'lesson_reports.reportDate', "'_'", "COALESCE(lesson_reports.lessonReferenceId, 'null')", "'_'", "COALESCE(lesson_reports.klassReferenceId, 'null')", "'_'", 'lesson_reports.lessonNumber')} AS id,
lesson_reports.userId AS userId,
lesson_reports.reportDate AS reportDate,
lesson_reports.teacherReferenceId AS teacherReferenceId,
lesson_reports.lessonReferenceId AS lessonReferenceId,
lesson_reports.klassReferenceId AS klassReferenceId,
MIN(lesson_reports.createdAt) AS reportHour,
COUNT(DISTINCT CASE WHEN lesson_reports.absCount > 0 THEN lesson_reports.studentReferenceId END) AS missingGirlsCount
FROM (
SELECT reports.*,
SUM(reports.isNewLesson) OVER (
PARTITION BY reports.userId, reports.teacherReferenceId, reports.reportDate, reports.lessonReferenceId, reports.klassReferenceId
ORDER BY reports.createdAt, reports.id
) AS lessonNumber
FROM (
SELECT att_reports.id AS id,
att_reports.user_id AS userId,
att_reports.report_date AS reportDate,
att_reports.teacherReferenceId AS teacherReferenceId,
att_reports.lessonReferenceId AS lessonReferenceId,
att_reports.klassReferenceId AS klassReferenceId,
att_reports.studentReferenceId AS studentReferenceId,
att_reports.abs_count AS absCount,
att_reports.created_at AS createdAt,
CASE WHEN att_reports.created_at <= ${getAddMinutesExpression(PREVIOUS_REPORT_TIME, NEW_LESSON_GAP_MINUTES)} THEN 0 ELSE 1 END AS isNewLesson
FROM att_reports
WHERE att_reports.teacherReferenceId IS NOT NULL
) reports
) lesson_reports
GROUP BY lesson_reports.userId, lesson_reports.teacherReferenceId, lesson_reports.reportDate, lesson_reports.lessonReferenceId, lesson_reports.klassReferenceId, lesson_reports.lessonNumber
`,
})
export class TeacherReportedToday implements IHasUserId {
@Column()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class SplitTeacherReportedTodayByLesson1791306863767 implements MigrationInterface {
name = 'SplitTeacherReportedTodayByLesson1791306863767'

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 \`teacher_reported_today\``);
await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS
SELECT CONCAT(lesson_reports.userId, '_', lesson_reports.teacherReferenceId, '_', lesson_reports.reportDate, '_', COALESCE(lesson_reports.lessonReferenceId, 'null'), '_', COALESCE(lesson_reports.klassReferenceId, 'null'), '_', lesson_reports.lessonNumber) AS id,
lesson_reports.userId AS userId,
lesson_reports.reportDate AS reportDate,
lesson_reports.teacherReferenceId AS teacherReferenceId,
lesson_reports.lessonReferenceId AS lessonReferenceId,
lesson_reports.klassReferenceId AS klassReferenceId,
MIN(lesson_reports.createdAt) AS reportHour,
COUNT(DISTINCT CASE WHEN lesson_reports.absCount > 0 THEN lesson_reports.studentReferenceId END) AS missingGirlsCount
FROM (
SELECT reports.*,
SUM(reports.isNewLesson) OVER (
PARTITION BY reports.userId, reports.teacherReferenceId, reports.reportDate, reports.lessonReferenceId, reports.klassReferenceId
ORDER BY reports.createdAt, reports.id
) AS lessonNumber
FROM (
SELECT att_reports.id AS id,
att_reports.user_id AS userId,
att_reports.report_date AS reportDate,
att_reports.teacherReferenceId AS teacherReferenceId,
att_reports.lessonReferenceId AS lessonReferenceId,
att_reports.klassReferenceId AS klassReferenceId,
att_reports.studentReferenceId AS studentReferenceId,
att_reports.abs_count AS absCount,
att_reports.created_at AS createdAt,
CASE WHEN att_reports.created_at <= LAG(att_reports.created_at) OVER (
PARTITION BY att_reports.user_id, att_reports.teacherReferenceId, att_reports.report_date, att_reports.lessonReferenceId, att_reports.klassReferenceId
ORDER BY att_reports.created_at, att_reports.id
) + INTERVAL 15 MINUTE THEN 0 ELSE 1 END AS isNewLesson
FROM att_reports
WHERE att_reports.teacherReferenceId IS NOT NULL
) reports
) lesson_reports
GROUP BY lesson_reports.userId, lesson_reports.teacherReferenceId, lesson_reports.reportDate, lesson_reports.lessonReferenceId, lesson_reports.klassReferenceId, lesson_reports.lessonNumber
`);
await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","teacher_reported_today","SELECT CONCAT(lesson_reports.userId, '_', lesson_reports.teacherReferenceId, '_', lesson_reports.reportDate, '_', COALESCE(lesson_reports.lessonReferenceId, 'null'), '_', COALESCE(lesson_reports.klassReferenceId, 'null'), '_', lesson_reports.lessonNumber) AS id,\n lesson_reports.userId AS userId,\n lesson_reports.reportDate AS reportDate,\n lesson_reports.teacherReferenceId AS teacherReferenceId,\n lesson_reports.lessonReferenceId AS lessonReferenceId,\n lesson_reports.klassReferenceId AS klassReferenceId,\n MIN(lesson_reports.createdAt) AS reportHour,\n COUNT(DISTINCT CASE WHEN lesson_reports.absCount > 0 THEN lesson_reports.studentReferenceId END) AS missingGirlsCount\n FROM (\n SELECT reports.*,\n SUM(reports.isNewLesson) OVER (\n PARTITION BY reports.userId, reports.teacherReferenceId, reports.reportDate, reports.lessonReferenceId, reports.klassReferenceId\n ORDER BY reports.createdAt, reports.id\n ) AS lessonNumber\n FROM (\n SELECT att_reports.id AS id,\n att_reports.user_id AS userId,\n att_reports.report_date AS reportDate,\n att_reports.teacherReferenceId AS teacherReferenceId,\n att_reports.lessonReferenceId AS lessonReferenceId,\n att_reports.klassReferenceId AS klassReferenceId,\n att_reports.studentReferenceId AS studentReferenceId,\n att_reports.abs_count AS absCount,\n att_reports.created_at AS createdAt,\n CASE WHEN att_reports.created_at <= LAG(att_reports.created_at) OVER (\n PARTITION BY att_reports.user_id, att_reports.teacherReferenceId, att_reports.report_date, att_reports.lessonReferenceId, att_reports.klassReferenceId\n ORDER BY att_reports.created_at, att_reports.id\n ) + INTERVAL 15 MINUTE THEN 0 ELSE 1 END AS isNewLesson\n FROM att_reports\n WHERE att_reports.teacherReferenceId IS NOT NULL\n ) reports\n ) lesson_reports\n GROUP BY lesson_reports.userId, lesson_reports.teacherReferenceId, lesson_reports.reportDate, lesson_reports.lessonReferenceId, lesson_reports.klassReferenceId, lesson_reports.lessonNumber"]);
}

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 \`teacher_reported_today\``);
await queryRunner.query(`CREATE VIEW \`teacher_reported_today\` AS SELECT \`att_report\`.\`user_id\` AS \`userId\`, \`att_report\`.\`teacherReferenceId\` AS \`teacherReferenceId\`, \`att_report\`.\`klassReferenceId\` AS \`klassReferenceId\`, \`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'), '_', 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\`, COUNT(DISTINCT CASE WHEN \`att_report\`.\`abs_count\` > 0 THEN \`att_report\`.\`studentReferenceId\` END) AS \`missingGirlsCount\` 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`.`klassReferenceId` AS `klassReferenceId`, `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'), '_', 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`, COUNT(DISTINCT CASE WHEN `att_report`.`abs_count` > 0 THEN `att_report`.`studentReferenceId` END) AS `missingGirlsCount` 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`"]);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAttReportUserReportDateIndex1791317504779 implements MigrationInterface {
name = 'AddAttReportUserReportDateIndex1791317504779'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE INDEX \`att_user_report_date_idx\` ON \`att_reports\` (\`user_id\`, \`report_date\`)`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP INDEX \`att_user_report_date_idx\` ON \`att_reports\``);
}

}
Loading