diff --git a/AGENTS.md b/AGENTS.md index 42fed839..12d6de52 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -10,7 +10,7 @@ School attendance management system: teachers, students, classes, attendance rep - **Shared submodules**: `client/shared` -> `nra-client`, `server/shared` -> `nra-server` Initialize before first use: `git submodule update --init --recursive` -Never modify code in `client/shared` or `server/shared` directly — those are separate repos. +Avoid modifying code in `client/shared` or `server/shared` directly when possible — they're separate repos used by other projects. Prefer keeping changes local to this repo. If a change genuinely belongs in the shared code, it's fine to edit it there and go through the normal commit/push flow for that repo. ## Testing diff --git a/client/src/domainTranslations.js b/client/src/domainTranslations.js index d21f503b..d4ffaf0f 100644 --- a/client/src/domainTranslations.js +++ b/client/src/domainTranslations.js @@ -366,6 +366,8 @@ export default { name: 'שם ציון |||| שמות ציונים', fields: { ...generalResourceFieldsTranslation, + klassTypeId: 'שיוך כיתה', + klassTypeReferenceId: 'שיוך כיתה', }, }, attendance_name: { @@ -381,6 +383,7 @@ export default { percents: 'אחוז נוכחות', count: 'מספר חיסורים', effect: 'השפעה', + effectPercent: 'השפעה באחוזים', }, }, grade_effect_by_user: { @@ -389,6 +392,7 @@ export default { ...generalResourceFieldsTranslation, number: 'אחוז חיסור', effect: 'השפעה', + effectPercent: 'השפעה באחוזים', }, }, abs_count_effect_by_user: { @@ -397,6 +401,7 @@ export default { ...generalResourceFieldsTranslation, number: 'מספר חיסורים', effect: 'השפעה', + effectPercent: 'השפעה באחוזים', }, }, report_group: { diff --git a/client/src/entities/att-grade-effect.jsx b/client/src/entities/att-grade-effect.jsx index 788b813e..d62914d4 100644 --- a/client/src/entities/att-grade-effect.jsx +++ b/client/src/entities/att-grade-effect.jsx @@ -18,6 +18,7 @@ const filters = [ , , , + , ]; const Datagrid = ({ isAdmin, children, ...props }) => { @@ -29,6 +30,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => { + {isAdmin && } {isAdmin && } @@ -42,7 +44,11 @@ const Inputs = ({ isCreate, isAdmin }) => { {isAdmin && } - + + {!isCreate && isAdmin && } {!isCreate && isAdmin && } @@ -50,7 +56,7 @@ const Inputs = ({ isCreate, isAdmin }) => { }; const importer = { - fields: ['percents', 'count', 'effect'], + fields: ['percents', 'count', 'effect', 'effectPercent'], }; const entity = { diff --git a/client/src/entities/grade-name.jsx b/client/src/entities/grade-name.jsx index 636a286e..71169da0 100644 --- a/client/src/entities/grade-name.jsx +++ b/client/src/entities/grade-name.jsx @@ -9,12 +9,19 @@ import { maxLength, } from 'react-admin'; import { CommonDatagrid } from '@shared/components/crudContainers/CommonList'; +import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField'; import { CommonRepresentation } from '@shared/components/CommonRepresentation'; import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; +import { CommonReferenceInputFilter, filterByUserId } from '@shared/components/fields/CommonReferenceInputFilter'; import { adminUserFilter } from '@shared/components/fields/PermissionFilter'; -const filters = [adminUserFilter, , ]; +const filters = [ + adminUserFilter, + , + , + , +]; const Datagrid = ({ isAdmin, children, ...props }) => { return ( @@ -24,6 +31,13 @@ const Datagrid = ({ isAdmin, children, ...props }) => { {isAdmin && } + {isAdmin && } {isAdmin && } @@ -37,6 +51,7 @@ const Inputs = ({ isCreate, isAdmin }) => { {isAdmin && } + {!isCreate && isAdmin && } {!isCreate && isAdmin && } @@ -46,7 +61,7 @@ const Inputs = ({ isCreate, isAdmin }) => { const Representation = CommonRepresentation; const importer = { - fields: ['key', 'name'], + fields: ['key', 'name', 'klassTypeId'], }; const entity = { diff --git a/server/shared b/server/shared index f556912c..edd1b1fb 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit f556912c7876be50cc49e8189fc5b22790f2a8cf +Subproject commit edd1b1fb82f70cccfb7b73ccd9af4a0da49603bc diff --git a/server/src/db/entities/AttGradeEffect.ts b/server/src/db/entities/AttGradeEffect.ts index 3d42d52a..4cc43be0 100644 --- a/server/src/db/entities/AttGradeEffect.ts +++ b/server/src/db/entities/AttGradeEffect.ts @@ -1,7 +1,7 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; -import { IsOptional } from 'class-validator'; -import { IsNotEmpty, IsNumber } from '@shared/utils/validation/class-validator-he'; +import { IsOptional, ValidateIf } from 'class-validator'; +import { IsNotEmpty, IsNumber, Min } from '@shared/utils/validation/class-validator-he'; import { CrudValidationGroups } from '@dataui/crud'; import { NumberType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; @@ -27,13 +27,25 @@ export class AttGradeEffect implements IHasUserId { @Column({ nullable: true }) count: number; + @ValidateIf((item: AttGradeEffect) => item.effectPercent === null || item.effectPercent === undefined, { + always: true, + }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) - @Column() + @Column({ nullable: true }) effect: number; + @ValidateIf((item: AttGradeEffect) => item.effect === null || item.effect === undefined, { always: true }) + @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) + @Min(1, { always: true }) + @Column({ nullable: true }) + effectPercent: number; + @CreatedAtColumn() createdAt: Date; diff --git a/server/src/db/entities/GradeName.entity.ts b/server/src/db/entities/GradeName.entity.ts index 30354697..7e466e75 100644 --- a/server/src/db/entities/GradeName.entity.ts +++ b/server/src/db/entities/GradeName.entity.ts @@ -1,5 +1,7 @@ -import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'; +import { BeforeInsert, BeforeUpdate, Column, DataSource, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'; import { IHasUserId } from '@shared/base-entity/interface'; +import { KlassType } from './KlassType.entity'; +import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity/foreignKey.util'; import { IsOptional } from 'class-validator'; import { IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; import { CrudValidationGroups } from '@dataui/crud'; @@ -8,6 +10,26 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty @Entity('grade_names') export class GradeName implements IHasUserId { + @BeforeInsert() + @BeforeUpdate() + async fillFields() { + let dataSource: DataSource; + try { + dataSource = await getDataSource([KlassType]); + + this.klassTypeReferenceId = await findOneAndAssignReferenceId( + dataSource, + KlassType, + { key: this.klassTypeId }, + this.userId, + this.klassTypeReferenceId, + this.klassTypeId, + ); + } finally { + dataSource?.destroy(); + } + } + @PrimaryGeneratedColumn({ type: 'int', name: 'id' }) id: number; @@ -28,9 +50,24 @@ export class GradeName implements IHasUserId { @Column('varchar', { name: 'name', length: 500, nullable: true }) name: string; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) + @Column('int', { name: 'klass_type_id', nullable: true }) + klassTypeId: number | null; + + @IsOptional({ always: true }) + @Column({ nullable: true }) + @Index('grade_names_klass_type_reference_id_idx') + klassTypeReferenceId: number; + @CreatedAtColumn() createdAt: Date; @UpdatedAtColumn() updatedAt: Date; + + @ManyToOne(() => KlassType, { createForeignKeyConstraints: false }) + @JoinColumn({ name: 'klassTypeReferenceId' }) + klassType: KlassType; } diff --git a/server/src/db/entities/Student.entity.ts b/server/src/db/entities/Student.entity.ts index e95b444d..3e75d8eb 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -9,7 +9,7 @@ import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-ty @Index('students_users_idx', ['userId'], {}) @Index(['userId', 'tz', 'year'], { unique: true }) -@Index(['userId', 'studentNumber', 'year'], { unique: true }) +@Index('students_user_student_number_year_unique', ['userId', 'studentNumber', 'year'], { unique: true }) @Entity('students') export class Student implements IHasUserId { @PrimaryGeneratedColumn({ type: 'int', name: 'id' }) diff --git a/server/src/db/view-entities/AbsCountEffectByUser.entity.ts b/server/src/db/view-entities/AbsCountEffectByUser.entity.ts index 6f35ced9..9cc1a659 100644 --- a/server/src/db/view-entities/AbsCountEffectByUser.entity.ts +++ b/server/src/db/view-entities/AbsCountEffectByUser.entity.ts @@ -22,4 +22,7 @@ export class AbsCountEffectByUser implements IHasUserId, IAbsCountEffectByUser { @ViewColumn() effect: number; + + @ViewColumn() + effectPercent: number; } diff --git a/server/src/db/view-entities/GradeEffectByUser.entity.ts b/server/src/db/view-entities/GradeEffectByUser.entity.ts index 0e030255..3bd03ded 100644 --- a/server/src/db/view-entities/GradeEffectByUser.entity.ts +++ b/server/src/db/view-entities/GradeEffectByUser.entity.ts @@ -22,4 +22,7 @@ export class GradeEffectByUser implements IHasUserId, IGradeEffectByUser { @ViewColumn() effect: number; + + @ViewColumn() + effectPercent: number; } diff --git a/server/src/entities.module.ts b/server/src/entities.module.ts index 18e447ca..41fa7d94 100644 --- a/server/src/entities.module.ts +++ b/server/src/entities.module.ts @@ -24,7 +24,7 @@ import studentByYearConfig from './entity-modules/student-by-year.config'; import teacherSalaryReportConfig from './entity-modules/teacher-salary-report.config'; import attReportWithReportMonthConfig from './entity-modules/att-report-with-report-month.config'; import { KnownAbsenceWithReportMonth } from './db/view-entities/KnownAbsenceWithReportMonth.entity'; -import { GradeName } from './db/entities/GradeName.entity'; +import gradeNameConfig from './entity-modules/grade-name.config'; import { AttGradeEffect } from './db/entities/AttGradeEffect'; import teacherGradeReportStatusConfig from './entity-modules/teacher-grade-report-status.config'; import { GradeEffectByUser } from 'src/db/view-entities/GradeEffectByUser.entity'; @@ -86,7 +86,7 @@ registerEntityNameMap({ BaseEntityModule.register(studentByYearConfig), BaseEntityModule.register(teacherSalaryReportConfig), BaseEntityModule.register({ entity: KnownAbsenceWithReportMonth }), - BaseEntityModule.register({ entity: GradeName }), + BaseEntityModule.register(gradeNameConfig), BaseEntityModule.register({ entity: AttendanceName }), BaseEntityModule.register({ entity: AttGradeEffect }), BaseEntityModule.register({ entity: GradeEffectByUser }), diff --git a/server/src/entity-modules/__tests__/student-percent-report.config.spec.ts b/server/src/entity-modules/__tests__/student-percent-report.config.spec.ts index 0f6708ad..9a60fc8c 100644 --- a/server/src/entity-modules/__tests__/student-percent-report.config.spec.ts +++ b/server/src/entity-modules/__tests__/student-percent-report.config.spec.ts @@ -217,6 +217,7 @@ describe('StudentPercentReportConfig', () => { { id: '1_0', effect: -5, + effectPercent: null, }, ]; diff --git a/server/src/entity-modules/grade-name.config.ts b/server/src/entity-modules/grade-name.config.ts new file mode 100644 index 00000000..92a8eed2 --- /dev/null +++ b/server/src/entity-modules/grade-name.config.ts @@ -0,0 +1,15 @@ +import { BaseEntityModuleOptions } from '@shared/base-entity/interface'; +import { GradeName } from 'src/db/entities/GradeName.entity'; + +function getConfig(): BaseEntityModuleOptions { + return { + entity: GradeName, + query: { + join: { + klassType: { eager: false }, + }, + }, + }; +} + +export default getConfig(); diff --git a/server/src/entity-modules/student-percent-report.config.ts b/server/src/entity-modules/student-percent-report.config.ts index 1a133421..d9c698ad 100644 --- a/server/src/entity-modules/student-percent-report.config.ts +++ b/server/src/entity-modules/student-percent-report.config.ts @@ -20,6 +20,7 @@ import { getDisplayAttendance, getUnknownAbsCount, getRelevantGrade, + IGradeEffect, } from 'src/utils/studentReportData.util'; import { getKnownAbsenceFilterBySprAndDates, getReportDataFilterBySprAndDates } from 'src/utils/studentReportData.util'; import { DataSource, In } from 'typeorm'; @@ -156,15 +157,18 @@ class StudentPercentReportService exten .find({ where: { userId: getUserIdFromUser(auth) }, order: { key: 'DESC' } }); Object.values(sprMap).forEach((item) => { + const gradeEffect = gradeEffectsMap[getGradeEffectId(item)]; + const absCountEffect = absCountEffectsMap[getAbsCountEffectId(item)]; item.debug = { absCountEffectId: getAbsCountEffectId(item), gradeEffectId: getGradeEffectId(item), - absCountEffect: absCountEffectsMap[getAbsCountEffectId(item)], - gradeEffect: gradeEffectsMap[getGradeEffectId(item)], + absCountEffect, + gradeEffect, }; - item.attGradeEffect = - gradeEffectsMap[getGradeEffectId(item)] || absCountEffectsMap[getAbsCountEffectId(item)]; - item.finalGrade = getDisplayGrade(item.gradeAvg, item.attGradeEffect, gradeNames); + const attGradeEffect: IGradeEffect = + gradeEffect?.effect || gradeEffect?.effectPercent ? gradeEffect : absCountEffect; + item.attGradeEffect = attGradeEffect?.effectPercent || attGradeEffect?.effect || 0; + item.finalGrade = getDisplayGrade(item.gradeAvg, attGradeEffect, gradeNames, item.klass?.klassTypeReferenceId); item.finalAttendance = getDisplayAttendance(item.attPercents, attendanceNames); }); @@ -202,16 +206,24 @@ function getGradeEffectId(item: StudentPercentReportWithDates): string { return `${item.userId}_${Math.floor(item.attPercents * 100)}`; } -function fetchAttGradeEffect(dataSource: DataSource, viewEntity: any, ids: string[]): Promise> { +function fetchAttGradeEffect( + dataSource: DataSource, + viewEntity: any, + ids: string[], +): Promise> { return dataSource .getRepository(viewEntity) .find({ where: { id: In(ids), }, - select: ['id', 'effect'], + select: ['id', 'effect', 'effectPercent'], }) - .then((arr) => Object.fromEntries(arr.map((item) => [item.id, Number(item.effect)]))); + .then((arr) => + Object.fromEntries( + arr.map((item) => [item.id, { effect: Number(item.effect), effectPercent: Number(item.effectPercent) }]), + ), + ); } export default getConfig(); diff --git a/server/src/migrations/1784099759411-GradeNameAddKlassType.ts b/server/src/migrations/1784099759411-GradeNameAddKlassType.ts new file mode 100644 index 00000000..f39ead71 --- /dev/null +++ b/server/src/migrations/1784099759411-GradeNameAddKlassType.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class GradeNameAddKlassType1784099759411 implements MigrationInterface { + name = 'GradeNameAddKlassType1784099759411' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`grade_names\` ADD \`klass_type_id\` int NULL`); + await queryRunner.query(`ALTER TABLE \`grade_names\` ADD \`klassTypeReferenceId\` int NULL`); + await queryRunner.query(`CREATE INDEX \`grade_names_klass_type_reference_id_idx\` ON \`grade_names\` (\`klassTypeReferenceId\`)`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DROP INDEX \`grade_names_klass_type_reference_id_idx\` ON \`grade_names\``); + await queryRunner.query(`ALTER TABLE \`grade_names\` DROP COLUMN \`klassTypeReferenceId\``); + await queryRunner.query(`ALTER TABLE \`grade_names\` DROP COLUMN \`klass_type_id\``); + } + +} diff --git a/server/src/migrations/1784100406196-AttGradeEffectAddEffectPercent.ts b/server/src/migrations/1784100406196-AttGradeEffectAddEffectPercent.ts new file mode 100644 index 00000000..3e9928b2 --- /dev/null +++ b/server/src/migrations/1784100406196-AttGradeEffectAddEffectPercent.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AttGradeEffectAddEffectPercent1784100406196 implements MigrationInterface { + name = 'AttGradeEffectAddEffectPercent1784100406196' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`att_grade_effect\` ADD \`effectPercent\` int NULL`); + await queryRunner.query(`ALTER TABLE \`att_grade_effect\` CHANGE \`effect\` \`effect\` int NULL`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`att_grade_effect\` CHANGE \`effect\` \`effect\` int NOT NULL`); + await queryRunner.query(`ALTER TABLE \`att_grade_effect\` DROP COLUMN \`effectPercent\``); + } + +} diff --git a/server/src/migrations/1784100570833-AddEffectPercentToViews.ts b/server/src/migrations/1784100570833-AddEffectPercentToViews.ts new file mode 100644 index 00000000..ff0ecf21 --- /dev/null +++ b/server/src/migrations/1784100570833-AddEffectPercentToViews.ts @@ -0,0 +1,144 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddEffectPercentToViews1784100570833 implements MigrationInterface { + name = 'AddEffectPercentToViews1784100570833' + + 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","grade_effect_by_user",dbName,]); + await queryRunner.query(`DROP VIEW \`grade_effect_by_user\``); + await queryRunner.query(`DELETE FROM \`${dbName}\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","abs_count_effect_by_user",dbName,]); + await queryRunner.query(`DROP VIEW \`abs_count_effect_by_user\``); + await queryRunner.query(`CREATE VIEW \`abs_count_effect_by_user\` AS SELECT \`users\`.\`id\` AS \`userId\`, CONCAT(\`users\`.\`id\`, "_", numbers.number) AS \`id\`, numbers.number AS \`number\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`count\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`count\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + COALESCE(CAST(\`att_grade_effect\`.\`effect\` AS CHAR), '') COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effect\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`count\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`count\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + COALESCE(CAST(\`att_grade_effect\`.\`effectPercent\` AS CHAR), '') COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effectPercent\` FROM \`numbers\` \`numbers\` LEFT JOIN \`users\` \`users\` ON 1 = 1 LEFT JOIN \`att_grade_effect\` \`att_grade_effect\` ON \`att_grade_effect\`.\`user_id\` = \`users\`.\`id\` GROUP BY \`users\`.\`id\`, numbers.number ORDER BY \`users\`.\`id\` ASC, numbers.number ASC`); + await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","abs_count_effect_by_user","SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number\n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`count`, 10, '0') COLLATE utf8mb4_bin,\n '|' COLLATE utf8mb4_bin,\n COALESCE(CAST(`att_grade_effect`.`effect` AS CHAR), '') COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin,\n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effect`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number\n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`count`, 10, '0') COLLATE utf8mb4_bin,\n '|' COLLATE utf8mb4_bin,\n COALESCE(CAST(`att_grade_effect`.`effectPercent` AS CHAR), '') COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin,\n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effectPercent` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC"]); + await queryRunner.query(`CREATE VIEW \`grade_effect_by_user\` AS SELECT \`users\`.\`id\` AS \`userId\`, CONCAT(\`users\`.\`id\`, "_", numbers.number) AS \`id\`, numbers.number AS \`number\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`percents\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`percents\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + COALESCE(CAST(\`att_grade_effect\`.\`effect\` AS CHAR), '') COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effect\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`percents\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`percents\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + COALESCE(CAST(\`att_grade_effect\`.\`effectPercent\` AS CHAR), '') COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effectPercent\` FROM \`numbers\` \`numbers\` LEFT JOIN \`users\` \`users\` ON 1 = 1 LEFT JOIN \`att_grade_effect\` \`att_grade_effect\` ON \`att_grade_effect\`.\`user_id\` = \`users\`.\`id\` GROUP BY \`users\`.\`id\`, numbers.number ORDER BY \`users\`.\`id\` ASC, numbers.number ASC`); + await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","grade_effect_by_user","SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number\n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`percents`, 10, '0') COLLATE utf8mb4_bin,\n '|' COLLATE utf8mb4_bin,\n COALESCE(CAST(`att_grade_effect`.`effect` AS CHAR), '') COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin,\n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effect`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number\n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`percents`, 10, '0') COLLATE utf8mb4_bin,\n '|' COLLATE utf8mb4_bin,\n COALESCE(CAST(`att_grade_effect`.`effectPercent` AS CHAR), '') COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin,\n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effectPercent` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC"]); + } + + 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","grade_effect_by_user",dbName,]); + await queryRunner.query(`DROP VIEW \`grade_effect_by_user\``); + await queryRunner.query(`DELETE FROM \`${dbName}\`.\`typeorm_metadata\` WHERE \`type\` = ? AND \`name\` = ? AND \`schema\` = ?`, ["VIEW","abs_count_effect_by_user",dbName,]); + await queryRunner.query(`DROP VIEW \`abs_count_effect_by_user\``); + await queryRunner.query(`CREATE VIEW \`abs_count_effect_by_user\` AS SELECT \`users\`.\`id\` AS \`userId\`, CONCAT(\`users\`.\`id\`, "_", numbers.number) AS \`id\`, numbers.number AS \`number\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`count\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`count\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + CAST(\`att_grade_effect\`.\`effect\` AS CHAR) COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effect\` FROM \`numbers\` \`numbers\` LEFT JOIN \`users\` \`users\` ON 1 = 1 LEFT JOIN \`att_grade_effect\` \`att_grade_effect\` ON \`att_grade_effect\`.\`user_id\` = \`users\`.\`id\` GROUP BY \`users\`.\`id\`, numbers.number ORDER BY \`users\`.\`id\` ASC, numbers.number ASC`); + await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","abs_count_effect_by_user","SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`count` <= numbers.number \n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`count`, 10, '0') COLLATE utf8mb4_bin, \n '|' COLLATE utf8mb4_bin, \n CAST(`att_grade_effect`.`effect` AS CHAR) COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin, \n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC"]); + await queryRunner.query(`CREATE VIEW \`grade_effect_by_user\` AS SELECT \`users\`.\`id\` AS \`userId\`, CONCAT(\`users\`.\`id\`, "_", numbers.number) AS \`id\`, numbers.number AS \`number\`, + CAST( + COALESCE( + SUBSTRING_INDEX( + MAX( + CASE WHEN \`att_grade_effect\`.\`percents\` <= numbers.number + /* Force utf8mb4_bin collation to avoid "Illegal mix of collations" error during DB dump */ + THEN CONCAT( + LPAD(\`att_grade_effect\`.\`percents\`, 10, '0') COLLATE utf8mb4_bin, + '|' COLLATE utf8mb4_bin, + CAST(\`att_grade_effect\`.\`effect\` AS CHAR) COLLATE utf8mb4_bin + ) + ELSE NULL END + ) COLLATE utf8mb4_bin, + '|', -1 + ), + '0' + ) AS SIGNED + ) + 0 + AS \`effect\` FROM \`numbers\` \`numbers\` LEFT JOIN \`users\` \`users\` ON 1 = 1 LEFT JOIN \`att_grade_effect\` \`att_grade_effect\` ON \`att_grade_effect\`.\`user_id\` = \`users\`.\`id\` GROUP BY \`users\`.\`id\`, numbers.number ORDER BY \`users\`.\`id\` ASC, numbers.number ASC`); + await queryRunner.query(`INSERT INTO \`${dbName}\`.\`typeorm_metadata\`(\`database\`, \`schema\`, \`table\`, \`type\`, \`name\`, \`value\`) VALUES (DEFAULT, ?, DEFAULT, ?, ?, ?)`, [dbName,"VIEW","grade_effect_by_user","SELECT `users`.`id` AS `userId`, CONCAT(`users`.`id`, \"_\", numbers.number) AS `id`, numbers.number AS `number`, \n CAST(\n COALESCE(\n SUBSTRING_INDEX(\n MAX(\n CASE WHEN `att_grade_effect`.`percents` <= numbers.number \n /* Force utf8mb4_bin collation to avoid \"Illegal mix of collations\" error during DB dump */\n THEN CONCAT(\n LPAD(`att_grade_effect`.`percents`, 10, '0') COLLATE utf8mb4_bin, \n '|' COLLATE utf8mb4_bin, \n CAST(`att_grade_effect`.`effect` AS CHAR) COLLATE utf8mb4_bin\n )\n ELSE NULL END\n ) COLLATE utf8mb4_bin, \n '|', -1\n ),\n '0'\n ) AS SIGNED\n ) + 0\n AS `effect` FROM `numbers` `numbers` LEFT JOIN `users` `users` ON 1 = 1 LEFT JOIN `att_grade_effect` `att_grade_effect` ON `att_grade_effect`.`user_id` = `users`.`id` GROUP BY `users`.`id`, numbers.number ORDER BY `users`.`id` ASC, numbers.number ASC"]); + } + +} diff --git a/server/src/reports/studentReportCardReact.tsx b/server/src/reports/studentReportCardReact.tsx index 19a940cb..ee2d5a28 100644 --- a/server/src/reports/studentReportCardReact.tsx +++ b/server/src/reports/studentReportCardReact.tsx @@ -404,11 +404,11 @@ interface ReportItemProps { const ReportItem: React.FunctionComponent = ({ reportParams, report, att_grade_effect, grade_names, attendance_names }) => { var unApprovedAbsCount = getUnknownAbsCount(report.absCount, report.approvedAbsCount); var gradeEffect = getGradeEffect(att_grade_effect, report.attPercents, unApprovedAbsCount); - var displayGrade = getDisplayGrade(report.gradeAvg, gradeEffect, grade_names); + var displayGrade = getDisplayGrade(report.gradeAvg, gradeEffect, grade_names, report.klass?.klassTypeReferenceId); const debugDetails = ` חיסורים: ${report.absCount}, מאושרים: ${report.approvedAbsCount}, שיעורים: ${report.lessonsCount}, אחוז נוכחות: ${Math.round(report.attPercents * 100)} אחוז חיסור: ${Math.round(report.absPercents * 100)}, - ציון: ${report.gradeAvg ? report.gradeAvg * 100 : '-'}, השפעה: ${gradeEffect}, ציון סופי: ${displayGrade} + ציון: ${report.gradeAvg ? report.gradeAvg * 100 : '-'}, השפעה: ${gradeEffect.effectPercent ? gradeEffect.effectPercent + '%' : gradeEffect.effect}, ציון סופי: ${displayGrade} `; const { fullCellStyle, rightAlignFullCellStyle, emptyCellStyle } = useCellStyles(); diff --git a/server/src/utils/__tests__/studentReportData.util.spec.ts b/server/src/utils/__tests__/studentReportData.util.spec.ts index 35fcc245..e54481d4 100644 --- a/server/src/utils/__tests__/studentReportData.util.spec.ts +++ b/server/src/utils/__tests__/studentReportData.util.spec.ts @@ -292,22 +292,41 @@ describe('studentReportData.util', () => { ]; it('should return correct grade display with grade names', () => { - expect(getDisplayGrade(0.95, 0, mockGradeNames)).toBe('A'); - expect(getDisplayGrade(0.85, 0, mockGradeNames)).toBe('B'); - expect(getDisplayGrade(0.75, 0, mockGradeNames)).toBe('C'); - expect(getDisplayGrade(0.65, 0, mockGradeNames)).toBe('65%'); + expect(getDisplayGrade(0.95, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe('A'); + expect(getDisplayGrade(0.85, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe('B'); + expect(getDisplayGrade(0.75, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe('C'); + expect(getDisplayGrade(0.65, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe('65%'); }); it('should handle grade effects', () => { - expect(getDisplayGrade(0.85, 10, mockGradeNames)).toBe('A'); - expect(getDisplayGrade(0.75, -10, mockGradeNames)).toBe('65%'); + expect(getDisplayGrade(0.85, { effect: 10, effectPercent: 0 }, mockGradeNames)).toBe('A'); + expect(getDisplayGrade(0.75, { effect: -10, effectPercent: 0 }, mockGradeNames)).toBe('65%'); + }); + + it('should handle percent-based grade effects by multiplying instead of adding', () => { + // 80 * 90% = 72, below the 80 threshold for 'B', so it falls through to 'C' (70) instead + expect(getDisplayGrade(0.8, { effect: 0, effectPercent: 90 }, mockGradeNames)).toBe('C'); + // 100 * 90% = 90, matches the 90 threshold for 'A' + expect(getDisplayGrade(1, { effect: 0, effectPercent: 90 }, mockGradeNames)).toBe('A'); }); it('should handle edge cases', () => { - expect(getDisplayGrade(0, 0, mockGradeNames)).toBe(''); - expect(getDisplayGrade(null, 0, mockGradeNames)).toBe(''); + expect(getDisplayGrade(0, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe(''); + expect(getDisplayGrade(null, { effect: 0, effectPercent: 0 }, mockGradeNames)).toBe(''); expect(getDisplayGrade(0.85)).toBe('85%'); }); + + it('should apply klass-type-specific grade names only for the matching klass type', () => { + const gradeNamesWithKlassType: GradeName[] = [ + { key: 90, name: 'מצטיינת', klassTypeReferenceId: 1 } as GradeName, + { key: 90, name: 'A' } as GradeName, + { key: 80, name: 'B' } as GradeName, + ]; + + expect(getDisplayGrade(0.95, { effect: 0, effectPercent: 0 }, gradeNamesWithKlassType, 1)).toBe('מצטיינת'); + expect(getDisplayGrade(0.95, { effect: 0, effectPercent: 0 }, gradeNamesWithKlassType, 2)).toBe('A'); + expect(getDisplayGrade(0.95, { effect: 0, effectPercent: 0 }, gradeNamesWithKlassType)).toBe('A'); + }); }); describe('getGradeEffect', () => { @@ -319,23 +338,30 @@ describe('studentReportData.util', () => { it('should return correct effect based on attendance percentage', () => { // Effects are returned for the first matching rule where percents <= actualPercents - expect(getGradeEffect(mockEffects, 0.95, 1)).toBe(5); // 95% matches first rule (90%) - expect(getGradeEffect(mockEffects, 0.85, 1)).toBe(5); // 85% matches first rule (90%) - expect(getGradeEffect(mockEffects, 0.75, 1)).toBe(5); // 75% still matches first rule (90%) - expect(getGradeEffect(mockEffects, 0.65, 1)).toBe(5); // 65% still matches first rule (90%) + expect(getGradeEffect(mockEffects, 0.95, 1)).toEqual({ effect: 5, effectPercent: 0 }); // 95% matches first rule (90%) + expect(getGradeEffect(mockEffects, 0.85, 1)).toEqual({ effect: 5, effectPercent: 0 }); // 85% matches first rule (90%) + expect(getGradeEffect(mockEffects, 0.75, 1)).toEqual({ effect: 5, effectPercent: 0 }); // 75% still matches first rule (90%) + expect(getGradeEffect(mockEffects, 0.65, 1)).toEqual({ effect: 5, effectPercent: 0 }); // 65% still matches first rule (90%) + }); + + it('should return the percent-based effect when the matching rule uses effectPercent', () => { + const effectsWithPercent: AttGradeEffect[] = [ + { percents: 90, count: 2, effect: null, effectPercent: 90 } as AttGradeEffect, + ]; + expect(getGradeEffect(effectsWithPercent, 0.95, 1)).toEqual({ effect: 0, effectPercent: 90 }); }); it('should return correct effect based on absence count', () => { // Effects are returned for the first matching rule where count >= absCount - expect(getGradeEffect(mockEffects, 0.6, 1)).toBe(5); // matches first rule (count 2) - expect(getGradeEffect(mockEffects, 0.6, 2)).toBe(5); // exactly matches first rule count - expect(getGradeEffect(mockEffects, 0.6, 3)).toBe(0); // matches second rule (count 3) - expect(getGradeEffect(mockEffects, 0.6, 4)).toBe(-5); // matches third rule (count 4) + expect(getGradeEffect(mockEffects, 0.6, 1)).toEqual({ effect: 5, effectPercent: 0 }); // matches first rule (count 2) + expect(getGradeEffect(mockEffects, 0.6, 2)).toEqual({ effect: 5, effectPercent: 0 }); // exactly matches first rule count + expect(getGradeEffect(mockEffects, 0.6, 3)).toEqual({ effect: 0, effectPercent: 0 }); // matches second rule (count 3) + expect(getGradeEffect(mockEffects, 0.6, 4)).toEqual({ effect: -5, effectPercent: 0 }); // matches third rule (count 4) }); it('should handle null or empty effects array', () => { - expect(getGradeEffect(null, 0.95, 1)).toBe(0); - expect(getGradeEffect([], 0.95, 1)).toBe(0); + expect(getGradeEffect(null, 0.95, 1)).toEqual({ effect: 0, effectPercent: 0 }); + expect(getGradeEffect([], 0.95, 1)).toEqual({ effect: 0, effectPercent: 0 }); }); }); }); diff --git a/server/src/utils/studentReportData.util.ts b/server/src/utils/studentReportData.util.ts index c2a687a5..6fef3ae5 100644 --- a/server/src/utils/studentReportData.util.ts +++ b/server/src/utils/studentReportData.util.ts @@ -203,7 +203,17 @@ export function getRelevantGrade(isLastGrade: boolean, gradeAvg: number, lastGra return gradeAvg; } -export function getDisplayGrade(grade: number, gradeEffect: number = 0, gradeNames: GradeName[] = []) { +export interface IGradeEffect { + effect: number; + effectPercent: number; +} + +export function getDisplayGrade( + grade: number, + gradeEffect: IGradeEffect = { effect: 0, effectPercent: 0 }, + gradeNames: GradeName[] = [], + klassTypeReferenceId?: number, +) { // if (grade === 0) return '0%'; if (!grade) return ''; @@ -212,14 +222,13 @@ export function getDisplayGrade(grade: number, gradeEffect: number = 0, gradeNam console.warn('getDisplayGrade: grade is not a number', grade, typeof grade); grade = parseFloat(grade); } - if (gradeEffect && typeof gradeEffect !== 'number') { - console.warn('getDisplayGrade: gradeEffect is not a number', gradeEffect, typeof gradeEffect); - gradeEffect = parseFloat(gradeEffect); - } // ========== end of investigation ========== var finalGrade = getFinalGrade(grade * 100, gradeEffect); - var matchingGradeName = findByThreshold(finalGrade, gradeNames, 'key', 'name'); + var relevantGradeNames = gradeNames.filter( + (item) => !item.klassTypeReferenceId || item.klassTypeReferenceId === klassTypeReferenceId, + ); + var matchingGradeName = findByThreshold(finalGrade, relevantGradeNames, 'key', 'name'); var displayGrade = matchingGradeName ?? Math.round(finalGrade) + '%'; return displayGrade; } @@ -232,13 +241,21 @@ export function getDisplayAttendance(attPercents: number, attendanceNames: Atten return displayAttendance; } -function getFinalGrade(grade: number, gradeEffect: number) { +function getFinalGrade(grade: number, gradeEffect: IGradeEffect) { var isOriginalGrade = grade > 100 || grade == 0; - var finalGrade = isOriginalGrade ? grade : keepBetween(grade + gradeEffect, 0, 100); - return finalGrade; + if (isOriginalGrade) return grade; + if (gradeEffect?.effectPercent) { + return keepBetween(grade * (gradeEffect.effectPercent / 100), 0, 100); + } + return keepBetween(grade + (gradeEffect?.effect ?? 0), 0, 100); } -export function getGradeEffect(attGradeEffect: AttGradeEffect[], attPercents: number, absCount: number) { +export function getGradeEffect( + attGradeEffect: AttGradeEffect[], + attPercents: number, + absCount: number, +): IGradeEffect { const actualPercents = attPercents * 100; - return attGradeEffect?.find((item) => item.percents <= actualPercents || item.count >= absCount)?.effect ?? 0; + const match = attGradeEffect?.find((item) => item.percents <= actualPercents || item.count >= absCount); + return { effect: match?.effect ?? 0, effectPercent: match?.effectPercent ?? 0 }; }