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
10 changes: 6 additions & 4 deletions client/src/entities/teacher-reported-today.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react';
import { DateInput, ReferenceField, RecordContextProvider, TextField, useGetList, useListContext, usePermissions } from 'react-admin';
import { DateInput, FunctionField, ReferenceField, RecordContextProvider, TextField, useGetList, useListContext, usePermissions } from 'react-admin';
import { Box, ButtonBase, Card, CircularProgress, Popover, Typography } from '@mui/material';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { CommonList } from '@shared/components/crudContainers/CommonList';
Expand Down Expand Up @@ -154,6 +154,8 @@ const SummaryTiles = ({ rows, klassCount }) => {
);
};

const displayNameOrName = (record) => record.displayName || record.name;

const LessonRow = ({ row, showDate, until }) => {
return (
<RecordContextProvider value={row}>
Expand All @@ -164,13 +166,13 @@ const LessonRow = ({ row, showDate, until }) => {
<Typography variant="body2" component="div" sx={{ fontWeight: 500 }}>
{row.lessonReferenceId ? (
<ReferenceField source="lessonReferenceId" reference="lesson" link={false}>
<TextField source="name" />
<FunctionField render={displayNameOrName} />
</ReferenceField>
) : 'ללא שיוך שיעור'}
</Typography>
<Typography variant="body2" component="div" color="text.secondary">
<ReferenceField source="teacherReferenceId" reference="teacher" link={false}>
<TextField source="name" />
<FunctionField render={displayNameOrName} />
</ReferenceField>
</Typography>
<MissingGirls row={row} until={until} />
Expand Down Expand Up @@ -204,7 +206,7 @@ const TeacherReportCards = ({ isAdmin }) => {
{klass.klassReferenceId ? (
<RecordContextProvider value={{ klassReferenceId: klass.klassReferenceId }}>
<ReferenceField source="klassReferenceId" reference="klass">
<TextField source="name" sx={{ fontWeight: 'bold', fontSize: 17 }} />
<FunctionField render={displayNameOrName} sx={{ fontWeight: 'bold', fontSize: 17 }} />
</ReferenceField>
</RecordContextProvider>
) : 'ללא כיתה'}
Expand Down
2 changes: 1 addition & 1 deletion client/src/pivots/AbsenceTrackingList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ const AbsenceTrackingView = () => {
const thresholdRatio = thresholdPercent / 100;

const lessonHeaders = getLessonHeaders([rows]);
const baseKlassByStudent = Object.fromEntries(klasses.map((row) => [row.id, row.klassName]));
const baseKlassByStudent = Object.fromEntries(klasses.map((row) => [row.id, row.klassDisplayName]));

const allStudents = rows.map((row) => getStudentStats(row, lessonHeaders, thresholdRatio));
const students = allStudents.filter((s) => s.hasReports);
Expand Down
4 changes: 2 additions & 2 deletions client/src/pivots/AbsenceTrackingList.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const dataProvider = {
return Promise.resolve({ data: pivotRows, total: pivotRows.length });
}
if (resource === 'student_base_klass') {
return Promise.resolve({ data: [{ id: 1, klassName: 'א1' }, { id: 2, klassName: 'א1' }], total: 2 });
return Promise.resolve({ data: [{ id: 1, klassName: 'א1', klassDisplayName: 'כיתה א1' }, { id: 2, klassName: 'א1', klassDisplayName: 'כיתה א1' }], total: 2 });
}
if (resource === 'att_report') {
return Promise.resolve({
Expand All @@ -51,7 +51,7 @@ test('shows class cards, threshold status and the student drill-down', async ()
);

expect(await screen.findByText('שרה כהן')).toBeInTheDocument();
expect(await screen.findByText('א1')).toBeInTheDocument();
expect(await screen.findByText('כיתה א1')).toBeInTheDocument();
// 10 of 40 = 25%, over the default 20% threshold by 2 absences.
expect(screen.getByText('2 מעל הסף')).toBeInTheDocument();
expect(screen.getByText('ועוד 1 בלי דיווחים בתקופה')).toBeInTheDocument();
Expand Down
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default [
{ 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
4 changes: 4 additions & 0 deletions server/src/db/view-entities/StudentBaseKlass.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { getGroupConcatExpression } from '@shared/utils/entity/column-types.util
.addSelect('student_klasses.user_id', 'user_id')
.addSelect('student_klasses.year', 'year')
.addSelect(getGroupConcatExpression('klasses.name', ', ', true), 'base_klass')
.addSelect(getGroupConcatExpression("COALESCE(NULLIF(klasses.display_name, ''), klasses.name)", ', ', true), 'base_klass_display_name')
.from(StudentKlass, 'student_klasses')
.innerJoin(Klass, 'klasses', 'klasses.id = student_klasses.klassReferenceId')
.innerJoin(KlassType, 'klass_types', 'klass_types.id = klasses.klassTypeReferenceId')
Expand All @@ -35,6 +36,9 @@ export class StudentBaseKlass implements IHasUserId {
@Column({ name: 'base_klass' })
klassName: string;

@Column({ name: 'base_klass_display_name' })
klassDisplayName: string;

@ManyToOne(() => Student, { createForeignKeyConstraints: false })
@JoinColumn({ name: 'id' })
student: Student;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ describe('StudentByYear Config', () => {
absCount: 3,
howManyLessons: 10,
},
{
studentReferenceId: 2,
lessonReferenceId: 102,
lesson: { name: 'Bible', displayName: 'תנ"ך' },
absCount: 0,
howManyLessons: 5,
},
];

const mockKnownAbsences = [
Expand Down Expand Up @@ -189,6 +196,8 @@ describe('StudentByYear Config', () => {
value: '101',
label: 'Math',
});
// A lesson's display name, when set, is the column label
expect(mockStudents[0].headers).toContainEqual({ value: '102', label: 'תנ"ך' });

// Lessons per subject are sent without a header, so the pivot table gets no extra column
expect((mockStudents[0] as any).lessons_101).toBe(10);
Expand Down
2 changes: 1 addition & 1 deletion server/src/entity-modules/student-by-year.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class StudentByYearService<T extends Entity | StudentByYear> extends BaseEntityS

pivotData.forEach((item) => {
const key = `${item.lessonReferenceId}`;
headers[key] ??= { value: key, label: `${item.lesson?.name}` };
headers[key] ??= { value: key, label: `${item.lesson?.displayName || item.lesson?.name}` };
studentMap[item.studentReferenceId][key] ??= 0;
studentMap[item.studentReferenceId][key] += item.absCount;
// Lessons per subject, without a header: not a column of this pivot, read by the absence tracking page.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddDisplayNameToStudentBaseKlassView1792005496211 implements MigrationInterface {
name = 'AddDisplayNameToStudentBaseKlassView1792005496211'

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","student_base_klass",dbName]);
await queryRunner.query(`
DROP VIEW \`student_base_klass\`
`);
await queryRunner.query(`
CREATE VIEW \`student_base_klass\` AS
SELECT \`student_klasses\`.\`year\` AS \`year\`,
\`student_klasses\`.\`studentReferenceId\` AS \`id\`,
\`student_klasses\`.\`user_id\` AS \`user_id\`,
GROUP_CONCAT(DISTINCT \`klasses\`.\`name\` SEPARATOR ', ') AS \`base_klass\`,
GROUP_CONCAT(
DISTINCT COALESCE(
NULLIF(\`klasses\`.\`display_name\`, ''),
\`klasses\`.\`name\`
) SEPARATOR ', '
) AS \`base_klass_display_name\`
FROM \`student_klasses\` \`student_klasses\`
INNER JOIN \`klasses\` \`klasses\` ON \`klasses\`.\`id\` = \`student_klasses\`.\`klassReferenceId\`
INNER JOIN \`klass_types\` \`klass_types\` ON \`klass_types\`.\`id\` = \`klasses\`.\`klassTypeReferenceId\`
WHERE \`klass_types\`.\`klassTypeEnum\` = 'כיתת אם'
GROUP BY \`student_klasses\`.\`user_id\`,
\`student_klasses\`.\`year\`,
\`student_klasses\`.\`studentReferenceId\`
`);
await queryRunner.query(`
INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(
\`database\`,
\`schema\`,
\`table\`,
\`type\`,
\`name\`,
\`value\`
)
VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)
`, [dbName,"VIEW","student_base_klass","SELECT `student_klasses`.`year` AS `year`, `student_klasses`.`studentReferenceId` AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT `klasses`.`name` SEPARATOR ', ') AS `base_klass`, GROUP_CONCAT(DISTINCT COALESCE(NULLIF(`klasses`.`display_name`, ''), `klasses`.`name`) SEPARATOR ', ') AS `base_klass_display_name` FROM `student_klasses` `student_klasses` INNER JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` INNER JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` WHERE `klass_types`.`klassTypeEnum` = 'כיתת אם' GROUP BY `student_klasses`.`user_id`, `student_klasses`.`year`, `student_klasses`.`studentReferenceId`"]);
}

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","student_base_klass",dbName]);
await queryRunner.query(`
DROP VIEW \`student_base_klass\`
`);
await queryRunner.query(`
CREATE VIEW \`student_base_klass\` AS
SELECT \`student_klasses\`.\`year\` AS \`year\`,
\`student_klasses\`.\`studentReferenceId\` AS \`id\`,
\`student_klasses\`.\`user_id\` AS \`user_id\`,
GROUP_CONCAT(DISTINCT \`klasses\`.\`name\` SEPARATOR ', ') AS \`base_klass\`
FROM \`student_klasses\` \`student_klasses\`
INNER JOIN \`klasses\` \`klasses\` ON \`klasses\`.\`id\` = \`student_klasses\`.\`klassReferenceId\`
INNER JOIN \`klass_types\` \`klass_types\` ON \`klass_types\`.\`id\` = \`klasses\`.\`klassTypeReferenceId\`
WHERE \`klass_types\`.\`klassTypeEnum\` = 'כיתת אם'
GROUP BY \`student_klasses\`.\`user_id\`,
\`student_klasses\`.\`year\`,
\`student_klasses\`.\`studentReferenceId\`
`);
await queryRunner.query(`
INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(
\`database\`,
\`schema\`,
\`table\`,
\`type\`,
\`name\`,
\`value\`
)
VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)
`, [dbName,"VIEW","student_base_klass","SELECT `student_klasses`.`year` AS `year`, `student_klasses`.`studentReferenceId` AS `id`, `student_klasses`.`user_id` AS `user_id`, GROUP_CONCAT(DISTINCT `klasses`.`name` SEPARATOR ', ') AS `base_klass` FROM `student_klasses` `student_klasses` INNER JOIN `klasses` `klasses` ON `klasses`.`id` = `student_klasses`.`klassReferenceId` INNER JOIN `klass_types` `klass_types` ON `klass_types`.`id` = `klasses`.`klassTypeReferenceId` WHERE `klass_types`.`klassTypeEnum` = 'כיתת אם' GROUP BY `student_klasses`.`user_id`, `student_klasses`.`year`, `student_klasses`.`studentReferenceId`"]);
}

}
Loading