Skip to content
Closed
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 server/src/db/entities/AbsenceType.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IHasUserId } from '@shared/base-entity/interface';
import { User } from 'src/db/entities/User.entity';
import { IsOptional, Min } from 'class-validator';
import { CrudValidationGroups } from '@dataui/crud';
import { IsNotEmpty, IsUniqueCombination, MaxLength, IsNumber } from '@shared/utils/validation/class-validator-he';
import { IsNotEmpty, MaxLength, IsNumber } from '@shared/utils/validation/class-validator-he';
import { StringType, NumberType } from '@shared/utils/entity/class-transformer';
import { fillDefaultYearValue } from '@shared/utils/entity/year.util';
import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util';
Expand Down
1 change: 0 additions & 1 deletion server/src/db/entities/ReportGroupSession.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { IsOptional } from 'class-validator';
import { CrudValidationGroups } from '@dataui/crud';
import { IsNotEmpty, IsDate, IsNumber } from '@shared/utils/validation/class-validator-he';
import { StringType, NumberType, DateType } from '@shared/utils/entity/class-transformer';
import { fillDefaultYearValue } from '@shared/utils/entity/year.util';
import { cleanDateFields, cleanTimeFields } from '@shared/utils/entity/deafultValues.util';

@Index('report_group_sessions_user_id_idx', ['userId'], {})
Expand Down
5 changes: 1 addition & 4 deletions server/src/db/entities/User.entity.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { Entity, OneToMany } from 'typeorm';
import { Entity } from 'typeorm';
import { User as BaseUser } from '@shared/entities/User.entity';
import { Grade } from 'src/db/entities/Grade.entity';
import { KlassType } from 'src/db/entities/KlassType.entity';
import { Klass } from 'src/db/entities/Klass.entity';
import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity';
import { Lesson } from 'src/db/entities/Lesson.entity';
import { StudentKlass } from 'src/db/entities/StudentKlass.entity';
import { Student } from 'src/db/entities/Student.entity';
import { Teacher } from 'src/db/entities/Teacher.entity';

