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
1 change: 0 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import transportation from 'src/entities/transportation';
import absenceType from 'src/entities/absenceType';
import uploadedFile from '@shared/components/common-entities/uploaded-file';
import studentKlassesReport from 'src/entities/student-klasses-report';
import StudentEventReport from 'src/components/StudentView/student-event-report';
import reportMonth from 'src/entities/report-month';
import teacherReportStatus from 'src/entities/teacher-report-status';
import teacherGradeReportStatus from 'src/entities/teacher-grade-report-status';
Expand Down
1 change: 0 additions & 1 deletion client/src/RootDashboard.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Dashboard } from 'src/GeneralLayout';
import { useIsTeacherView, useIsStudentView } from 'src/utils/appPermissions';
import { TeacherGuard } from 'src/components/TeacherView/TeacherAccess';
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ApprovedAbsencesUpload.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useRef } from 'react';
import { useState, useRef } from 'react';

// MUI Components
import Container from '@mui/material/Container';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Button } from 'react-admin';
import Box from '@mui/material/Box';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Form, TextInput } from 'react-admin';
import Box from '@mui/material/Box';
import Stack from '@mui/material/Stack';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Button } from 'react-admin';
import Stack from '@mui/material/Stack';
import Box from '@mui/material/Box';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import Box from '@mui/material/Box';
import Stack from '@mui/material/Stack';
import Typography from '@mui/material/Typography';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import {
Datagrid,
FunctionField,
Expand Down
1 change: 0 additions & 1 deletion client/src/components/LessonSignatureFields.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Box, Divider, Typography } from '@mui/material';
import { required } from 'react-admin';
import SignatureInput from '@shared/components/fields/signature/SignatureInput';
Expand Down
1 change: 0 additions & 1 deletion client/src/components/StudentView/StudentAccess.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton, useResetStore } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import Button from '@mui/material/Button';
Expand Down
1 change: 0 additions & 1 deletion client/src/components/StudentView/student-event-report.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
useGetList,
Create,
SimpleForm,
FormDataConsumer,
Loading,
ArrayInput,
SimpleFormIterator,
Expand Down
1 change: 0 additions & 1 deletion client/src/components/TeacherView/TeacherAccess.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton, useResetStore } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import Button from '@mui/material/Button';
Expand Down
1 change: 0 additions & 1 deletion client/src/components/fields/ThresholdColorField.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { FunctionField } from 'react-admin';
import { getColorForValue } from '@shared/utils/thresholdUtil';

Expand Down
1 change: 0 additions & 1 deletion client/src/entities/att-grade-effect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
DateField,
DateTimeInput,
required,
maxLength,
} from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/att-report-with-report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
TextField,
TextInput,
ReferenceField,
required,
NumberInput,
BooleanInput,
NullableBooleanInput,
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/attendance-name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { CommonRepresentation } from '@shared/components/CommonRepresentation';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';

