@driveup/schema 0.2.6 → 0.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/catalog/addon/addon.entity.d.ts +3 -3
- package/lib/catalog/addon/addon.entity.js +5 -5
- package/lib/catalog/addon/addon.entity.js.map +1 -1
- package/lib/catalog/addon/country.entity.d.ts +3 -3
- package/lib/catalog/addon/country.entity.js +5 -5
- package/lib/catalog/addon/country.entity.js.map +1 -1
- package/lib/catalog/priceplan/priceplan.entity.d.ts +2 -2
- package/lib/catalog/priceplan/priceplan.entity.js +4 -4
- package/lib/catalog/priceplan/priceplan.entity.js.map +1 -1
- package/lib/catalog/product/country.entity.d.ts +4 -4
- package/lib/catalog/product/country.entity.js +9 -9
- package/lib/catalog/product/country.entity.js.map +1 -1
- package/lib/catalog/product/priceplan.entity.d.ts +3 -3
- package/lib/catalog/product/priceplan.entity.js +8 -8
- package/lib/catalog/product/priceplan.entity.js.map +1 -1
- package/lib/catalog/product/product.entity.d.ts +3 -3
- package/lib/catalog/product/product.entity.js +6 -6
- package/lib/catalog/product/product.entity.js.map +1 -1
- package/lib/catalog/program/program.entity.d.ts +1 -1
- package/lib/catalog/program/program.entity.js +5 -5
- package/lib/catalog/program/program.entity.js.map +1 -1
- package/lib/catalog/seed/assets/asset.entity.d.ts +2 -2
- package/lib/catalog/seed/assets/asset.entity.js +4 -4
- package/lib/catalog/seed/assets/asset.entity.js.map +1 -1
- package/lib/catalog/seed/courses/course.entity.d.ts +3 -3
- package/lib/catalog/seed/courses/course.entity.js +7 -7
- package/lib/catalog/seed/courses/course.entity.js.map +1 -1
- package/lib/catalog/seed/courses/lesson.entity.d.ts +2 -2
- package/lib/catalog/seed/courses/lesson.entity.js +5 -5
- package/lib/catalog/seed/courses/lesson.entity.js.map +1 -1
- package/lib/catalog/seed/courses/topic.entity.d.ts +2 -2
- package/lib/catalog/seed/courses/topic.entity.js +5 -5
- package/lib/catalog/seed/courses/topic.entity.js.map +1 -1
- package/lib/catalog/seed/expense/category.entity.d.ts +1 -1
- package/lib/catalog/seed/expense/category.entity.js +4 -4
- package/lib/catalog/seed/expense/category.entity.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/profile/agent/agent.entity.d.ts +12 -4
- package/lib/profile/agent/agent.entity.js +30 -6
- package/lib/profile/agent/agent.entity.js.map +1 -1
- package/lib/profile/agent/asset.entity.d.ts +1 -1
- package/lib/profile/agent/asset.entity.js +2 -2
- package/lib/profile/agent/asset.entity.js.map +1 -1
- package/lib/profile/agent/payout.entity.d.ts +2 -2
- package/lib/profile/agent/payout.entity.js +4 -4
- package/lib/profile/agent/payout.entity.js.map +1 -1
- package/lib/profile/agent/promotion.entity.d.ts +3 -3
- package/lib/profile/agent/promotion.entity.js +6 -6
- package/lib/profile/agent/promotion.entity.js.map +1 -1
- package/lib/profile/company/company.entity.d.ts +39 -8
- package/lib/profile/company/company.entity.js +147 -10
- package/lib/profile/company/company.entity.js.map +1 -1
- package/lib/profile/company/course/course.entity.d.ts +35 -8
- package/lib/profile/company/course/course.entity.js +48 -9
- package/lib/profile/company/course/course.entity.js.map +1 -1
- package/lib/profile/company/course/lesson.entity.d.ts +20 -6
- package/lib/profile/company/course/lesson.entity.js +77 -10
- package/lib/profile/company/course/lesson.entity.js.map +1 -1
- package/lib/profile/company/course/{appointment.entity.d.ts → schedule.entity.d.ts} +78 -8
- package/lib/profile/company/course/{appointment.entity.js → schedule.entity.js} +257 -7
- package/lib/profile/company/course/schedule.entity.js.map +1 -0
- package/lib/profile/company/course/topic.entity.d.ts +6 -2
- package/lib/profile/company/course/topic.entity.js +12 -5
- package/lib/profile/company/course/topic.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/bill.entity.d.ts +3 -3
- package/lib/profile/company/finances/billing/bill.entity.js +5 -5
- package/lib/profile/company/finances/billing/bill.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/item.entity.d.ts +2 -2
- package/lib/profile/company/finances/billing/item.entity.js +5 -5
- package/lib/profile/company/finances/billing/item.entity.js.map +1 -1
- package/lib/profile/company/finances/billing/transaction.entity.d.ts +3 -3
- package/lib/profile/company/finances/billing/transaction.entity.js +6 -6
- package/lib/profile/company/finances/billing/transaction.entity.js.map +1 -1
- package/lib/profile/company/finances/expense/category.entity.d.ts +1 -1
- package/lib/profile/company/finances/expense/category.entity.js +4 -4
- package/lib/profile/company/finances/expense/category.entity.js.map +1 -1
- package/lib/profile/company/finances/expense/expense.entity.d.ts +6 -2
- package/lib/profile/company/finances/expense/expense.entity.js +32 -4
- package/lib/profile/company/finances/expense/expense.entity.js.map +1 -1
- package/lib/profile/company/finances/handover/handover.entity.d.ts +3 -3
- package/lib/profile/company/finances/handover/handover.entity.js +6 -6
- package/lib/profile/company/finances/handover/handover.entity.js.map +1 -1
- package/lib/profile/company/finances/invoice/invoice.entity.d.ts +7 -6
- package/lib/profile/company/finances/invoice/invoice.entity.js +9 -8
- package/lib/profile/company/finances/invoice/invoice.entity.js.map +1 -1
- package/lib/profile/company/finances/invoice/item.entity.d.ts +2 -2
- package/lib/profile/company/finances/invoice/item.entity.js +4 -4
- package/lib/profile/company/finances/invoice/item.entity.js.map +1 -1
- package/lib/profile/company/finances/payment/method.entity.d.ts +10 -4
- package/lib/profile/company/finances/payment/method.entity.js +24 -5
- package/lib/profile/company/finances/payment/method.entity.js.map +1 -1
- package/lib/profile/company/instructor/activity.entity.js.map +1 -1
- package/lib/profile/company/instructor/calendar-state.entity.js.map +1 -1
- package/lib/profile/company/instructor/instructor.entity.d.ts +19 -11
- package/lib/profile/company/instructor/instructor.entity.js +100 -16
- package/lib/profile/company/instructor/instructor.entity.js.map +1 -1
- package/lib/profile/company/instructor/task.entity.d.ts +2 -1
- package/lib/profile/company/instructor/task.entity.js +9 -4
- package/lib/profile/company/instructor/task.entity.js.map +1 -1
- package/lib/profile/company/medical/examination.entity.d.ts +3 -3
- package/lib/profile/company/medical/examination.entity.js +5 -5
- package/lib/profile/company/medical/examination.entity.js.map +1 -1
- package/lib/profile/company/medical/product.entity.d.ts +4 -4
- package/lib/profile/company/medical/product.entity.js +5 -5
- package/lib/profile/company/medical/product.entity.js.map +1 -1
- package/lib/profile/company/product/addon.entity.d.ts +2 -2
- package/lib/profile/company/product/addon.entity.js +5 -5
- package/lib/profile/company/product/addon.entity.js.map +1 -1
- package/lib/profile/company/product/priceplan.entity.d.ts +4 -3
- package/lib/profile/company/product/priceplan.entity.js +9 -4
- package/lib/profile/company/product/priceplan.entity.js.map +1 -1
- package/lib/profile/company/product/product.entity.d.ts +8 -7
- package/lib/profile/company/product/product.entity.js +19 -9
- package/lib/profile/company/product/product.entity.js.map +1 -1
- package/lib/profile/company/product/vehicle.entity.d.ts +2 -2
- package/lib/profile/company/product/vehicle.entity.js +4 -4
- package/lib/profile/company/product/vehicle.entity.js.map +1 -1
- package/lib/profile/instructor/instructor.entity.d.ts +6 -3
- package/lib/profile/instructor/instructor.entity.js +28 -7
- package/lib/profile/instructor/instructor.entity.js.map +1 -1
- package/lib/profile/student/program/licence/licence.entity.d.ts +3 -3
- package/lib/profile/student/program/licence/licence.entity.js +5 -5
- package/lib/profile/student/program/licence/licence.entity.js.map +1 -1
- package/lib/profile/student/program/medical/certificate.entity.d.ts +2 -2
- package/lib/profile/student/program/medical/certificate.entity.js +4 -4
- package/lib/profile/student/program/medical/certificate.entity.js.map +1 -1
- package/lib/profile/student/program/medical/examination.entity.d.ts +3 -3
- package/lib/profile/student/program/medical/examination.entity.js +10 -10
- package/lib/profile/student/program/medical/examination.entity.js.map +1 -1
- package/lib/profile/student/program/program.entity.d.ts +6 -6
- package/lib/profile/student/program/program.entity.js +9 -9
- package/lib/profile/student/program/program.entity.js.map +1 -1
- package/lib/profile/student/program/training/appointment.entity.d.ts +21 -9
- package/lib/profile/student/program/training/appointment.entity.js +109 -12
- package/lib/profile/student/program/training/appointment.entity.js.map +1 -1
- package/lib/profile/student/program/training/exam.entity.d.ts +4 -2
- package/lib/profile/student/program/training/exam.entity.js +12 -4
- package/lib/profile/student/program/training/exam.entity.js.map +1 -1
- package/lib/profile/student/program/training/lesson.entity.d.ts +9 -4
- package/lib/profile/student/program/training/lesson.entity.js +29 -7
- package/lib/profile/student/program/training/lesson.entity.js.map +1 -1
- package/lib/profile/student/program/training/request.entity.d.ts +6 -3
- package/lib/profile/student/program/training/request.entity.js +26 -5
- package/lib/profile/student/program/training/request.entity.js.map +1 -1
- package/lib/profile/student/program/training/topic.entity.d.ts +14 -3
- package/lib/profile/student/program/training/topic.entity.js +29 -5
- package/lib/profile/student/program/training/topic.entity.js.map +1 -1
- package/lib/profile/student/program/training/training.entity.d.ts +49 -6
- package/lib/profile/student/program/training/training.entity.js +190 -7
- package/lib/profile/student/program/training/training.entity.js.map +1 -1
- package/lib/profile/student/program/training/transaction.entity.d.ts +8 -3
- package/lib/profile/student/program/training/transaction.entity.js +41 -4
- package/lib/profile/student/program/training/transaction.entity.js.map +1 -1
- package/lib/profile/student/student.entity.d.ts +11 -6
- package/lib/profile/student/student.entity.js +57 -10
- package/lib/profile/student/student.entity.js.map +1 -1
- package/lib/system/campaign/campaign.entity.d.ts +2 -2
- package/lib/system/campaign/campaign.entity.js +6 -6
- package/lib/system/campaign/campaign.entity.js.map +1 -1
- package/lib/system/campaign/gifcode.entity.d.ts +2 -2
- package/lib/system/campaign/gifcode.entity.js +6 -6
- package/lib/system/campaign/gifcode.entity.js.map +1 -1
- package/lib/system/country/country.entity.d.ts +7 -5
- package/lib/system/country/country.entity.js +15 -9
- package/lib/system/country/country.entity.js.map +1 -1
- package/lib/system/currency/currency.entity.d.ts +1 -1
- package/lib/system/currency/currency.entity.js +4 -4
- package/lib/system/currency/currency.entity.js.map +1 -1
- package/lib/system/driving/category.entity.d.ts +7 -7
- package/lib/system/driving/category.entity.js +12 -12
- package/lib/system/driving/category.entity.js.map +1 -1
- package/lib/system/driving/vehicle.entity.d.ts +2 -2
- package/lib/system/driving/vehicle.entity.js +4 -4
- package/lib/system/driving/vehicle.entity.js.map +1 -1
- package/lib/system/event/event.entity.d.ts +2 -2
- package/lib/system/event/event.entity.js +4 -4
- package/lib/system/event/event.entity.js.map +1 -1
- package/lib/system/event/log.entity.d.ts +2 -2
- package/lib/system/event/log.entity.js +3 -3
- package/lib/system/event/log.entity.js.map +1 -1
- package/lib/system/policy/policy.entity.d.ts +1 -1
- package/lib/system/policy/policy.entity.js +5 -5
- package/lib/system/policy/policy.entity.js.map +1 -1
- package/lib/system/staff/staff.entity.d.ts +1 -1
- package/lib/system/staff/staff.entity.js +3 -3
- package/lib/system/staff/staff.entity.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/user/alert.entity.d.ts +3 -2
- package/lib/user/alert.entity.js +11 -4
- package/lib/user/alert.entity.js.map +1 -1
- package/lib/user/blocked.entity.js +2 -2
- package/lib/user/blocked.entity.js.map +1 -1
- package/lib/user/device.entity.d.ts +15 -0
- package/lib/user/device.entity.js +26 -0
- package/lib/user/device.entity.js.map +1 -1
- package/lib/user/notification.entity.d.ts +2 -2
- package/lib/user/notification.entity.js +4 -4
- package/lib/user/notification.entity.js.map +1 -1
- package/lib/user/ticket.entity.d.ts +8 -3
- package/lib/user/ticket.entity.js +11 -4
- package/lib/user/ticket.entity.js.map +1 -1
- package/lib/user/user.entity.d.ts +91 -82
- package/lib/user/user.entity.js +257 -259
- package/lib/user/user.entity.js.map +1 -1
- package/lib/user/verification.entity.js +2 -2
- package/lib/user/verification.entity.js.map +1 -1
- package/lib/utils/activity.helper.d.ts +2 -2
- package/lib/utils/activity.helper.js.map +1 -1
- package/lib/utils/trackable.d.ts +2 -2
- package/lib/utils/trackable.js.map +1 -1
- package/package.json +2 -2
- package/lib/profile/company/course/appointment.entity.js.map +0 -1
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { Activity, Holiday, Instructor, Link, Metadata, Period, Preference, WorkingHours } from '@driveup/common';
|
|
2
|
+
import { AccountStatus, Language, PreferenceScope, Role } from '@driveup/shared';
|
|
3
|
+
import { UserEntity } from '../../../user/user.entity';
|
|
4
|
+
import { TrackableEntity } from '../../../utils/trackable';
|
|
5
5
|
import { InstructorEntity } from '../../instructor/instructor.entity';
|
|
6
|
-
import { CompanyHandoverEntity } from '../finances/handover/handover.entity';
|
|
7
|
-
import { CompanyCourseEntity } from '../course/course.entity';
|
|
8
|
-
import { CompanyCourseLessonEntity } from '../course/lesson.entity';
|
|
9
|
-
import { StudentTrainingEntity } from '../../student/program/training/training.entity';
|
|
10
6
|
import { StudentTrainingAppointmentEntity } from '../../student/program/training/appointment.entity';
|
|
11
|
-
import { CompanyCourseScheduleEntity } from '../course/appointment.entity';
|
|
12
7
|
import { StudentTrainingLessonEntity } from '../../student/program/training/lesson.entity';
|
|
13
|
-
import {
|
|
8
|
+
import { StudentTrainingEntity } from '../../student/program/training/training.entity';
|
|
9
|
+
import { CompanyEntity } from '../company.entity';
|
|
10
|
+
import { CompanyCourseEntity } from '../course/course.entity';
|
|
11
|
+
import { CompanyCourseLessonEntity } from '../course/lesson.entity';
|
|
12
|
+
import { CompanyCourseScheduleEntity } from '../course/schedule.entity';
|
|
13
|
+
import { CompanyHandoverEntity } from '../finances/handover/handover.entity';
|
|
14
14
|
import { CompanyInstructorActivityEntity } from './activity.entity';
|
|
15
15
|
import { InstructorSharedCalendarStateEntity } from './calendar-state.entity';
|
|
16
|
-
import {
|
|
16
|
+
import { CompanyInstructorTaskEntity } from './task.entity';
|
|
17
17
|
export declare class CompanyInstructorEntity extends TrackableEntity<Instructor> {
|
|
18
18
|
instructorId: number;
|
|
19
19
|
companyId: number;
|
|
@@ -99,8 +99,14 @@ export declare class CompanyInstructorEntity extends TrackableEntity<Instructor>
|
|
|
99
99
|
toSummary(): Promise<Instructor>;
|
|
100
100
|
toPerson(): Promise<import("@driveup/common").Person>;
|
|
101
101
|
getUser(): Promise<UserEntity>;
|
|
102
|
+
getCompany(): Promise<CompanyEntity>;
|
|
102
103
|
getInstructor(): Promise<InstructorEntity>;
|
|
103
104
|
canReinstate(): Promise<boolean>;
|
|
105
|
+
/**
|
|
106
|
+
* Non working hours of the instructor in the given period
|
|
107
|
+
*/
|
|
108
|
+
getNonWorkingHours(period: Period): Period[];
|
|
109
|
+
getOffDays(period: Period): Holiday[];
|
|
104
110
|
getActivities(): Promise<Activity[]>;
|
|
105
111
|
getInvitedBy(): Promise<CompanyInstructorEntity | null>;
|
|
106
112
|
getClosedBy(): Promise<CompanyInstructorEntity | null>;
|
|
@@ -122,4 +128,6 @@ export declare class CompanyInstructorEntity extends TrackableEntity<Instructor>
|
|
|
122
128
|
* @returns Array of Preference objects or undefined if not set
|
|
123
129
|
*/
|
|
124
130
|
getPreferences(): Preference<boolean>[];
|
|
131
|
+
setPreference(name: string, value: any, scope: PreferenceScope): Promise<Preference<boolean>[]>;
|
|
132
|
+
removePreference(name: string): Promise<Preference<boolean>[]>;
|
|
125
133
|
}
|
|
@@ -11,24 +11,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var CompanyInstructorEntity_1;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.CompanyInstructorEntity = void 0;
|
|
14
|
-
const typeorm_1 = require("typeorm");
|
|
15
|
-
const shared_1 = require("@driveup/shared");
|
|
16
14
|
const common_1 = require("@driveup/common");
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
16
|
+
const luxon_1 = require("luxon");
|
|
17
|
+
const typeorm_1 = require("typeorm");
|
|
17
18
|
const log_entity_1 = require("../../../system/event/log.entity");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
19
|
+
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
20
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
20
21
|
const instructor_entity_1 = require("../../instructor/instructor.entity");
|
|
21
|
-
const handover_entity_1 = require("../finances/handover/handover.entity");
|
|
22
|
-
const course_entity_1 = require("../course/course.entity");
|
|
23
|
-
const lesson_entity_1 = require("../course/lesson.entity");
|
|
24
|
-
const training_entity_1 = require("../../student/program/training/training.entity");
|
|
25
22
|
const appointment_entity_1 = require("../../student/program/training/appointment.entity");
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const
|
|
23
|
+
const lesson_entity_1 = require("../../student/program/training/lesson.entity");
|
|
24
|
+
const training_entity_1 = require("../../student/program/training/training.entity");
|
|
25
|
+
const company_entity_1 = require("../company.entity");
|
|
26
|
+
const course_entity_1 = require("../course/course.entity");
|
|
27
|
+
const lesson_entity_2 = require("../course/lesson.entity");
|
|
28
|
+
const schedule_entity_1 = require("../course/schedule.entity");
|
|
29
|
+
const handover_entity_1 = require("../finances/handover/handover.entity");
|
|
30
30
|
const activity_entity_1 = require("./activity.entity");
|
|
31
31
|
const calendar_state_entity_1 = require("./calendar-state.entity");
|
|
32
|
+
const task_entity_1 = require("./task.entity");
|
|
32
33
|
let CompanyInstructorEntity = CompanyInstructorEntity_1 = class CompanyInstructorEntity extends trackable_1.TrackableEntity {
|
|
33
34
|
constructor(props) {
|
|
34
35
|
super();
|
|
@@ -62,6 +63,9 @@ let CompanyInstructorEntity = CompanyInstructorEntity_1 = class CompanyInstructo
|
|
|
62
63
|
const instructor = await this.getInstructor();
|
|
63
64
|
return await instructor.user;
|
|
64
65
|
}
|
|
66
|
+
async getCompany() {
|
|
67
|
+
return await this.company;
|
|
68
|
+
}
|
|
65
69
|
async getInstructor() {
|
|
66
70
|
return await this.instructor;
|
|
67
71
|
}
|
|
@@ -69,6 +73,69 @@ let CompanyInstructorEntity = CompanyInstructorEntity_1 = class CompanyInstructo
|
|
|
69
73
|
const instructor = await this.getInstructor();
|
|
70
74
|
return this.status === shared_1.AccountStatus.Closed && instructor.status === shared_1.AccountStatus.Active;
|
|
71
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* Non working hours of the instructor in the given period
|
|
78
|
+
*/
|
|
79
|
+
getNonWorkingHours(period) {
|
|
80
|
+
const result = [];
|
|
81
|
+
const periodStart = luxon_1.DateTime.fromJSDate(new Date(period.startDate));
|
|
82
|
+
const periodEnd = luxon_1.DateTime.fromJSDate(new Date(period.endDate));
|
|
83
|
+
let currentDay = periodStart;
|
|
84
|
+
let lastEnd = periodStart;
|
|
85
|
+
while (currentDay < periodEnd) {
|
|
86
|
+
const workdayDefinition = this.workingHours.find(i => common_1.DateHelper.getWeekdayNumber(i.weekday) === currentDay.weekday);
|
|
87
|
+
if (!workdayDefinition?.periods?.length) {
|
|
88
|
+
currentDay = currentDay.plus({ days: 1 }).startOf('day');
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
const workingHours = workdayDefinition.periods.sort((a, b) => new Date(a.startDate).getTime() - new Date(b.startDate).getTime());
|
|
92
|
+
for (const working of workingHours) {
|
|
93
|
+
const workingStart = luxon_1.DateTime.fromJSDate(new Date(working.startDate)).set({
|
|
94
|
+
year: currentDay.year,
|
|
95
|
+
month: currentDay.month,
|
|
96
|
+
day: currentDay.day
|
|
97
|
+
});
|
|
98
|
+
const workingEnd = luxon_1.DateTime.fromJSDate(new Date(working.endDate)).set({
|
|
99
|
+
year: currentDay.year,
|
|
100
|
+
month: currentDay.month,
|
|
101
|
+
day: currentDay.day
|
|
102
|
+
});
|
|
103
|
+
if (lastEnd < workingStart &&
|
|
104
|
+
(lastEnd >= periodStart || workingStart > periodStart)) {
|
|
105
|
+
lastEnd = lastEnd < periodStart ? periodStart : lastEnd;
|
|
106
|
+
const nonWorking = new common_1.Period({
|
|
107
|
+
startDate: lastEnd.toJSDate(),
|
|
108
|
+
endDate: workingStart.toJSDate()
|
|
109
|
+
});
|
|
110
|
+
result.push(nonWorking);
|
|
111
|
+
}
|
|
112
|
+
lastEnd = workingEnd;
|
|
113
|
+
if (lastEnd >= periodEnd)
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
currentDay = currentDay.plus({ days: 1 }).startOf('day');
|
|
117
|
+
}
|
|
118
|
+
if (lastEnd < periodEnd) {
|
|
119
|
+
const nonWorking = new common_1.Period({
|
|
120
|
+
startDate: lastEnd.toJSDate(),
|
|
121
|
+
endDate: periodEnd.toJSDate()
|
|
122
|
+
});
|
|
123
|
+
result.push(nonWorking);
|
|
124
|
+
}
|
|
125
|
+
return result;
|
|
126
|
+
}
|
|
127
|
+
getOffDays(period) {
|
|
128
|
+
period.startDate = new Date(period.startDate);
|
|
129
|
+
period.endDate = new Date(period.endDate);
|
|
130
|
+
let instructorOffDays = this.holidays || [];
|
|
131
|
+
instructorOffDays = instructorOffDays.map(i => {
|
|
132
|
+
i.period.startDate = new Date(i.period.startDate);
|
|
133
|
+
i.period.endDate = new Date(i.period.endDate);
|
|
134
|
+
return i;
|
|
135
|
+
});
|
|
136
|
+
const instructorOffDaysInPeriod = instructorOffDays.filter(i => period.startDate < i.period.endDate && period.endDate > i.period.startDate);
|
|
137
|
+
return instructorOffDaysInPeriod;
|
|
138
|
+
}
|
|
72
139
|
async getActivities() {
|
|
73
140
|
const activities = [];
|
|
74
141
|
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
|
|
@@ -141,6 +208,23 @@ let CompanyInstructorEntity = CompanyInstructorEntity_1 = class CompanyInstructo
|
|
|
141
208
|
return;
|
|
142
209
|
return this.preferences.map(common_1.Preference.toInstance);
|
|
143
210
|
}
|
|
211
|
+
async setPreference(name, value, scope) {
|
|
212
|
+
this.preferences = this.preferences || [];
|
|
213
|
+
this.preferences = this.preferences.filter(p => p.name !== name);
|
|
214
|
+
this.preferences.push(new common_1.Preference({
|
|
215
|
+
scope: scope,
|
|
216
|
+
name: name,
|
|
217
|
+
value: value
|
|
218
|
+
}));
|
|
219
|
+
await CompanyInstructorEntity_1.save(this);
|
|
220
|
+
return this.preferences;
|
|
221
|
+
}
|
|
222
|
+
async removePreference(name) {
|
|
223
|
+
this.preferences = this.preferences || [];
|
|
224
|
+
this.preferences = this.preferences.filter(p => p.name !== name);
|
|
225
|
+
await CompanyInstructorEntity_1.save(this);
|
|
226
|
+
return this.preferences;
|
|
227
|
+
}
|
|
144
228
|
};
|
|
145
229
|
exports.CompanyInstructorEntity = CompanyInstructorEntity;
|
|
146
230
|
__decorate([
|
|
@@ -196,7 +280,7 @@ __decorate([
|
|
|
196
280
|
], CompanyInstructorEntity.prototype, "holidays", void 0);
|
|
197
281
|
__decorate([
|
|
198
282
|
(0, typeorm_1.Column)({
|
|
199
|
-
type: '
|
|
283
|
+
type: 'json',
|
|
200
284
|
nullable: true,
|
|
201
285
|
default: null
|
|
202
286
|
}),
|
|
@@ -250,11 +334,11 @@ __decorate([
|
|
|
250
334
|
__metadata("design:type", Promise)
|
|
251
335
|
], CompanyInstructorEntity.prototype, "companyCourses", void 0);
|
|
252
336
|
__decorate([
|
|
253
|
-
(0, typeorm_1.OneToMany)(() =>
|
|
337
|
+
(0, typeorm_1.OneToMany)(() => lesson_entity_2.CompanyCourseLessonEntity, lesson => lesson.instructor),
|
|
254
338
|
__metadata("design:type", Promise)
|
|
255
339
|
], CompanyInstructorEntity.prototype, "companyCourseLessons", void 0);
|
|
256
340
|
__decorate([
|
|
257
|
-
(0, typeorm_1.OneToMany)(() =>
|
|
341
|
+
(0, typeorm_1.OneToMany)(() => schedule_entity_1.CompanyCourseScheduleEntity, appointment => appointment.instructor),
|
|
258
342
|
__metadata("design:type", Promise)
|
|
259
343
|
], CompanyInstructorEntity.prototype, "companyCourseSchedule", void 0);
|
|
260
344
|
__decorate([
|
|
@@ -266,7 +350,7 @@ __decorate([
|
|
|
266
350
|
__metadata("design:type", Promise)
|
|
267
351
|
], CompanyInstructorEntity.prototype, "studentTrainings", void 0);
|
|
268
352
|
__decorate([
|
|
269
|
-
(0, typeorm_1.OneToMany)(() =>
|
|
353
|
+
(0, typeorm_1.OneToMany)(() => lesson_entity_1.StudentTrainingLessonEntity, lesson => lesson.instructor),
|
|
270
354
|
__metadata("design:type", Promise)
|
|
271
355
|
], CompanyInstructorEntity.prototype, "studentTrainingLessons", void 0);
|
|
272
356
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructor.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/instructor.entity.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"instructor.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/instructor.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Activity, Task } from '@driveup/common';
|
|
2
|
-
import { CompanyInstructorEntity } from './instructor.entity';
|
|
3
2
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
3
|
+
import { CompanyInstructorEntity } from './instructor.entity';
|
|
4
4
|
/**
|
|
5
5
|
* Represents a task or calendar event for a company instructor.
|
|
6
6
|
* Tasks can represent scheduled work, appointments, meetings, or other time blocks.
|
|
@@ -57,4 +57,5 @@ export declare class CompanyInstructorTaskEntity extends TrackableEntity<Task> {
|
|
|
57
57
|
toModel(): Task;
|
|
58
58
|
toSummary(): Task;
|
|
59
59
|
getActivities(): Promise<Activity[]>;
|
|
60
|
+
getCompany(): Promise<import("../company.entity").CompanyEntity>;
|
|
60
61
|
}
|
|
@@ -10,12 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyInstructorTaskEntity = void 0;
|
|
13
|
-
const typeorm_1 = require("typeorm");
|
|
14
|
-
const shared_1 = require("@driveup/shared");
|
|
15
13
|
const common_1 = require("@driveup/common");
|
|
16
|
-
const
|
|
17
|
-
const
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
18
16
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
17
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
18
|
+
const instructor_entity_1 = require("./instructor.entity");
|
|
19
|
+
// TODO: talk with admir about possibility of tasks binded to the InstructorEntity directly (no company involved)
|
|
19
20
|
/**
|
|
20
21
|
* Represents a task or calendar event for a company instructor.
|
|
21
22
|
* Tasks can represent scheduled work, appointments, meetings, or other time blocks.
|
|
@@ -56,6 +57,10 @@ let CompanyInstructorTaskEntity = class CompanyInstructorTaskEntity extends trac
|
|
|
56
57
|
activities.push(await (0, activity_helper_1.toActivity)(this.updatedBy, this.updatedOn, shared_1.ActivityType.updated));
|
|
57
58
|
return activities.filter(a => a);
|
|
58
59
|
}
|
|
60
|
+
async getCompany() {
|
|
61
|
+
const instructor = await this.instructor;
|
|
62
|
+
return await instructor.company;
|
|
63
|
+
}
|
|
59
64
|
};
|
|
60
65
|
exports.CompanyInstructorTaskEntity = CompanyInstructorTaskEntity;
|
|
61
66
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/task.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"task.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/instructor/task.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAiD;AACjD,4CAA+C;AAC/C,qCAAoD;AAEpD,oEAA4D;AAC5D,wDAA2D;AAC3D,2DAA8D;AAC9D,iHAAiH;AACjH;;;;;;GAMG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2BAAqB;IAsDrE;;;OAGG;IACH,YAAY,KAA4C;QACvD,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,OAAO;QACN,OAAO,IAAI,aAAI,CAAC;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU;QACf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;QACzC,OAAO,MAAM,UAAU,CAAC,OAAO,CAAA;IAChC,CAAC;CACD,CAAA;AA9FY,kEAA2B;AAMvC;IADC,IAAA,gBAAM,GAAE;;iEACY;AAMrB;IADC,IAAA,gBAAM,GAAE;;0DACK;AAMd;IADC,IAAA,gBAAM,GAAE;8BACE,IAAI;8DAAC;AAMhB;IADC,IAAA,gBAAM,GAAE;8BACA,IAAI;4DAAC;AAOd;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;2DACX;AAQhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;yDACZ;AAOd;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;yDACb;AAMd;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,2CAAuB,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;;+DAC5B;sCApDjC,2BAA2B;IADvC,IAAA,gBAAM,EAAC,wBAAwB,CAAC;;GACpB,2BAA2B,CA8FvC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { WeekDay } from '@driveup/shared';
|
|
2
1
|
import { Activity, MedicalExamination, Person } from '@driveup/common';
|
|
3
|
-
import {
|
|
4
|
-
import { StudentMedicalExaminationEntity } from '../../student/program/medical/examination.entity';
|
|
2
|
+
import { WeekDay } from '@driveup/shared';
|
|
5
3
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
4
|
+
import { StudentMedicalExaminationEntity } from '../../student/program/medical/examination.entity';
|
|
5
|
+
import { CompanyMedicalProductEntity } from './product.entity';
|
|
6
6
|
export declare class CompanyMedicalExaminationEntity extends TrackableEntity<MedicalExamination> {
|
|
7
7
|
medicalProductId: number;
|
|
8
8
|
/**
|
|
@@ -10,13 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyMedicalExaminationEntity = void 0;
|
|
13
|
-
const typeorm_1 = require("typeorm");
|
|
14
|
-
const shared_1 = require("@driveup/shared");
|
|
15
13
|
const common_1 = require("@driveup/common");
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const trackable_1 = require("../../../utils/trackable");
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
19
16
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
17
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
18
|
+
const examination_entity_1 = require("../../student/program/medical/examination.entity");
|
|
19
|
+
const product_entity_1 = require("./product.entity");
|
|
20
20
|
let CompanyMedicalExaminationEntity = class CompanyMedicalExaminationEntity extends trackable_1.TrackableEntity {
|
|
21
21
|
constructor(props) {
|
|
22
22
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examination.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/examination.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"examination.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/examination.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAuE;AACvE,4CAAwD;AACxD,qCAA+D;AAE/D,oEAA4D;AAC5D,wDAA2D;AAC3D,yFAAmG;AACnG,qDAA+D;AAGxD,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,2BAAmC;IA8FvF,YAAY,KAAgD;QAC3D,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO;QACN,OAAO,IAAI,2BAAkB,CAAC;YAC7B,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,CAAC,MAAM,IAAA,4BAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,qBAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACxF,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACD,CAAA;AA5HY,0EAA+B;AAG3C;IADC,IAAA,gBAAM,GAAE;;yEACgB;AAMzB;IADC,IAAA,gBAAM,GAAE;8BACE,IAAI;kEAAC;AAUhB;IAJC,IAAA,gBAAM,EAAC;QACP,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;8BACO,IAAI;gEAAC;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;iEACP;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;mEACP;AAOpB;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;iEACkB;AAUpB;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;qEACmB;AAUrB;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;gEAIE;AAUJ;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;8BACQ,eAAM;iEAAC;AAUjB;IALC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;;kEAIE;AAMJ;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,4CAA2B,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;;uEACzB;AAQrD;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,oDAA+B,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC;;iEAC5B;0CA5FzC,+BAA+B;IAD3C,IAAA,gBAAM,EAAC,4BAA4B,CAAC;;GACxB,+BAA+B,CA4H3C"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import { Activity, AddonUsage, Address } from '@driveup/common';
|
|
2
|
+
import { MedicalProduct, Person, Picture } from '@driveup/common';
|
|
1
3
|
import { AddonType, ProductStatus } from '@driveup/shared';
|
|
2
|
-
import { Activity, Address, AddonUsage } from '@driveup/common';
|
|
3
|
-
import { MedicalProduct, Picture, Person } from '@driveup/common';
|
|
4
|
-
import { CompanyProductEntity } from '../product/product.entity';
|
|
5
4
|
import { DrivingCategoryEntity } from '../../../system/driving/category.entity';
|
|
6
|
-
import { CompanyMedicalExaminationEntity } from './examination.entity';
|
|
7
5
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
6
|
+
import { CompanyProductEntity } from '../product/product.entity';
|
|
7
|
+
import { CompanyMedicalExaminationEntity } from './examination.entity';
|
|
8
8
|
export declare class CompanyMedicalProductEntity extends TrackableEntity<MedicalProduct> {
|
|
9
9
|
/**
|
|
10
10
|
* Company medical product
|
|
@@ -10,15 +10,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyMedicalProductEntity = void 0;
|
|
13
|
-
const typeorm_1 = require("typeorm");
|
|
14
|
-
const shared_1 = require("@driveup/shared");
|
|
15
13
|
const common_1 = require("@driveup/common");
|
|
16
14
|
const common_2 = require("@driveup/common");
|
|
17
|
-
const
|
|
15
|
+
const shared_1 = require("@driveup/shared");
|
|
16
|
+
const typeorm_1 = require("typeorm");
|
|
18
17
|
const category_entity_1 = require("../../../system/driving/category.entity");
|
|
19
|
-
const examination_entity_1 = require("./examination.entity");
|
|
20
|
-
const trackable_1 = require("../../../utils/trackable");
|
|
21
18
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
19
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
20
|
+
const product_entity_1 = require("../product/product.entity");
|
|
21
|
+
const examination_entity_1 = require("./examination.entity");
|
|
22
22
|
let CompanyMedicalProductEntity = class CompanyMedicalProductEntity extends trackable_1.TrackableEntity {
|
|
23
23
|
constructor(props) {
|
|
24
24
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/product.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"product.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/medical/product.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { AddonType } from '@driveup/shared';
|
|
2
1
|
import { Activity, Addon, Metadata } from '@driveup/common';
|
|
2
|
+
import { AddonType } from '@driveup/shared';
|
|
3
3
|
import { AddonCountryEntity } from '../../../catalog/addon/country.entity';
|
|
4
|
-
import { CompanyBillItemEntity } from '../finances/billing/item.entity';
|
|
5
4
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
6
5
|
import { CompanyEntity } from '../company.entity';
|
|
6
|
+
import { CompanyBillItemEntity } from '../finances/billing/item.entity';
|
|
7
7
|
export declare class CompanyAddonEntity extends TrackableEntity<Addon> {
|
|
8
8
|
/**
|
|
9
9
|
* Driveup addon
|
|
@@ -10,15 +10,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyAddonEntity = void 0;
|
|
13
|
-
const typeorm_1 = require("typeorm");
|
|
14
|
-
const shared_1 = require("@driveup/shared");
|
|
15
13
|
const common_1 = require("@driveup/common");
|
|
16
|
-
const
|
|
14
|
+
const shared_1 = require("@driveup/shared");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
17
16
|
const country_entity_1 = require("../../../catalog/addon/country.entity");
|
|
18
|
-
const
|
|
19
|
-
const trackable_1 = require("../../../utils/trackable");
|
|
17
|
+
const staff_entity_1 = require("../../../system/staff/staff.entity");
|
|
20
18
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
19
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
21
20
|
const company_entity_1 = require("../company.entity");
|
|
21
|
+
const item_entity_1 = require("../finances/billing/item.entity");
|
|
22
22
|
let CompanyAddonEntity = class CompanyAddonEntity extends trackable_1.TrackableEntity {
|
|
23
23
|
constructor(props) {
|
|
24
24
|
super();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addon.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/addon.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"addon.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/addon.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Language } from '@driveup/shared';
|
|
2
1
|
import { Activity, PricePlan } from '@driveup/common';
|
|
3
|
-
import {
|
|
2
|
+
import { Language, PricePlanType } from '@driveup/shared';
|
|
4
3
|
import { ProductPricePlanEntity } from '../../../catalog/product/priceplan.entity';
|
|
5
|
-
import { CompanyPaymentMethodEntity } from '../finances/payment/method.entity';
|
|
6
4
|
import { TrackableEntity } from '../../../utils/trackable';
|
|
5
|
+
import { CompanyPaymentMethodEntity } from '../finances/payment/method.entity';
|
|
6
|
+
import { CompanyProductEntity } from './product.entity';
|
|
7
7
|
export declare class CompanyProductPricePlanEntity extends TrackableEntity<PricePlan> {
|
|
8
8
|
/**
|
|
9
9
|
* Company product
|
|
@@ -58,5 +58,6 @@ export declare class CompanyProductPricePlanEntity extends TrackableEntity<Price
|
|
|
58
58
|
toModel(lang?: Language): Promise<PricePlan>;
|
|
59
59
|
toSummary(): Promise<PricePlan>;
|
|
60
60
|
buildFeatureUsages(usageMetadata: Record<string, any>): Promise<import("@driveup/common").Item<any>[]>;
|
|
61
|
+
getProductType(): Promise<PricePlanType>;
|
|
61
62
|
getActivities(): Promise<Activity[]>;
|
|
62
63
|
}
|
|
@@ -10,13 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CompanyProductPricePlanEntity = void 0;
|
|
13
|
-
const typeorm_1 = require("typeorm");
|
|
14
13
|
const shared_1 = require("@driveup/shared");
|
|
15
|
-
const
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
16
15
|
const priceplan_entity_1 = require("../../../catalog/product/priceplan.entity");
|
|
17
|
-
const method_entity_1 = require("../finances/payment/method.entity");
|
|
18
|
-
const trackable_1 = require("../../../utils/trackable");
|
|
19
16
|
const activity_helper_1 = require("../../../utils/activity.helper");
|
|
17
|
+
const trackable_1 = require("../../../utils/trackable");
|
|
18
|
+
const method_entity_1 = require("../finances/payment/method.entity");
|
|
19
|
+
const product_entity_1 = require("./product.entity");
|
|
20
20
|
let CompanyProductPricePlanEntity = class CompanyProductPricePlanEntity extends trackable_1.TrackableEntity {
|
|
21
21
|
constructor(props) {
|
|
22
22
|
super();
|
|
@@ -40,6 +40,11 @@ let CompanyProductPricePlanEntity = class CompanyProductPricePlanEntity extends
|
|
|
40
40
|
const driveupPricePlan = await countryPricePlan.pricePlan;
|
|
41
41
|
return driveupPricePlan.getFeatureUsages(usageMetadata);
|
|
42
42
|
}
|
|
43
|
+
async getProductType() {
|
|
44
|
+
const productPricePlan = await this.pricePlan;
|
|
45
|
+
const systemPricePlan = await productPricePlan.pricePlan;
|
|
46
|
+
return systemPricePlan.type;
|
|
47
|
+
}
|
|
43
48
|
async getActivities() {
|
|
44
49
|
const activities = [];
|
|
45
50
|
activities.push(await (0, activity_helper_1.toActivity)(this.createdBy, this.createdOn, shared_1.ActivityType.created));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priceplan.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/priceplan.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"priceplan.entity.js","sourceRoot":"","sources":["../../../../src/profile/company/product/priceplan.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { ProductStatus, CatalogType, ProductType } from '@driveup/shared';
|
|
2
1
|
import { Activity, Product } from '@driveup/common';
|
|
3
|
-
import {
|
|
2
|
+
import { CatalogType, ProductStatus, ProductType } from '@driveup/shared';
|
|
4
3
|
import { CountryProductEntity } from '../../../catalog/product/country.entity';
|
|
5
|
-
import {
|
|
4
|
+
import { TrackableEntity } from '../../../utils/trackable';
|
|
5
|
+
import { CompanyEntity } from '../company.entity';
|
|
6
6
|
import { CompanyCourseEntity } from '../course/course.entity';
|
|
7
|
-
import { CompanyProductVehicleEntity } from './vehicle.entity';
|
|
8
7
|
import { CompanyMedicalProductEntity } from '../medical/product.entity';
|
|
9
8
|
import { CompanyAddonEntity } from './addon.entity';
|
|
10
|
-
import {
|
|
9
|
+
import { CompanyProductPricePlanEntity } from './priceplan.entity';
|
|
10
|
+
import { CompanyProductVehicleEntity } from './vehicle.entity';
|
|
11
11
|
export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
12
12
|
/**
|
|
13
13
|
* Reference to the company that owns this product
|
|
@@ -134,7 +134,7 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
134
134
|
* All product price plans
|
|
135
135
|
* The company can switch any time between different price plans
|
|
136
136
|
*/
|
|
137
|
-
pricePlans: Promise<CompanyProductPricePlanEntity>;
|
|
137
|
+
pricePlans: Promise<CompanyProductPricePlanEntity[]>;
|
|
138
138
|
/**
|
|
139
139
|
* Current price plan
|
|
140
140
|
* The active price plan for the company product
|
|
@@ -173,12 +173,13 @@ export declare class CompanyProductEntity extends TrackableEntity<Product> {
|
|
|
173
173
|
vehicles: Promise<CompanyProductVehicleEntity[]>;
|
|
174
174
|
constructor(props?: Partial<CompanyProductEntity>);
|
|
175
175
|
isMedical: () => boolean;
|
|
176
|
-
|
|
176
|
+
isPreparation: () => boolean;
|
|
177
177
|
isDriving: () => boolean;
|
|
178
178
|
isCompletion: () => boolean;
|
|
179
179
|
toModel(): Promise<Product>;
|
|
180
180
|
toSummary(): Promise<Product>;
|
|
181
181
|
getVehicles(): Promise<import("@driveup/common").Vehicle[]>;
|
|
182
182
|
canPurchase(): boolean;
|
|
183
|
+
getUpcomingPricePlan(): Promise<CompanyProductPricePlanEntity>;
|
|
183
184
|
getActivities(): Promise<Activity[]>;
|
|
184
185
|
}
|