diff --git a/client/src/entities/teacher-reported-today.jsx b/client/src/entities/teacher-reported-today.jsx
index ba418c45..13224eca 100644
--- a/client/src/entities/teacher-reported-today.jsx
+++ b/client/src/entities/teacher-reported-today.jsx
@@ -1,7 +1,14 @@
-import { ChipField, DateInput, ReferenceField, RecordContextProvider, TextField, useListContext } from 'react-admin';
-import { Box, Card, CardContent, Typography } from '@mui/material';
+import { ChipField, DateInput, ReferenceField, RecordContextProvider, TextField, useListContext, usePermissions } from 'react-admin';
+import { Badge, Box, Card, CardContent, Typography } from '@mui/material';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
+import { CommonList } from '@shared/components/crudContainers/CommonList';
+import { EmptyPage } from '@shared/components/crudContainers/EmptyPage';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
+import { filterArrayByParams } from '@shared/utils/filtersUtil';
+import { useIsAdmin } from '@shared/utils/permissionsUtil';
+
+// This is a card view, not a table, so cap high rather than paginate at 10 rows.
+const LIST_PAGE_SIZE = 1000;
const ISRAEL_TIMEZONE = 'Asia/Jerusalem';
const todayDateOnly = new Date().toLocaleDateString('en-CA', { timeZone: ISRAEL_TIMEZONE });
@@ -94,9 +101,11 @@ const TeacherReportCards = ({ isAdmin }) => {
{group.lessonRows.length > 0 ? (
group.lessonRows.map((row) => (
-
-
-
+
+
+
+
+
))
) : (
@@ -116,6 +125,30 @@ const TeacherReportCards = ({ isAdmin }) => {
const Datagrid = ({ isAdmin }) => ;
+// Card view has no pagination footer, so fetch everything up front instead of the default 10-row page.
+// Mirrors CommonEntity's own List wiring, which likewise only forwards `filter`.
+const List = ({ filter = {} }) => {
+ const isAdmin = useIsAdmin();
+ const { permissions } = usePermissions();
+ const filtersArr = filterArrayByParams(filters, { isAdmin, permissions });
+
+ return (
+ }
+ sort={{ field: 'reportDate', order: 'DESC' }}
+ configurable={false}
+ perPage={LIST_PAGE_SIZE}
+ pagination={false}
+ >
+
+
+ );
+};
+
const entity = {
Datagrid,
filters,
@@ -125,4 +158,4 @@ const entity = {
sort: { field: 'reportDate', order: 'DESC' },
};
-export default getResourceComponents(entity);
+export default { ...getResourceComponents(entity), list: List };
diff --git a/server/src/db/view-entities/TeacherReportedToday.entity.ts b/server/src/db/view-entities/TeacherReportedToday.entity.ts
index dc596f8d..5f0fc2c1 100644
--- a/server/src/db/view-entities/TeacherReportedToday.entity.ts
+++ b/server/src/db/view-entities/TeacherReportedToday.entity.ts
@@ -19,6 +19,10 @@ import { AttReport } from '../entities/AttReport.entity';
'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')
@@ -48,4 +52,7 @@ export class TeacherReportedToday implements IHasUserId {
@Column()
reportHour: Date;
+
+ @Column()
+ missingGirlsCount: number;
}
diff --git a/server/src/migrations/1788336876049-AddMissingGirlsCountToTeacherReportedTodayView.ts b/server/src/migrations/1788336876049-AddMissingGirlsCountToTeacherReportedTodayView.ts
new file mode 100644
index 00000000..1855123b
--- /dev/null
+++ b/server/src/migrations/1788336876049-AddMissingGirlsCountToTeacherReportedTodayView.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddMissingGirlsCountToTeacherReportedTodayView1788336876049 implements MigrationInterface {
+ name = 'AddMissingGirlsCountToTeacherReportedTodayView1788336876049'
+
+ public async up(queryRunner: QueryRunner): Promise {
+ 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\`, 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`.`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`, 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`"]);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ 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`"]);
+ }
+
+}