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
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions client/src/domainTranslations.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,8 @@ export default {
name: 'שם ציון |||| שמות ציונים',
fields: {
...generalResourceFieldsTranslation,
klassTypeId: 'שיוך כיתה',
klassTypeReferenceId: 'שיוך כיתה',
},
},
attendance_name: {
Expand All @@ -381,6 +383,7 @@ export default {
percents: 'אחוז נוכחות',
count: 'מספר חיסורים',
effect: 'השפעה',
effectPercent: 'השפעה באחוזים',
},
},
grade_effect_by_user: {
Expand All @@ -389,6 +392,7 @@ export default {
...generalResourceFieldsTranslation,
number: 'אחוז חיסור',
effect: 'השפעה',
effectPercent: 'השפעה באחוזים',
},
},
abs_count_effect_by_user: {
Expand All @@ -397,6 +401,7 @@ export default {
...generalResourceFieldsTranslation,
number: 'מספר חיסורים',
effect: 'השפעה',
effectPercent: 'השפעה באחוזים',
},
},
report_group: {
Expand Down
10 changes: 8 additions & 2 deletions client/src/entities/att-grade-effect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const filters = [
<NumberInput source="percents" />,
<NumberInput source="count" />,
<NumberInput source="effect" />,
<NumberInput source="effectPercent" />,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
Expand All @@ -29,6 +30,7 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
<TextField source="percents" />
<TextField source="count" />
<TextField source="effect" />
<TextField source="effectPercent" />
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
</CommonDatagrid>
Expand All @@ -42,15 +44,19 @@ const Inputs = ({ isCreate, isAdmin }) => {
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<NumberInput source="percents" />
<NumberInput source="count" />
<NumberInput source="effect" validate={required()} />
<NumberInput source="effect" helperText="נקודות להוספה/הפחתה מהציון (יש למלא שדה זה או את שדה ההשפעה באחוזים)" />
<NumberInput
source="effectPercent"
helperText="אחוז מהציון המקורי, גדול מ-0 (יש למלא שדה זה או את שדה ההשפעה)"
/>
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
);
};

const importer = {
fields: ['percents', 'count', 'effect'],
fields: ['percents', 'count', 'effect', 'effectPercent'],
};

const entity = {
Expand Down
19 changes: 17 additions & 2 deletions client/src/entities/grade-name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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, <NumberInput source="key" />, <TextInput source="name:$cont" alwaysOn />];
const filters = [
adminUserFilter,
<NumberInput source="key" />,
<TextInput source="name:$cont" alwaysOn />,
<CommonReferenceInputFilter source="klassTypeReferenceId" reference="klass_type" dynamicFilter={filterByUserId} />,
];

const Datagrid = ({ isAdmin, children, ...props }) => {
return (
Expand All @@ -24,6 +31,13 @@ const Datagrid = ({ isAdmin, children, ...props }) => {
{isAdmin && <ReferenceField source="userId" reference="user" />}
<TextField source="key" />
<TextField source="name" />
<MultiReferenceField
source="klassTypeReferenceId"
sortBy="klassType.name"
reference="klass_type"
optionalSource="klassTypeId"
optionalTarget="key"
/>
{isAdmin && <DateField showDate showTime source="createdAt" />}
{isAdmin && <DateField showDate showTime source="updatedAt" />}
</CommonDatagrid>
Expand All @@ -37,6 +51,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
{isAdmin && <CommonReferenceInput source="userId" reference="user" validate={required()} />}
<NumberInput source="key" validate={required()} />
<TextInput source="name" validate={[maxLength(500)]} />
<CommonReferenceInput source="klassTypeReferenceId" reference="klass_type" dynamicFilter={filterByUserId} />
{!isCreate && isAdmin && <DateTimeInput source="createdAt" disabled />}
{!isCreate && isAdmin && <DateTimeInput source="updatedAt" disabled />}
</>
Expand All @@ -46,7 +61,7 @@ const Inputs = ({ isCreate, isAdmin }) => {
const Representation = CommonRepresentation;

const importer = {
fields: ['key', 'name'],
fields: ['key', 'name', 'klassTypeId'],
};

const entity = {
Expand Down
18 changes: 15 additions & 3 deletions server/src/db/entities/AttGradeEffect.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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;

Expand Down
39 changes: 38 additions & 1 deletion server/src/db/entities/GradeName.entity.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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;

Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion server/src/db/entities/Student.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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' })
Expand Down
3 changes: 3 additions & 0 deletions server/src/db/view-entities/AbsCountEffectByUser.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ export class AbsCountEffectByUser implements IHasUserId, IAbsCountEffectByUser {

@ViewColumn()
effect: number;

@ViewColumn()
effectPercent: number;
}
3 changes: 3 additions & 0 deletions server/src/db/view-entities/GradeEffectByUser.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ export class GradeEffectByUser implements IHasUserId, IGradeEffectByUser {

@ViewColumn()
effect: number;

@ViewColumn()
effectPercent: number;
}
4 changes: 2 additions & 2 deletions server/src/entities.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ describe('StudentPercentReportConfig', () => {
{
id: '1_0',
effect: -5,
effectPercent: null,
},
];

Expand Down
15 changes: 15 additions & 0 deletions server/src/entity-modules/grade-name.config.ts
Original file line number Diff line number Diff line change
@@ -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();
28 changes: 20 additions & 8 deletions server/src/entity-modules/student-percent-report.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -156,15 +157,18 @@ class StudentPercentReportService<T extends Entity | StudentPercentReport> 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);
});

Expand Down Expand Up @@ -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<Record<string, number>> {
function fetchAttGradeEffect(
dataSource: DataSource,
viewEntity: any,
ids: string[],
): Promise<Record<string, IGradeEffect>> {
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();
18 changes: 18 additions & 0 deletions server/src/migrations/1784099759411-GradeNameAddKlassType.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class GradeNameAddKlassType1784099759411 implements MigrationInterface {
name = 'GradeNameAddKlassType1784099759411'

public async up(queryRunner: QueryRunner): Promise<void> {
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<void> {
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\``);
}

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

export class AttGradeEffectAddEffectPercent1784100406196 implements MigrationInterface {
name = 'AttGradeEffectAddEffectPercent1784100406196'

public async up(queryRunner: QueryRunner): Promise<void> {
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<void> {
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\``);
}

}
Loading
Loading