Skip to content

Commit 14a643f

Browse files
committed
temp
1 parent 6216917 commit 14a643f

7 files changed

Lines changed: 7 additions & 88 deletions

File tree

‎server/src/__tests__/entities.module.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jest.mock('@shared/base-entity/base-entity.module', () => {
2828
const MockBaseEntityModule = global.MockBaseEntityModule;
2929

3030
// Import all configs and entities
31-
import userConfig from '../entity-modules/user.config';
31+
import userConfig from '../../shared/entities/configs/user.config';
3232
import attReportConfig from '../entity-modules/att-report.config';
3333
import gradeConfig from '../entity-modules/grade.config';
3434
import klassConfig from '../entity-modules/klass.config';
@@ -38,7 +38,7 @@ import lessonConfig from '../entity-modules/lesson.config';
3838
import studentKlassConfig from '../entity-modules/student-klass.config';
3939
import studentConfig from '../entity-modules/student.config';
4040
import teacherConfig from '../entity-modules/teacher.config';
41-
import textConfig from '../entity-modules/text.config';
41+
import textConfig from '../../shared/entities/configs/text.config';
4242
import { StudentBaseKlass } from '../db/view-entities/StudentBaseKlass.entity';
4343
import { YemotCall } from '@shared/entities/YemotCall.entity';
4444
import { RecievedMail } from '@shared/entities/RecievedMail.entity';

‎server/src/entities.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Module } from "@nestjs/common";
22
import { BaseEntityModule } from '@shared/base-entity/base-entity.module';
33

4-
import userConfig from './entity-modules/user.config';
4+
import userConfig from '../shared/entities/configs/user.config';
55
import attReportConfig from './entity-modules/att-report.config';
66
import gradeConfig from './entity-modules/grade.config';
77
import klassConfig from './entity-modules/klass.config';
@@ -11,7 +11,7 @@ import lessonConfig from './entity-modules/lesson.config';
1111
import studentKlassConfig from './entity-modules/student-klass.config';
1212
import studentConfig from './entity-modules/student.config';
1313
import teacherConfig from './entity-modules/teacher.config';
14-
import textConfig from './entity-modules/text.config';
14+
import textConfig from '../shared/entities/configs/text.config';
1515
import studentKlassReportConfig from './entity-modules/student-klass-report.config';
1616
import { StudentBaseKlass } from './db/view-entities/StudentBaseKlass.entity';
1717
import auditLogConfig from "./entity-modules/audit-log.config";
@@ -20,14 +20,14 @@ import { TextByUser } from '@shared/view-entities/TextByUser.entity';
2020
import mailAddressConfig from '@shared/utils/mail/mail-address.config';
2121
import { RecievedMail } from '@shared/entities/RecievedMail.entity';
2222
import { Image } from "@shared/entities/Image.entity";
23-
import pageConfig from './entity-modules/page.config';
23+
import pageConfig from '../shared/entities/configs/page.config';
2424
import { ReportMonth } from './db/entities/ReportMonth.entity';
2525
import teacherReportStatusConfig from './entity-modules/teacher-report-status.config';
2626
import studentPercentReportConfig from './entity-modules/student-percent-report.config';
2727
import { AttReportAndGrade } from "./db/view-entities/AttReportAndGrade.entity";
2828
import { StudentGlobalReport } from "./db/view-entities/StudentGlobalReport.entity";
2929
import studentByYearConfig from "./entity-modules/student-by-year.config";
30-
import paymentTrackConfig from "./entity-modules/payment-track.config";
30+
import paymentTrackConfig from "../shared/entities/configs/payment-track.config";
3131
import teacherSalaryReportConfig from "./entity-modules/teacher-salary-report.config";
3232
import attReportWithReportMonthConfig from "./entity-modules/att-report-with-report-month.config";
3333
import { KnownAbsenceWithReportMonth } from "./db/view-entities/KnownAbsenceWithReportMonth.entity";

‎server/src/entity-modules/page.config.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎server/src/entity-modules/payment-track.config.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎server/src/entity-modules/text.config.ts‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎server/src/entity-modules/user.config.ts‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)