const filters = [adminUserFilter, <NumberInput source="key" />, <TextInput source="name:$cont" alwaysOn />];
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/known-absence.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { MultiReferenceField } from '@shared/components/fields/CommonReferenceFi
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import {
CommonReferenceInputFilter,
filterByUserId,
filterByUserIdAndYear,
} from '@shared/components/fields/CommonReferenceInputFilter';
import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput';
Expand Down
2 changes: 0 additions & 2 deletions client/src/entities/lesson.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import {
DateTimeInput,
maxLength,
NumberInput,
ReferenceArrayField,
ReferenceArrayInput,
ReferenceField,
required,
TextField,
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/report-month.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
DateInput,
DateTimeInput,
maxLength,
NumberInput,
ReferenceField,
required,
TextField,
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/student-klass.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
DateField,
DateInput,
DateTimeInput,
NullableBooleanInput,
ReferenceField,
Expand Down
2 changes: 1 addition & 1 deletion client/src/entities/student-klasses-report.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReferenceField, TextField, SelectField } from 'react-admin';
import { ReferenceField, TextField } from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { MultiReferenceArrayField, MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
Expand Down
3 changes: 0 additions & 3 deletions client/src/entities/student.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import {
BooleanField,
BooleanInput,
DateField,
DateInput,
DateTimeInput,
Labeled,
maxLength,
NullableBooleanInput,
ReferenceField,
ReferenceManyField,
required,
SelectInput,
TextField,
TextInput,
} from 'react-admin';
Expand All @@ -21,7 +19,6 @@ import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput
import { defaultYearFilter } from '@shared/utils/yearFilter';
import { MultiReferenceField } from '@shared/components/fields/CommonReferenceField';
import { useUnique } from '@shared/utils/useUnique';
import { CommonReferenceInputFilter } from '@shared/components/fields/CommonReferenceInputFilter';
import StudentReportCardReactButton from 'src/reports/studentReportCardReactButton';
import { BulkActionButton } from '@shared/components/crudContainers/BulkActionButton';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
Expand Down
2 changes: 1 addition & 1 deletion client/src/entities/teacher-salary-report.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReferenceField, TextField, SelectField, NumberField } from 'react-admin';
import { ReferenceField, TextField, NumberField } from 'react-admin';
import { CommonDatagrid } from '@shared/components/crudContainers/CommonList';
import { getResourceComponents } from '@shared/components/crudContainers/CommonEntity';
import { CommonReferenceInputFilter, filterByUserId } from '@shared/components/fields/CommonReferenceInputFilter';
Expand Down
1 change: 0 additions & 1 deletion client/src/entities/teacher.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
DateField,
DateInput,
DateTimeInput,
EmailField,
maxLength,
Expand Down
2 changes: 0 additions & 2 deletions client/src/pivots/PercentReportWithDatesList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import {
useRecordContext,
useListFilterContext,
TextInput,
useAuthState,
usePermissions,
BooleanInput,
NullableBooleanInput,
} from 'react-admin';
Expand Down
2 changes: 0 additions & 2 deletions client/src/pivots/StudentAttendanceList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ import {
useListContext,
TextInput,
DateInput,
BooleanInput,
NullableBooleanInput,
} from 'react-admin';
import { defaultYearFilter } from '@shared/utils/yearFilter';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
import { CommonYearField, CommonYearInputFilter } from '@shared/components/fields/CommonYear';
import { CommonSelectArrayField } from '@shared/components/fields/CommonSelectArrayField';
import { semesterChoices } from 'src/entities/report-month';
import CommonReferenceArrayInput from '@shared/components/fields/CommonReferenceArrayInput';
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/InLessonReport.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useMemo, useState } from 'react';
import { useCallback, useMemo, useState } from 'react';
import { useRedirect, useDataProvider, useNotify } from 'react-admin';
import { useSavableData } from '../../shared/components/import/util';
import { Datagrid as AttDatagrid } from 'src/entities/att-report';
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/FormActions.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { Box, Divider } from '@mui/material';
import { Button, SaveButton } from 'react-admin';
import { PreviewListWithSavingDialog } from '../../../shared/components/import/PreviewListWithSavingDialog';
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/LessonSelector.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useState, useMemo } from 'react';
import { useCallback, useState, useMemo } from 'react';
import { Box, Typography, Divider } from '@mui/material';
import { TabbedForm, Toolbar, SaveButton, TextInput, useDataProvider, useNotify } from 'react-admin';
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
Expand Down
1 change: 0 additions & 1 deletion client/src/reports/in-lesson-report/MainReport.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { FormDataConsumer, SimpleForm, NumberInput, RecordContextProvider, useStore } from 'react-admin';
import Divider from '@mui/material/Divider';
import { ReportHeader } from './ReportHeader';
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/ReportHeader.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react';
import { useContext } from 'react';
import { Box, Typography } from '@mui/material';
import { ReportContext } from './context';

Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/StudentList.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useContext, useMemo, useRef, useState, useLayoutEffect } from 'react';
import { useCallback, useContext, useMemo, useRef, useState, useLayoutEffect } from 'react';
import {
NumberInput,
DateInput,
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/TeacherSelector.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import { useCallback, useState } from 'react';
import { Box, Typography, Divider } from '@mui/material';
import { TabbedForm, Toolbar, SaveButton, TextInput, useDataProvider, useNotify } from 'react-admin';
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
Expand Down
2 changes: 1 addition & 1 deletion client/src/reports/in-lesson-report/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useState, useEffect } from 'react';
import { useCallback, useEffect } from 'react';
import { Container, Paper, Stack } from '@mui/material';
import { useNotify, useStore } from 'react-admin';
import { ReportContext, defaultContextValue } from './context';
Expand Down
1 change: 0 additions & 1 deletion client/src/settings/GeneralSettingsInput.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { NumberInput, required } from 'react-admin';
import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
import CommonAutocompleteInput from '@shared/components/fields/CommonAutocompleteInput';
Expand Down
1 change: 0 additions & 1 deletion client/src/settings/ReportCardSettingsInput.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Box } from '@mui/material';
import { BooleanInput, Link } from 'react-admin';
import { CommonSettingsAccordion } from '@shared/components/settings/CommonSettingsAccordion';
Expand Down
1 change: 0 additions & 1 deletion client/src/settings/ReportStylesInput.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material';
import RestartAltIcon from '@mui/icons-material/RestartAltOutlined';
import { useFormContext } from 'react-hook-form';
Expand Down
1 change: 0 additions & 1 deletion client/src/settings/Settings.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Card, CardContent } from '@mui/material';
import {
SimpleForm,
Expand Down
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 @@ -16,7 +16,6 @@ import { Grade } from './Grade.entity';
import { CrudValidationGroups } from '@dataui/crud';
import { IsNotEmpty, IsDate } 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
2 changes: 1 addition & 1 deletion 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
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
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
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
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
Loading
Loading