@platform-modules/civil-aviation-authority 2.2.204 → 2.2.205
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/.env +5 -17
- package/dist/models/AirportEntryPermitApprovalModel.d.ts +3 -1
- package/dist/models/AirportEntryPermitApprovalModel.js +12 -2
- package/dist/models/AirportEntryPermitWorkflowModel.d.ts +5 -1
- package/dist/models/AirportEntryPermitWorkflowModel.js +22 -2
- package/dist/models/HotelApprovalModel.d.ts +2 -1
- package/dist/models/HotelApprovalModel.js +7 -2
- package/dist/models/HotelreservationModal.d.ts +30 -0
- package/dist/models/HotelreservationModal.js +119 -0
- package/package.json +1 -1
- package/src/models/AirportEntryPermitApprovalModel.ts +11 -1
- package/src/models/AirportEntryPermitWorkflowModel.ts +21 -1
- package/src/models/HotelApprovalModel.ts +6 -1
package/.env
CHANGED
|
@@ -1,17 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
DB_HOST=164.52.222.169
|
|
8
|
-
DB_PORT=5432
|
|
9
|
-
DB_USER=postgres_admin_user
|
|
10
|
-
DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
|
|
11
|
-
DB_NAME=CAA
|
|
12
|
-
|
|
13
|
-
# DB_HOST=216.48.187.46
|
|
14
|
-
# DB_PORT=5432
|
|
15
|
-
# DB_USER=adminuser
|
|
16
|
-
# DB_PASS=postgres_caa_fm_qa_34567
|
|
17
|
-
# DB_NAME=CAA_QA
|
|
1
|
+
DB_HOST=localhost
|
|
2
|
+
DB_PORT=5433
|
|
3
|
+
DB_USER=postgres
|
|
4
|
+
DB_PASS=123
|
|
5
|
+
DB_NAME=CAA
|
|
@@ -19,5 +19,7 @@ export declare class AirportEntryPermitApproval extends BaseModel {
|
|
|
19
19
|
approved_by: number | null;
|
|
20
20
|
comment: string;
|
|
21
21
|
approval_status: AirportEntryPermitApprovalStatus;
|
|
22
|
-
|
|
22
|
+
is_manager: boolean;
|
|
23
|
+
is_allowed: boolean;
|
|
24
|
+
constructor(request_id: number, approver_role_id: number, comment: string, approval_status: AirportEntryPermitApprovalStatus, level: number, is_manager?: boolean, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number, is_allowed?: boolean);
|
|
23
25
|
}
|
|
@@ -21,7 +21,7 @@ var AirportEntryPermitApprovalStatus;
|
|
|
21
21
|
AirportEntryPermitApprovalStatus["RFC"] = "Request For Change";
|
|
22
22
|
})(AirportEntryPermitApprovalStatus || (exports.AirportEntryPermitApprovalStatus = AirportEntryPermitApprovalStatus = {}));
|
|
23
23
|
let AirportEntryPermitApproval = class AirportEntryPermitApproval extends BaseModel_1.BaseModel {
|
|
24
|
-
constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id) {
|
|
24
|
+
constructor(request_id, approver_role_id, comment, approval_status, level, is_manager = false, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
|
|
25
25
|
super();
|
|
26
26
|
this.request_id = request_id;
|
|
27
27
|
this.service_id = service_id || null;
|
|
@@ -30,11 +30,13 @@ let AirportEntryPermitApproval = class AirportEntryPermitApproval extends BaseMo
|
|
|
30
30
|
this.comment = comment;
|
|
31
31
|
this.approval_status = approval_status;
|
|
32
32
|
this.level = level;
|
|
33
|
+
this.is_manager = is_manager;
|
|
33
34
|
this.department_id = department_id || null;
|
|
34
35
|
this.section_id = section_id || null;
|
|
35
36
|
this.approver_user_id = approver_user_id || null;
|
|
36
37
|
this.delegate_user_id = delegate_user_id || null;
|
|
37
38
|
this.approved_by = approved_by || null;
|
|
39
|
+
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
38
40
|
}
|
|
39
41
|
};
|
|
40
42
|
exports.AirportEntryPermitApproval = AirportEntryPermitApproval;
|
|
@@ -86,7 +88,15 @@ __decorate([
|
|
|
86
88
|
(0, typeorm_1.Column)({ type: 'enum', enum: AirportEntryPermitApprovalStatus, default: AirportEntryPermitApprovalStatus.PENDING, nullable: false }),
|
|
87
89
|
__metadata("design:type", String)
|
|
88
90
|
], AirportEntryPermitApproval.prototype, "approval_status", void 0);
|
|
91
|
+
__decorate([
|
|
92
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
|
|
93
|
+
__metadata("design:type", Boolean)
|
|
94
|
+
], AirportEntryPermitApproval.prototype, "is_manager", void 0);
|
|
95
|
+
__decorate([
|
|
96
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
|
|
97
|
+
__metadata("design:type", Boolean)
|
|
98
|
+
], AirportEntryPermitApproval.prototype, "is_allowed", void 0);
|
|
89
99
|
exports.AirportEntryPermitApproval = AirportEntryPermitApproval = __decorate([
|
|
90
100
|
(0, typeorm_1.Entity)({ name: 'airport_entry_permit_approvals' }),
|
|
91
|
-
__metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
|
|
101
|
+
__metadata("design:paramtypes", [Number, Number, String, String, Number, Boolean, Object, Object, Object, Object, Object, Number, Number, Boolean])
|
|
92
102
|
], AirportEntryPermitApproval);
|
|
@@ -10,5 +10,9 @@ export declare class AirportEntryPermitWorkFlow extends BaseModel {
|
|
|
10
10
|
sub_service_id: number | null;
|
|
11
11
|
content: string;
|
|
12
12
|
status: AirportEntryPermitWorkFlowStatus;
|
|
13
|
-
|
|
13
|
+
user_id: number | null;
|
|
14
|
+
role_id: number | null;
|
|
15
|
+
department_id: number | null;
|
|
16
|
+
section_id: number | null;
|
|
17
|
+
constructor(request_id: number, content: string, status: AirportEntryPermitWorkFlowStatus, service_id?: number, sub_service_id?: number, user_id?: number, role_id?: number, department_id?: number, section_id?: number);
|
|
14
18
|
}
|
|
@@ -19,13 +19,17 @@ var AirportEntryPermitWorkFlowStatus;
|
|
|
19
19
|
AirportEntryPermitWorkFlowStatus["PENDING"] = "Pending";
|
|
20
20
|
})(AirportEntryPermitWorkFlowStatus || (exports.AirportEntryPermitWorkFlowStatus = AirportEntryPermitWorkFlowStatus = {}));
|
|
21
21
|
let AirportEntryPermitWorkFlow = class AirportEntryPermitWorkFlow extends BaseModel_1.BaseModel {
|
|
22
|
-
constructor(request_id, content, status, service_id, sub_service_id) {
|
|
22
|
+
constructor(request_id, content, status, service_id, sub_service_id, user_id, role_id, department_id, section_id) {
|
|
23
23
|
super();
|
|
24
24
|
this.request_id = request_id;
|
|
25
25
|
this.service_id = service_id || null;
|
|
26
26
|
this.sub_service_id = sub_service_id || null;
|
|
27
27
|
this.content = content;
|
|
28
28
|
this.status = status;
|
|
29
|
+
this.user_id = user_id || null;
|
|
30
|
+
this.role_id = role_id || null;
|
|
31
|
+
this.department_id = department_id || null;
|
|
32
|
+
this.section_id = section_id || null;
|
|
29
33
|
}
|
|
30
34
|
};
|
|
31
35
|
exports.AirportEntryPermitWorkFlow = AirportEntryPermitWorkFlow;
|
|
@@ -49,7 +53,23 @@ __decorate([
|
|
|
49
53
|
(0, typeorm_1.Column)({ type: 'enum', enum: AirportEntryPermitWorkFlowStatus, default: AirportEntryPermitWorkFlowStatus.NOT_YET_STARTED, nullable: false }),
|
|
50
54
|
__metadata("design:type", String)
|
|
51
55
|
], AirportEntryPermitWorkFlow.prototype, "status", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, typeorm_1.Column)({ type: 'integer', nullable: true }),
|
|
58
|
+
__metadata("design:type", Object)
|
|
59
|
+
], AirportEntryPermitWorkFlow.prototype, "user_id", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, typeorm_1.Column)({ type: 'integer', nullable: true }),
|
|
62
|
+
__metadata("design:type", Object)
|
|
63
|
+
], AirportEntryPermitWorkFlow.prototype, "role_id", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, typeorm_1.Column)({ type: 'integer', nullable: true }),
|
|
66
|
+
__metadata("design:type", Object)
|
|
67
|
+
], AirportEntryPermitWorkFlow.prototype, "department_id", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({ type: 'integer', nullable: true }),
|
|
70
|
+
__metadata("design:type", Object)
|
|
71
|
+
], AirportEntryPermitWorkFlow.prototype, "section_id", void 0);
|
|
52
72
|
exports.AirportEntryPermitWorkFlow = AirportEntryPermitWorkFlow = __decorate([
|
|
53
73
|
(0, typeorm_1.Entity)({ name: 'airport_entry_permit_workflows' }),
|
|
54
|
-
__metadata("design:paramtypes", [Number, String, String, Number, Number])
|
|
74
|
+
__metadata("design:paramtypes", [Number, String, String, Number, Number, Number, Number, Number, Number])
|
|
55
75
|
], AirportEntryPermitWorkFlow);
|
|
@@ -18,5 +18,6 @@ export declare class HotelApprovalDetails extends BaseModel {
|
|
|
18
18
|
approved_by: number | null;
|
|
19
19
|
comment: string;
|
|
20
20
|
approval_status: HotelApprovalStatus;
|
|
21
|
-
|
|
21
|
+
is_allowed: boolean;
|
|
22
|
+
constructor(request_id: number, approver_role_id: number, comment: string, approval_status: HotelApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number, is_allowed?: boolean);
|
|
22
23
|
}
|
|
@@ -20,7 +20,7 @@ var HotelApprovalStatus;
|
|
|
20
20
|
HotelApprovalStatus["REJECTED"] = "Rejected";
|
|
21
21
|
})(HotelApprovalStatus || (exports.HotelApprovalStatus = HotelApprovalStatus = {}));
|
|
22
22
|
let HotelApprovalDetails = class HotelApprovalDetails extends BaseModel_1.BaseModel {
|
|
23
|
-
constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id) {
|
|
23
|
+
constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
|
|
24
24
|
super();
|
|
25
25
|
this.request_id = request_id;
|
|
26
26
|
this.service_id = service_id || null;
|
|
@@ -34,6 +34,7 @@ let HotelApprovalDetails = class HotelApprovalDetails extends BaseModel_1.BaseMo
|
|
|
34
34
|
this.approver_user_id = approver_user_id || null;
|
|
35
35
|
this.delegate_user_id = delegate_user_id || null;
|
|
36
36
|
this.approved_by = approved_by || null;
|
|
37
|
+
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
37
38
|
}
|
|
38
39
|
};
|
|
39
40
|
exports.HotelApprovalDetails = HotelApprovalDetails;
|
|
@@ -85,7 +86,11 @@ __decorate([
|
|
|
85
86
|
(0, typeorm_1.Column)({ type: 'enum', enum: HotelApprovalStatus, default: HotelApprovalStatus.PENDING, nullable: false }),
|
|
86
87
|
__metadata("design:type", String)
|
|
87
88
|
], HotelApprovalDetails.prototype, "approval_status", void 0);
|
|
89
|
+
__decorate([
|
|
90
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
|
|
91
|
+
__metadata("design:type", Boolean)
|
|
92
|
+
], HotelApprovalDetails.prototype, "is_allowed", void 0);
|
|
88
93
|
exports.HotelApprovalDetails = HotelApprovalDetails = __decorate([
|
|
89
94
|
(0, typeorm_1.Entity)({ name: 'hotelapprovals' }),
|
|
90
|
-
__metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number])
|
|
95
|
+
__metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number, Boolean])
|
|
91
96
|
], HotelApprovalDetails);
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { BaseModel } from './BaseModel';
|
|
2
|
+
export declare enum MealType {
|
|
3
|
+
BREAKFAST = "Breakfast",
|
|
4
|
+
LUNCH = "Lunch",
|
|
5
|
+
DINNER = "Dinner"
|
|
6
|
+
}
|
|
7
|
+
export declare enum ServiceTypes {
|
|
8
|
+
LAUNDRY = "Laundry",
|
|
9
|
+
TELEPHONE = "Telephone Service"
|
|
10
|
+
}
|
|
11
|
+
export declare class HotelReservation extends BaseModel {
|
|
12
|
+
type_of_accommodation: string;
|
|
13
|
+
price: number;
|
|
14
|
+
meal: MealType;
|
|
15
|
+
service: ServiceTypes;
|
|
16
|
+
date_of_request: Date;
|
|
17
|
+
hotel_name: string;
|
|
18
|
+
check_in_date: Date;
|
|
19
|
+
check_in_time: string;
|
|
20
|
+
check_out_date: Date;
|
|
21
|
+
check_out_time: string;
|
|
22
|
+
number_of_guests: number;
|
|
23
|
+
description: string;
|
|
24
|
+
attachment_url: string;
|
|
25
|
+
requested_by: string;
|
|
26
|
+
visitor_name: string;
|
|
27
|
+
hr_approval: boolean;
|
|
28
|
+
pr_approval: boolean;
|
|
29
|
+
constructor(type_of_accommodation: string, price: number, meal: MealType, service: ServiceTypes, date_of_request: Date, hotel_name: string, check_in_date: Date, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string, hr_approval: boolean, pr_approval: boolean);
|
|
30
|
+
}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.HotelReservation = exports.ServiceTypes = exports.MealType = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const BaseModel_1 = require("./BaseModel");
|
|
15
|
+
var MealType;
|
|
16
|
+
(function (MealType) {
|
|
17
|
+
MealType["BREAKFAST"] = "Breakfast";
|
|
18
|
+
MealType["LUNCH"] = "Lunch";
|
|
19
|
+
MealType["DINNER"] = "Dinner";
|
|
20
|
+
})(MealType || (exports.MealType = MealType = {}));
|
|
21
|
+
var ServiceTypes;
|
|
22
|
+
(function (ServiceTypes) {
|
|
23
|
+
ServiceTypes["LAUNDRY"] = "Laundry";
|
|
24
|
+
ServiceTypes["TELEPHONE"] = "Telephone Service";
|
|
25
|
+
})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
|
|
26
|
+
let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
|
|
27
|
+
constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, hr_approval, pr_approval) {
|
|
28
|
+
super();
|
|
29
|
+
this.type_of_accommodation = type_of_accommodation;
|
|
30
|
+
this.price = price;
|
|
31
|
+
this.meal = meal;
|
|
32
|
+
this.service = service;
|
|
33
|
+
this.date_of_request = date_of_request;
|
|
34
|
+
this.hotel_name = hotel_name;
|
|
35
|
+
this.check_in_date = check_in_date;
|
|
36
|
+
this.check_in_time = check_in_time;
|
|
37
|
+
this.check_out_date = check_out_date;
|
|
38
|
+
this.check_out_time = check_out_time;
|
|
39
|
+
this.number_of_guests = number_of_guests;
|
|
40
|
+
this.description = description;
|
|
41
|
+
this.requested_by = requested_by;
|
|
42
|
+
this.visitor_name = visitor_name;
|
|
43
|
+
this.hr_approval = hr_approval;
|
|
44
|
+
this.pr_approval = pr_approval;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
exports.HotelReservation = HotelReservation;
|
|
48
|
+
__decorate([
|
|
49
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
|
|
50
|
+
__metadata("design:type", String)
|
|
51
|
+
], HotelReservation.prototype, "type_of_accommodation", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
|
|
54
|
+
__metadata("design:type", Number)
|
|
55
|
+
], HotelReservation.prototype, "price", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
|
|
58
|
+
__metadata("design:type", String)
|
|
59
|
+
], HotelReservation.prototype, "meal", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
|
|
62
|
+
__metadata("design:type", String)
|
|
63
|
+
], HotelReservation.prototype, "service", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
|
|
66
|
+
__metadata("design:type", Date)
|
|
67
|
+
], HotelReservation.prototype, "date_of_request", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
|
|
70
|
+
__metadata("design:type", String)
|
|
71
|
+
], HotelReservation.prototype, "hotel_name", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, typeorm_1.Column)({ type: 'date', nullable: false }),
|
|
74
|
+
__metadata("design:type", Date)
|
|
75
|
+
], HotelReservation.prototype, "check_in_date", void 0);
|
|
76
|
+
__decorate([
|
|
77
|
+
(0, typeorm_1.Column)({ type: 'time', nullable: false }),
|
|
78
|
+
__metadata("design:type", String)
|
|
79
|
+
], HotelReservation.prototype, "check_in_time", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, typeorm_1.Column)({ type: 'date', nullable: false }),
|
|
82
|
+
__metadata("design:type", Date)
|
|
83
|
+
], HotelReservation.prototype, "check_out_date", void 0);
|
|
84
|
+
__decorate([
|
|
85
|
+
(0, typeorm_1.Column)({ type: 'time', nullable: false }),
|
|
86
|
+
__metadata("design:type", String)
|
|
87
|
+
], HotelReservation.prototype, "check_out_time", void 0);
|
|
88
|
+
__decorate([
|
|
89
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
90
|
+
__metadata("design:type", Number)
|
|
91
|
+
], HotelReservation.prototype, "number_of_guests", void 0);
|
|
92
|
+
__decorate([
|
|
93
|
+
(0, typeorm_1.Column)({ type: 'text', nullable: true }),
|
|
94
|
+
__metadata("design:type", String)
|
|
95
|
+
], HotelReservation.prototype, "description", void 0);
|
|
96
|
+
__decorate([
|
|
97
|
+
(0, typeorm_1.Column)({ type: 'text', nullable: false }),
|
|
98
|
+
__metadata("design:type", String)
|
|
99
|
+
], HotelReservation.prototype, "attachment_url", void 0);
|
|
100
|
+
__decorate([
|
|
101
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
|
|
102
|
+
__metadata("design:type", String)
|
|
103
|
+
], HotelReservation.prototype, "requested_by", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
|
|
106
|
+
__metadata("design:type", String)
|
|
107
|
+
], HotelReservation.prototype, "visitor_name", void 0);
|
|
108
|
+
__decorate([
|
|
109
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: false }),
|
|
110
|
+
__metadata("design:type", Boolean)
|
|
111
|
+
], HotelReservation.prototype, "hr_approval", void 0);
|
|
112
|
+
__decorate([
|
|
113
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: false }),
|
|
114
|
+
__metadata("design:type", Boolean)
|
|
115
|
+
], HotelReservation.prototype, "pr_approval", void 0);
|
|
116
|
+
exports.HotelReservation = HotelReservation = __decorate([
|
|
117
|
+
(0, typeorm_1.Entity)({ name: 'hotel_reservations' }),
|
|
118
|
+
__metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Boolean, Boolean])
|
|
119
|
+
], HotelReservation);
|
package/package.json
CHANGED
|
@@ -47,19 +47,27 @@ export class AirportEntryPermitApproval extends BaseModel {
|
|
|
47
47
|
@Column({ type: 'enum', enum: AirportEntryPermitApprovalStatus, default: AirportEntryPermitApprovalStatus.PENDING, nullable: false })
|
|
48
48
|
approval_status: AirportEntryPermitApprovalStatus;
|
|
49
49
|
|
|
50
|
+
@Column({ type: 'boolean', default: false, nullable: false })
|
|
51
|
+
is_manager: boolean;
|
|
52
|
+
|
|
53
|
+
@Column({ type: 'boolean', default: true, nullable: false })
|
|
54
|
+
is_allowed: boolean;
|
|
55
|
+
|
|
50
56
|
constructor(
|
|
51
57
|
request_id: number,
|
|
52
58
|
approver_role_id: number,
|
|
53
59
|
comment: string,
|
|
54
60
|
approval_status: AirportEntryPermitApprovalStatus,
|
|
55
61
|
level: number,
|
|
62
|
+
is_manager: boolean = false,
|
|
56
63
|
department_id?: number | null,
|
|
57
64
|
section_id?: number | null,
|
|
58
65
|
approver_user_id?: number | null,
|
|
59
66
|
delegate_user_id?: number | null,
|
|
60
67
|
approved_by?: number | null,
|
|
61
68
|
service_id?: number,
|
|
62
|
-
sub_service_id?: number
|
|
69
|
+
sub_service_id?: number,
|
|
70
|
+
is_allowed?: boolean
|
|
63
71
|
) {
|
|
64
72
|
super();
|
|
65
73
|
this.request_id = request_id;
|
|
@@ -69,11 +77,13 @@ export class AirportEntryPermitApproval extends BaseModel {
|
|
|
69
77
|
this.comment = comment;
|
|
70
78
|
this.approval_status = approval_status;
|
|
71
79
|
this.level = level;
|
|
80
|
+
this.is_manager = is_manager;
|
|
72
81
|
this.department_id = department_id || null;
|
|
73
82
|
this.section_id = section_id || null;
|
|
74
83
|
this.approver_user_id = approver_user_id || null;
|
|
75
84
|
this.delegate_user_id = delegate_user_id || null;
|
|
76
85
|
this.approved_by = approved_by || null;
|
|
86
|
+
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
77
87
|
}
|
|
78
88
|
}
|
|
79
89
|
|
|
@@ -24,12 +24,28 @@ export class AirportEntryPermitWorkFlow extends BaseModel {
|
|
|
24
24
|
@Column({ type: 'enum', enum: AirportEntryPermitWorkFlowStatus, default: AirportEntryPermitWorkFlowStatus.NOT_YET_STARTED, nullable: false })
|
|
25
25
|
status: AirportEntryPermitWorkFlowStatus;
|
|
26
26
|
|
|
27
|
+
@Column({ type: 'integer', nullable: true })
|
|
28
|
+
user_id: number | null;
|
|
29
|
+
|
|
30
|
+
@Column({ type: 'integer', nullable: true })
|
|
31
|
+
role_id: number | null;
|
|
32
|
+
|
|
33
|
+
@Column({ type: 'integer', nullable: true })
|
|
34
|
+
department_id: number | null;
|
|
35
|
+
|
|
36
|
+
@Column({ type: 'integer', nullable: true })
|
|
37
|
+
section_id: number | null;
|
|
38
|
+
|
|
27
39
|
constructor(
|
|
28
40
|
request_id: number,
|
|
29
41
|
content: string,
|
|
30
42
|
status: AirportEntryPermitWorkFlowStatus,
|
|
31
43
|
service_id?: number,
|
|
32
|
-
sub_service_id?: number
|
|
44
|
+
sub_service_id?: number,
|
|
45
|
+
user_id?: number,
|
|
46
|
+
role_id?: number,
|
|
47
|
+
department_id?: number,
|
|
48
|
+
section_id?: number
|
|
33
49
|
) {
|
|
34
50
|
super();
|
|
35
51
|
this.request_id = request_id;
|
|
@@ -37,6 +53,10 @@ export class AirportEntryPermitWorkFlow extends BaseModel {
|
|
|
37
53
|
this.sub_service_id = sub_service_id || null;
|
|
38
54
|
this.content = content;
|
|
39
55
|
this.status = status;
|
|
56
|
+
this.user_id = user_id || null;
|
|
57
|
+
this.role_id = role_id || null;
|
|
58
|
+
this.department_id = department_id || null;
|
|
59
|
+
this.section_id = section_id || null;
|
|
40
60
|
}
|
|
41
61
|
}
|
|
42
62
|
|
|
@@ -48,6 +48,9 @@ export class HotelApprovalDetails extends BaseModel {
|
|
|
48
48
|
@Column({ type: 'enum', enum: HotelApprovalStatus,default: HotelApprovalStatus.PENDING, nullable: false })
|
|
49
49
|
approval_status: HotelApprovalStatus;
|
|
50
50
|
|
|
51
|
+
@Column({ type: 'boolean', default: true, nullable: false })
|
|
52
|
+
is_allowed: boolean;
|
|
53
|
+
|
|
51
54
|
constructor(
|
|
52
55
|
request_id: number,
|
|
53
56
|
approver_role_id: number,
|
|
@@ -60,7 +63,8 @@ export class HotelApprovalDetails extends BaseModel {
|
|
|
60
63
|
delegate_user_id?: number | null,
|
|
61
64
|
approved_by?: number | null,
|
|
62
65
|
service_id?: number,
|
|
63
|
-
sub_service_id?: number
|
|
66
|
+
sub_service_id?: number,
|
|
67
|
+
is_allowed?: boolean
|
|
64
68
|
) {
|
|
65
69
|
super();
|
|
66
70
|
this.request_id = request_id;
|
|
@@ -75,5 +79,6 @@ export class HotelApprovalDetails extends BaseModel {
|
|
|
75
79
|
this.approver_user_id = approver_user_id || null;
|
|
76
80
|
this.delegate_user_id = delegate_user_id || null;
|
|
77
81
|
this.approved_by = approved_by || null;
|
|
82
|
+
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
78
83
|
}
|
|
79
84
|
}
|