Expand Down
6 changes: 1 addition & 5 deletions server/src/db/view-entities/AttReportAndGrade.entity.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { Column, DataSource, JoinColumn, ManyToOne, ViewEntity } from 'typeorm';
import { Column, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { StudentKlass } from 'src/db/entities/StudentKlass.entity';
import { Student } from '../entities/Student.entity';
import { AttReport } from '../entities/AttReport.entity';
import { Grade } from '../entities/Grade.entity';

@ViewEntity('att_report_and_grade', {
expression: `
Expand Down
4 changes: 1 addition & 3 deletions server/src/db/view-entities/LessonKlassName.entity.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { Column, DataSource, ViewEntity } from 'typeorm';
import { Column, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { Klass } from '../entities/Klass.entity';
import { Lesson } from '../entities/Lesson.entity';
import {
getGroupConcatExpression,
getJsonTableColumn,
Expand Down
6 changes: 1 addition & 5 deletions server/src/db/view-entities/StudentByYear.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, DataSource, JoinColumn, ManyToOne, ViewEntity } from 'typeorm';
import { Column, DataSource, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { StudentKlass } from 'src/db/entities/StudentKlass.entity';
import { Student } from '../entities/Student.entity';
Expand Down Expand Up @@ -47,8 +47,4 @@ export class StudentByYear implements IHasUserId {

@Column('simple-array', { nullable: true })
klassTypeReferenceIds: string[];

// @ManyToOne(() => Student, { createForeignKeyConstraints: false })
// @JoinColumn({ name: 'id' })
// student: Student;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, DataSource, JoinColumn, ManyToOne, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
import { Column, DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { Teacher } from '../entities/Teacher.entity';
import { ReportMonth } from '../entities/ReportMonth.entity';
Expand Down
2 changes: 1 addition & 1 deletion server/src/db/view-entities/TeacherReportStatus.entity.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, DataSource, JoinColumn, ManyToOne, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
import { Column, DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
import { IHasUserId } from '@shared/base-entity/interface';
import { Teacher } from '../entities/Teacher.entity';
import { ReportMonth } from '../entities/ReportMonth.entity';
Expand Down
1 change: 0 additions & 1 deletion server/src/entity-modules/student-percent-report.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { IHeader } from '@shared/utils/exporter/types';
import { getPercentsFormatter } from '@shared/utils/formatting/formatter.util';
import { AbsCountEffectByUser } from 'src/db/view-entities/AbsCountEffectByUser.entity';
import { GradeEffectByUser } from 'src/db/view-entities/GradeEffectByUser.entity';
import { AttGradeEffect } from 'src/db/entities/AttGradeEffect';
import { GradeName } from 'src/db/entities/GradeName.entity';
import { AttendanceName } from 'src/db/entities/AttendanceName.entity';
import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity';
Expand Down
18 changes: 2 additions & 16 deletions server/src/reports/klassAttendanceReport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { IImageField, ISpecialField } from '@shared/utils/importer/types';
import * as ExcelJS from 'exceljs';
import { getUniqueValues, groupDataByKeysAndCalc, groupDataByKeyFn } from '@shared/utils/reportData.util';
import { ReportGroup } from 'src/db/entities/ReportGroup.entity';
import { formatTime, formatDate, formatDisplayName } from '@shared/utils/formatting/formatter.util';
import { formatDate, formatDisplayName } from '@shared/utils/formatting/formatter.util';

export interface KlassAttendanceReportParams {
userId: number;
Expand Down Expand Up @@ -310,21 +310,7 @@ const BUILDING = {
(s) => `${s.date.getDate().toString().padStart(2, '0')}/${(s.date.getMonth() + 1).toString().padStart(2, '0')}`,
),
];
// const hoursRow = ['שעות לימוד', ...sessions.map(s => `${formatTime(s.startTime)}-${formatTime(s.endTime)}`)];
// const topicRow = ['שיעור', ...sessions.map(s => s.topic)];
// const lessonCountRow = ['מס\' שעות לימוד', ...sessions.map(s => s.lessonCount.toString())];
// const teacherRow = ['שם המורה', ...sessions.map(s => s.teacherName)];
// const separatorRow = ['', ...sessions.map(() => '--')];

const rows = [
dayRow,
dateRow,
// hoursRow,
// topicRow,
// lessonCountRow,
// teacherRow,
// separatorRow
];
const rows = [dayRow, dateRow];

// Convert header rows to special fields with styling
const specialFields: ISpecialField[] = [];
Expand Down
7 changes: 1 addition & 6 deletions server/src/reports/lessonSignaturePdfReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import { DataSource, In } from 'typeorm';
import { ImportFile } from '@shared/entities/ImportFile.entity';
import { ReportGroup } from 'src/db/entities/ReportGroup.entity';
import { ReportGroupSession } from 'src/db/entities/ReportGroupSession.entity';
import { AttReport } from 'src/db/entities/AttReport.entity';
import { Grade } from 'src/db/entities/Grade.entity';
import { Student } from 'src/db/entities/Student.entity';
Expand Down Expand Up @@ -452,7 +451,7 @@ const LessonSignatureReport: React.FunctionComponent<LessonSignaturePdfData | Er

// Handle success case - cast to correct type after error check
const data = props as LessonSignaturePdfData;
const { id, teacher, lesson, klass, studentRecords, entityName, sessions, signatureData, createdAt } = data;
const { teacher, lesson, klass, studentRecords, entityName, sessions, signatureData, createdAt } = data;
const entityConfig = getEntityConfig(entityName);

// Group records by sessionId (if available) or date
Expand Down Expand Up @@ -501,7 +500,6 @@ const LessonSignatureReport: React.FunctionComponent<LessonSignaturePdfData | Er
<StudentRecordsTable
studentRecords={sessionData.records}
entityConfig={entityConfig}
entityName={entityName}
/>
</React.Fragment>
);
Expand All @@ -520,7 +518,6 @@ const LessonSignatureReport: React.FunctionComponent<LessonSignaturePdfData | Er
<StudentRecordsTable
studentRecords={studentRecords}
entityConfig={entityConfig}
entityName={entityName}
/>
</>
)}
Expand Down Expand Up @@ -696,13 +693,11 @@ const LessonDetailsSection: React.FC<LessonDetailsSectionProps> = ({
interface StudentRecordsTableProps {
studentRecords: LessonSignaturePdfData['studentRecords'];
entityConfig: ReturnType<typeof getEntityConfig>;
entityName: string;
}

const StudentRecordsTable: React.FC<StudentRecordsTableProps> = ({
studentRecords,
entityConfig,
entityName
}) => {
const containerStyle: React.CSSProperties = {
marginBottom: '30px',
Expand Down
12 changes: 3 additions & 9 deletions server/src/reports/studentReportCardReact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,7 @@ const useCellStyles = () => {
textAlign: 'right',
}

const emptyCellStyle: React.CSSProperties = {
...commonTableStyle,
...convertToReactStyle(useStyles(ReportElementType.TABLE_CELL)),
minWidth: 60,
}

return { fullCellStyle, rightAlignFullCellStyle, emptyCellStyle };
return { fullCellStyle, rightAlignFullCellStyle };
}
interface ReportTableContentProps {
reportData: ReportDataArrItem;
Expand Down Expand Up @@ -410,7 +404,7 @@ const ReportItem: React.FunctionComponent<ReportItemProps> = ({ reportParams, re
ציון: ${report.gradeAvg ? report.gradeAvg * 100 : '-'}, השפעה: ${gradeEffect.effectPercent ? gradeEffect.effectPercent + '%' : gradeEffect.effect}, ציון סופי: ${displayGrade}
`;

const { fullCellStyle, rightAlignFullCellStyle, emptyCellStyle } = useCellStyles();
const { fullCellStyle, rightAlignFullCellStyle } = useCellStyles();

return <tr>
<td style={rightAlignFullCellStyle}>{formatDisplayName(report.lesson)}</td>
Expand Down Expand Up @@ -571,7 +565,7 @@ function getReports(
): AppProps['reports'] {
const dataMap = groupDataByKeys(reports, ['teacherReferenceId', 'klassReferenceId', 'lessonReferenceId']);

const data = Object.entries(dataMap).map(([key, val]) => {
const data = Object.entries(dataMap).map(([, val]) => {
const { userId, year, studentReferenceId, klassReferenceId, lessonReferenceId, teacherReferenceId } = val[0];
const knownAbsences = knownAbsMap[klassReferenceId]?.[lessonReferenceId];
const { lessonsCount, absCount, approvedAbsCount, attPercents, absPercents, gradeAvg, lastGrade, maxGrade } = calcReportsData(val, [{ absnceCount: knownAbsences }]);
Expand Down
2 changes: 1 addition & 1 deletion server/src/reports/teacherReportFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const getReportData: IGetReportDataFunction = async (
params: TeacherReportFileParams,
dataSource,
): Promise<TeacherReportFileData[]> => {
const [userId, teacherId, reportMonthId, year] = params.id.split('_');
const [, teacherId, reportMonthId, year] = params.id.split('_');
const teacherReportTable = params.isGrades ? TeacherGradeReportStatus : TeacherReportStatus;
const [user, teacher, teacherReportStatus, reportMonth] = await Promise.all([
dataSource.getRepository(User).findOneBy({ id: params.userId }),
Expand Down
2 changes: 1 addition & 1 deletion server/src/utils/studentReportData.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
roundFractional,
} from '@shared/utils/reportData.util';
import { getReportDateFilter } from '@shared/utils/entity/filters.util';
import { FindOptionsWhere, FindOperator, In, Not, Any } from 'typeorm';
import { FindOptionsWhere, FindOperator, In, Not } from 'typeorm';
import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity';
import { AttReportAndGrade } from 'src/db/view-entities/AttReportAndGrade.entity';
import { AttGradeEffect } from 'src/db/entities/AttGradeEffect';
Expand Down
Loading