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
3 changes: 0 additions & 3 deletions server/src/entity-modules/student-by-year.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ class StudentByYearService<T extends Entity | StudentByYear> extends BaseEntityS
});

pivotData.forEach((item) => {
// if (item.absCount === 0) {
// return;
// }
const key = `${item.lessonReferenceId}`;
headers[key] ??= { value: key, label: `${item.lesson?.name}` };
studentMap[item.studentReferenceId][key] ??= 0;
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
1 change: 0 additions & 1 deletion server/src/utils/studentReportData.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ export function getDisplayGrade(
gradeNames: GradeName[] = [],
klassTypeReferenceId?: number,
) {
// if (grade === 0) return '0%';
if (!grade) return '';

// ========== investigation ==========
Expand Down
Loading