@platform-modules/civil-aviation-authority 2.2.323 → 2.2.325
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/dist/models/HrServiceApprovalModel.d.ts +2 -1
- package/dist/models/HrServiceApprovalModel.js +7 -2
- package/dist/models/SecondmentRequestModel.d.ts +3 -3
- package/dist/models/SecondmentRequestModel.js +10 -10
- package/package.json +1 -1
- package/src/models/HrServiceApprovalModel.ts +5 -0
- package/src/models/SecondmentRequestModel.ts +8 -8
|
@@ -21,6 +21,7 @@ export declare class HrServiceApprovalDetails extends BaseModel {
|
|
|
21
21
|
approval_status: HrServiceApprovalStatus;
|
|
22
22
|
is_manager: boolean;
|
|
23
23
|
is_president: boolean;
|
|
24
|
+
is_replace: boolean;
|
|
24
25
|
is_allowed: boolean;
|
|
25
|
-
constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: HrServiceApprovalStatus, level: number, service_id?: number | null, sub_service_id?: number | null, department_id?: number | null, section_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, is_manager?: boolean, is_president?: boolean, is_allowed?: boolean);
|
|
26
|
+
constructor(request_id: number, approver_user_id: number | null, approver_role_id: number | null, comment: string, approval_status: HrServiceApprovalStatus, level: number, service_id?: number | null, sub_service_id?: number | null, department_id?: number | null, section_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, is_manager?: boolean, is_president?: boolean, is_replace?: boolean, is_allowed?: boolean);
|
|
26
27
|
}
|
|
@@ -21,7 +21,7 @@ var HrServiceApprovalStatus;
|
|
|
21
21
|
HrServiceApprovalStatus["ASSIGNED"] = "Assigned";
|
|
22
22
|
})(HrServiceApprovalStatus || (exports.HrServiceApprovalStatus = HrServiceApprovalStatus = {}));
|
|
23
23
|
let HrServiceApprovalDetails = class HrServiceApprovalDetails extends BaseModel_1.BaseModel {
|
|
24
|
-
constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, service_id, sub_service_id, department_id, section_id, delegate_user_id, approved_by, is_manager, is_president, is_allowed) {
|
|
24
|
+
constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level, service_id, sub_service_id, department_id, section_id, delegate_user_id, approved_by, is_manager, is_president, is_replace, is_allowed) {
|
|
25
25
|
super();
|
|
26
26
|
this.request_id = request_id;
|
|
27
27
|
this.service_id = service_id || null;
|
|
@@ -37,6 +37,7 @@ let HrServiceApprovalDetails = class HrServiceApprovalDetails extends BaseModel_
|
|
|
37
37
|
this.approved_by = approved_by || null;
|
|
38
38
|
this.is_manager = is_manager ?? false;
|
|
39
39
|
this.is_president = is_president ?? false;
|
|
40
|
+
this.is_replace = is_replace ?? false;
|
|
40
41
|
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
41
42
|
}
|
|
42
43
|
};
|
|
@@ -102,11 +103,15 @@ __decorate([
|
|
|
102
103
|
(0, typeorm_1.Column)({ type: "boolean", default: false, nullable: true }),
|
|
103
104
|
__metadata("design:type", Boolean)
|
|
104
105
|
], HrServiceApprovalDetails.prototype, "is_president", void 0);
|
|
106
|
+
__decorate([
|
|
107
|
+
(0, typeorm_1.Column)({ type: "boolean", default: false, nullable: true }),
|
|
108
|
+
__metadata("design:type", Boolean)
|
|
109
|
+
], HrServiceApprovalDetails.prototype, "is_replace", void 0);
|
|
105
110
|
__decorate([
|
|
106
111
|
(0, typeorm_1.Column)({ type: "boolean", default: true, nullable: false }),
|
|
107
112
|
__metadata("design:type", Boolean)
|
|
108
113
|
], HrServiceApprovalDetails.prototype, "is_allowed", void 0);
|
|
109
114
|
exports.HrServiceApprovalDetails = HrServiceApprovalDetails = __decorate([
|
|
110
115
|
(0, typeorm_1.Entity)({ name: "hr_service_approvals" }),
|
|
111
|
-
__metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Object, Object, Object, Boolean, Boolean, Boolean])
|
|
116
|
+
__metadata("design:paramtypes", [Number, Object, Object, String, String, Number, Object, Object, Object, Object, Object, Object, Boolean, Boolean, Boolean, Boolean])
|
|
112
117
|
], HrServiceApprovalDetails);
|
|
@@ -23,8 +23,8 @@ export declare class SecondmentRequest extends BaseModel {
|
|
|
23
23
|
assigned_employee_name: string;
|
|
24
24
|
civil_id_card_number: string | null;
|
|
25
25
|
employee_id: string;
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
original_department_id: number;
|
|
27
|
+
assigned_department_id: number;
|
|
28
28
|
start_date: Date;
|
|
29
29
|
end_date: Date;
|
|
30
30
|
phone_number: string;
|
|
@@ -36,5 +36,5 @@ export declare class SecondmentRequest extends BaseModel {
|
|
|
36
36
|
replacement_reason: string | null;
|
|
37
37
|
replaced_by_user_id: number | null;
|
|
38
38
|
replaced_at: Date | null;
|
|
39
|
-
constructor(user_id: number, status?: SecondmentRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, assigned_employee_name?: string, civil_id_card_number?: string | null, employee_id?: string,
|
|
39
|
+
constructor(user_id: number, status?: SecondmentRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, assigned_employee_name?: string, civil_id_card_number?: string | null, employee_id?: string, original_department_id?: number, assigned_department_id?: number, start_date?: Date, end_date?: Date, phone_number?: string, reason_for_request?: string, is_replaced?: boolean, replacement_employee_name?: string | null, replacement_employee_id?: string | null, replacement_civil_id_card_number?: string | null, replacement_reason?: string | null, replaced_by_user_id?: number | null, replaced_at?: Date | null);
|
|
40
40
|
}
|
|
@@ -22,7 +22,7 @@ var SecondmentRequestStatus;
|
|
|
22
22
|
SecondmentRequestStatus["REJECTED"] = "Rejected";
|
|
23
23
|
})(SecondmentRequestStatus || (exports.SecondmentRequestStatus = SecondmentRequestStatus = {}));
|
|
24
24
|
let SecondmentRequest = class SecondmentRequest extends BaseModel_1.BaseModel {
|
|
25
|
-
constructor(user_id, status = SecondmentRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, assigned_employee_name, civil_id_card_number, employee_id,
|
|
25
|
+
constructor(user_id, status = SecondmentRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, assigned_employee_name, civil_id_card_number, employee_id, original_department_id, assigned_department_id, start_date, end_date, phone_number, reason_for_request, is_replaced, replacement_employee_name, replacement_employee_id, replacement_civil_id_card_number, replacement_reason, replaced_by_user_id, replaced_at) {
|
|
26
26
|
super();
|
|
27
27
|
this.user_id = user_id;
|
|
28
28
|
this.status = status;
|
|
@@ -39,8 +39,8 @@ let SecondmentRequest = class SecondmentRequest extends BaseModel_1.BaseModel {
|
|
|
39
39
|
this.assigned_employee_name = assigned_employee_name || "";
|
|
40
40
|
this.civil_id_card_number = civil_id_card_number || null;
|
|
41
41
|
this.employee_id = employee_id || "";
|
|
42
|
-
this.
|
|
43
|
-
this.
|
|
42
|
+
this.original_department_id = original_department_id || 0;
|
|
43
|
+
this.assigned_department_id = assigned_department_id || 0;
|
|
44
44
|
this.start_date = start_date || new Date();
|
|
45
45
|
this.end_date = end_date || new Date();
|
|
46
46
|
this.phone_number = phone_number || "";
|
|
@@ -116,13 +116,13 @@ __decorate([
|
|
|
116
116
|
__metadata("design:type", String)
|
|
117
117
|
], SecondmentRequest.prototype, "employee_id", void 0);
|
|
118
118
|
__decorate([
|
|
119
|
-
(0, typeorm_1.Column)({ type: "
|
|
120
|
-
__metadata("design:type",
|
|
121
|
-
], SecondmentRequest.prototype, "
|
|
119
|
+
(0, typeorm_1.Column)({ type: "integer", nullable: false }),
|
|
120
|
+
__metadata("design:type", Number)
|
|
121
|
+
], SecondmentRequest.prototype, "original_department_id", void 0);
|
|
122
122
|
__decorate([
|
|
123
|
-
(0, typeorm_1.Column)({ type: "
|
|
124
|
-
__metadata("design:type",
|
|
125
|
-
], SecondmentRequest.prototype, "
|
|
123
|
+
(0, typeorm_1.Column)({ type: "integer", nullable: false }),
|
|
124
|
+
__metadata("design:type", Number)
|
|
125
|
+
], SecondmentRequest.prototype, "assigned_department_id", void 0);
|
|
126
126
|
__decorate([
|
|
127
127
|
(0, typeorm_1.Column)({ type: "date", nullable: false }),
|
|
128
128
|
__metadata("design:type", Date)
|
|
@@ -169,6 +169,6 @@ __decorate([
|
|
|
169
169
|
], SecondmentRequest.prototype, "replaced_at", void 0);
|
|
170
170
|
exports.SecondmentRequest = SecondmentRequest = __decorate([
|
|
171
171
|
(0, typeorm_1.Entity)({ name: "secondment_requests" }),
|
|
172
|
-
__metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, Object, String,
|
|
172
|
+
__metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, Object, String, Number, Number, Date,
|
|
173
173
|
Date, String, String, Boolean, Object, Object, Object, Object, Object, Object])
|
|
174
174
|
], SecondmentRequest);
|
package/package.json
CHANGED
|
@@ -58,6 +58,9 @@ export class HrServiceApprovalDetails extends BaseModel {
|
|
|
58
58
|
@Column({ type: "boolean", default: false, nullable: true })
|
|
59
59
|
is_president: boolean;
|
|
60
60
|
|
|
61
|
+
@Column({ type: "boolean", default: false, nullable: true })
|
|
62
|
+
is_replace: boolean;
|
|
63
|
+
|
|
61
64
|
@Column({ type: "boolean", default: true, nullable: false })
|
|
62
65
|
is_allowed: boolean;
|
|
63
66
|
|
|
@@ -76,6 +79,7 @@ export class HrServiceApprovalDetails extends BaseModel {
|
|
|
76
79
|
approved_by?: number | null,
|
|
77
80
|
is_manager?: boolean,
|
|
78
81
|
is_president?: boolean,
|
|
82
|
+
is_replace?: boolean,
|
|
79
83
|
is_allowed?: boolean
|
|
80
84
|
) {
|
|
81
85
|
super();
|
|
@@ -93,6 +97,7 @@ export class HrServiceApprovalDetails extends BaseModel {
|
|
|
93
97
|
this.approved_by = approved_by || null;
|
|
94
98
|
this.is_manager = is_manager ?? false;
|
|
95
99
|
this.is_president = is_president ?? false;
|
|
100
|
+
this.is_replace = is_replace ?? false;
|
|
96
101
|
this.is_allowed = is_allowed !== undefined ? is_allowed : true;
|
|
97
102
|
}
|
|
98
103
|
}
|
|
@@ -58,11 +58,11 @@ export class SecondmentRequest extends BaseModel {
|
|
|
58
58
|
@Column({ type: "varchar", length: 100, nullable: false })
|
|
59
59
|
employee_id: string;
|
|
60
60
|
|
|
61
|
-
@Column({ type: "
|
|
62
|
-
|
|
61
|
+
@Column({ type: "integer", nullable: false })
|
|
62
|
+
original_department_id: number;
|
|
63
63
|
|
|
64
|
-
@Column({ type: "
|
|
65
|
-
|
|
64
|
+
@Column({ type: "integer", nullable: false })
|
|
65
|
+
assigned_department_id: number;
|
|
66
66
|
|
|
67
67
|
@Column({ type: "date", nullable: false })
|
|
68
68
|
start_date: Date;
|
|
@@ -114,8 +114,8 @@ export class SecondmentRequest extends BaseModel {
|
|
|
114
114
|
assigned_employee_name?: string,
|
|
115
115
|
civil_id_card_number?: string | null,
|
|
116
116
|
employee_id?: string,
|
|
117
|
-
|
|
118
|
-
|
|
117
|
+
original_department_id?: number,
|
|
118
|
+
assigned_department_id?: number,
|
|
119
119
|
start_date?: Date,
|
|
120
120
|
end_date?: Date,
|
|
121
121
|
phone_number?: string,
|
|
@@ -144,8 +144,8 @@ export class SecondmentRequest extends BaseModel {
|
|
|
144
144
|
this.assigned_employee_name = assigned_employee_name || "";
|
|
145
145
|
this.civil_id_card_number = civil_id_card_number || null;
|
|
146
146
|
this.employee_id = employee_id || "";
|
|
147
|
-
this.
|
|
148
|
-
this.
|
|
147
|
+
this.original_department_id = original_department_id || 0;
|
|
148
|
+
this.assigned_department_id = assigned_department_id || 0;
|
|
149
149
|
this.start_date = start_date || new Date();
|
|
150
150
|
this.end_date = end_date || new Date();
|
|
151
151
|
this.phone_number = phone_number || "";
|