@platform-modules/civil-aviation-authority 2.3.73 → 2.3.75
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/DutyMissionRequestModel.d.ts +2 -1
- package/dist/models/DutyMissionRequestModel.js +7 -2
- package/dist/models/HrServiceRequestModel.d.ts +6 -1
- package/dist/models/HrServiceRequestModel.js +28 -2
- package/package.json +1 -1
- package/src/models/DutyMissionRequestModel.ts +5 -0
- package/src/models/HrServiceRequestModel.ts +27 -1
|
@@ -60,5 +60,6 @@ export declare class DutyMissionRequests extends BaseModel {
|
|
|
60
60
|
air_ticket_required: AirTicketRequired | null;
|
|
61
61
|
vehicle_required: VehicleRequired | null;
|
|
62
62
|
remarks: string | null;
|
|
63
|
-
|
|
63
|
+
decision_number: string | null;
|
|
64
|
+
constructor(req_user_department_id: number | null, req_user_section_id: number | null, service_id: number, sub_service_id: number, user_id: number, trip_type: TripType, choose_type: ChooseType, mission_sponsored_by: MissionSponsoredBy, mission_purpose: string, mission_number: string, mission_start_date: Date, mission_end_date: Date, travelling_area_from: string, travelling_area_to: string, from_country: string, to_country: string, travel_place: string, travel_start_date: Date, travel_return_date: Date, status: DutyMissionStatus, request_id?: string | null, mission_id?: string | null, mission_days?: number | null, distance?: string | null, if_sponsored?: string | null, allowance_percentage?: string | null, air_ticket_required?: AirTicketRequired | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, decision_number?: string | null, workflow_execution_id?: string | null);
|
|
64
65
|
}
|
|
@@ -49,7 +49,7 @@ var DutyMissionStatus;
|
|
|
49
49
|
DutyMissionStatus["REJECTED"] = "Rejected";
|
|
50
50
|
})(DutyMissionStatus || (exports.DutyMissionStatus = DutyMissionStatus = {}));
|
|
51
51
|
let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseModel {
|
|
52
|
-
constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, workflow_execution_id) {
|
|
52
|
+
constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, trip_type, choose_type, mission_sponsored_by, mission_purpose, mission_number, mission_start_date, mission_end_date, travelling_area_from, travelling_area_to, from_country, to_country, travel_place, travel_start_date, travel_return_date, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, vehicle_required, remarks, decision_number, workflow_execution_id) {
|
|
53
53
|
super();
|
|
54
54
|
this.req_user_department_id = req_user_department_id ?? null;
|
|
55
55
|
this.req_user_section_id = req_user_section_id ?? null;
|
|
@@ -80,6 +80,7 @@ let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseMode
|
|
|
80
80
|
this.air_ticket_required = air_ticket_required ?? null;
|
|
81
81
|
this.vehicle_required = vehicle_required ?? null;
|
|
82
82
|
this.remarks = remarks ?? null;
|
|
83
|
+
this.decision_number = decision_number ?? null;
|
|
83
84
|
this.workflow_execution_id = workflow_execution_id ?? null;
|
|
84
85
|
}
|
|
85
86
|
};
|
|
@@ -229,9 +230,13 @@ __decorate([
|
|
|
229
230
|
(0, typeorm_1.Column)({ type: 'text', nullable: true }),
|
|
230
231
|
__metadata("design:type", Object)
|
|
231
232
|
], DutyMissionRequests.prototype, "remarks", void 0);
|
|
233
|
+
__decorate([
|
|
234
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
|
|
235
|
+
__metadata("design:type", Object)
|
|
236
|
+
], DutyMissionRequests.prototype, "decision_number", void 0);
|
|
232
237
|
exports.DutyMissionRequests = DutyMissionRequests = __decorate([
|
|
233
238
|
(0, typeorm_1.Entity)({ name: 'duty_mission_requests' }),
|
|
234
239
|
__metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, Date,
|
|
235
240
|
Date, String, String, String, String, String, Date,
|
|
236
|
-
Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
|
|
241
|
+
Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
|
|
237
242
|
], DutyMissionRequests);
|
|
@@ -34,8 +34,13 @@ export declare class HrServiceRequest extends BaseModel {
|
|
|
34
34
|
replacement_employee_name: string | null;
|
|
35
35
|
replacement_employee_id: string | null;
|
|
36
36
|
replacement_civil_id_card_number: string | null;
|
|
37
|
+
replacement_current_job_position: string | null;
|
|
38
|
+
replacement_assigned_job_position: string | null;
|
|
39
|
+
replacement_start_date: Date | null;
|
|
40
|
+
replacement_end_date: Date | null;
|
|
41
|
+
replacement_assignment_allowance: number | null;
|
|
37
42
|
replacement_reason: string | null;
|
|
38
43
|
replaced_by_user_id: number | null;
|
|
39
44
|
replaced_at: Date | null;
|
|
40
|
-
constructor(user_id: number, status?: HrServiceRequestStatus, 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, current_job_position?: string, assigned_job_position?: string, start_date?: Date, end_date?: Date, assignment_allowance?: number | null, 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);
|
|
45
|
+
constructor(user_id: number, status?: HrServiceRequestStatus, 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, current_job_position?: string, assigned_job_position?: string, start_date?: Date, end_date?: Date, assignment_allowance?: number | null, 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_current_job_position?: string | null, replacement_assigned_job_position?: string | null, replacement_start_date?: Date | null, replacement_end_date?: Date | null, replacement_assignment_allowance?: number | null, replacement_reason?: string | null, replaced_by_user_id?: number | null, replaced_at?: Date | null);
|
|
41
46
|
}
|
|
@@ -22,7 +22,7 @@ var HrServiceRequestStatus;
|
|
|
22
22
|
HrServiceRequestStatus["REJECTED"] = "Rejected";
|
|
23
23
|
})(HrServiceRequestStatus || (exports.HrServiceRequestStatus = HrServiceRequestStatus = {}));
|
|
24
24
|
let HrServiceRequest = class HrServiceRequest extends BaseModel_1.BaseModel {
|
|
25
|
-
constructor(user_id, status = HrServiceRequestStatus.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, current_job_position, assigned_job_position, start_date, end_date, assignment_allowance, 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) {
|
|
25
|
+
constructor(user_id, status = HrServiceRequestStatus.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, current_job_position, assigned_job_position, start_date, end_date, assignment_allowance, phone_number, reason_for_request, is_replaced, replacement_employee_name, replacement_employee_id, replacement_civil_id_card_number, replacement_current_job_position, replacement_assigned_job_position, replacement_start_date, replacement_end_date, replacement_assignment_allowance, replacement_reason, replaced_by_user_id, replaced_at) {
|
|
26
26
|
super();
|
|
27
27
|
this.user_id = user_id;
|
|
28
28
|
this.status = status;
|
|
@@ -46,10 +46,16 @@ let HrServiceRequest = class HrServiceRequest extends BaseModel_1.BaseModel {
|
|
|
46
46
|
this.assignment_allowance = assignment_allowance || null;
|
|
47
47
|
this.phone_number = phone_number || "";
|
|
48
48
|
this.reason_for_request = reason_for_request || "";
|
|
49
|
+
// Replacement fields initialization
|
|
49
50
|
this.is_replaced = is_replaced || false;
|
|
50
51
|
this.replacement_employee_name = replacement_employee_name || null;
|
|
51
52
|
this.replacement_employee_id = replacement_employee_id || null;
|
|
52
53
|
this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
|
|
54
|
+
this.replacement_current_job_position = replacement_current_job_position || null;
|
|
55
|
+
this.replacement_assigned_job_position = replacement_assigned_job_position || null;
|
|
56
|
+
this.replacement_start_date = replacement_start_date || null;
|
|
57
|
+
this.replacement_end_date = replacement_end_date || null;
|
|
58
|
+
this.replacement_assignment_allowance = replacement_assignment_allowance || null;
|
|
53
59
|
this.replacement_reason = replacement_reason || null;
|
|
54
60
|
this.replaced_by_user_id = replaced_by_user_id || null;
|
|
55
61
|
this.replaced_at = replaced_at || null;
|
|
@@ -160,6 +166,26 @@ __decorate([
|
|
|
160
166
|
(0, typeorm_1.Column)({ type: "varchar", length: 50, nullable: true }),
|
|
161
167
|
__metadata("design:type", Object)
|
|
162
168
|
], HrServiceRequest.prototype, "replacement_civil_id_card_number", void 0);
|
|
169
|
+
__decorate([
|
|
170
|
+
(0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
|
|
171
|
+
__metadata("design:type", Object)
|
|
172
|
+
], HrServiceRequest.prototype, "replacement_current_job_position", void 0);
|
|
173
|
+
__decorate([
|
|
174
|
+
(0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
|
|
175
|
+
__metadata("design:type", Object)
|
|
176
|
+
], HrServiceRequest.prototype, "replacement_assigned_job_position", void 0);
|
|
177
|
+
__decorate([
|
|
178
|
+
(0, typeorm_1.Column)({ type: "date", nullable: true }),
|
|
179
|
+
__metadata("design:type", Object)
|
|
180
|
+
], HrServiceRequest.prototype, "replacement_start_date", void 0);
|
|
181
|
+
__decorate([
|
|
182
|
+
(0, typeorm_1.Column)({ type: "date", nullable: true }),
|
|
183
|
+
__metadata("design:type", Object)
|
|
184
|
+
], HrServiceRequest.prototype, "replacement_end_date", void 0);
|
|
185
|
+
__decorate([
|
|
186
|
+
(0, typeorm_1.Column)({ type: "decimal", precision: 5, scale: 2, nullable: true }),
|
|
187
|
+
__metadata("design:type", Object)
|
|
188
|
+
], HrServiceRequest.prototype, "replacement_assignment_allowance", void 0);
|
|
163
189
|
__decorate([
|
|
164
190
|
(0, typeorm_1.Column)({ type: "text", nullable: true }),
|
|
165
191
|
__metadata("design:type", Object)
|
|
@@ -175,5 +201,5 @@ __decorate([
|
|
|
175
201
|
exports.HrServiceRequest = HrServiceRequest = __decorate([
|
|
176
202
|
(0, typeorm_1.Entity)({ name: "hr_service_requests" }),
|
|
177
203
|
__metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, Object, String, String, String, Date,
|
|
178
|
-
Date, Object, String, String, Boolean, Object, Object, Object, Object, Object, Object])
|
|
204
|
+
Date, Object, String, String, Boolean, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
|
|
179
205
|
], HrServiceRequest);
|
package/package.json
CHANGED
|
@@ -157,6 +157,9 @@ export class DutyMissionRequests extends BaseModel {
|
|
|
157
157
|
@Column({ type: 'text', nullable: true })
|
|
158
158
|
remarks: string | null;
|
|
159
159
|
|
|
160
|
+
@Column({ type: 'varchar', length: 100, nullable: true })
|
|
161
|
+
decision_number: string | null;
|
|
162
|
+
|
|
160
163
|
constructor(
|
|
161
164
|
req_user_department_id: number | null,
|
|
162
165
|
req_user_section_id: number | null,
|
|
@@ -187,6 +190,7 @@ export class DutyMissionRequests extends BaseModel {
|
|
|
187
190
|
air_ticket_required?: AirTicketRequired | null,
|
|
188
191
|
vehicle_required?: VehicleRequired | null,
|
|
189
192
|
remarks?: string | null,
|
|
193
|
+
decision_number?: string | null,
|
|
190
194
|
workflow_execution_id?: string | null,
|
|
191
195
|
) {
|
|
192
196
|
super();
|
|
@@ -219,6 +223,7 @@ export class DutyMissionRequests extends BaseModel {
|
|
|
219
223
|
this.air_ticket_required = air_ticket_required ?? null;
|
|
220
224
|
this.vehicle_required = vehicle_required ?? null;
|
|
221
225
|
this.remarks = remarks ?? null;
|
|
226
|
+
this.decision_number = decision_number ?? null;
|
|
222
227
|
this.workflow_execution_id = workflow_execution_id ?? null;
|
|
223
228
|
}
|
|
224
229
|
}
|
|
@@ -79,7 +79,7 @@ export class HrServiceRequest extends BaseModel {
|
|
|
79
79
|
@Column({ type: "text", nullable: false })
|
|
80
80
|
reason_for_request: string;
|
|
81
81
|
|
|
82
|
-
// Replacement tracking fields
|
|
82
|
+
// Replacement tracking fields - Store REPLACEMENT details (ORIGINAL details above remain unchanged)
|
|
83
83
|
@Column({ type: "boolean", default: false, nullable: false })
|
|
84
84
|
is_replaced: boolean;
|
|
85
85
|
|
|
@@ -92,6 +92,21 @@ export class HrServiceRequest extends BaseModel {
|
|
|
92
92
|
@Column({ type: "varchar", length: 50, nullable: true })
|
|
93
93
|
replacement_civil_id_card_number: string | null;
|
|
94
94
|
|
|
95
|
+
@Column({ type: "varchar", length: 255, nullable: true })
|
|
96
|
+
replacement_current_job_position: string | null;
|
|
97
|
+
|
|
98
|
+
@Column({ type: "varchar", length: 255, nullable: true })
|
|
99
|
+
replacement_assigned_job_position: string | null;
|
|
100
|
+
|
|
101
|
+
@Column({ type: "date", nullable: true })
|
|
102
|
+
replacement_start_date: Date | null;
|
|
103
|
+
|
|
104
|
+
@Column({ type: "date", nullable: true })
|
|
105
|
+
replacement_end_date: Date | null;
|
|
106
|
+
|
|
107
|
+
@Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
|
|
108
|
+
replacement_assignment_allowance: number | null;
|
|
109
|
+
|
|
95
110
|
@Column({ type: "text", nullable: true })
|
|
96
111
|
replacement_reason: string | null;
|
|
97
112
|
|
|
@@ -128,6 +143,11 @@ export class HrServiceRequest extends BaseModel {
|
|
|
128
143
|
replacement_employee_name?: string | null,
|
|
129
144
|
replacement_employee_id?: string | null,
|
|
130
145
|
replacement_civil_id_card_number?: string | null,
|
|
146
|
+
replacement_current_job_position?: string | null,
|
|
147
|
+
replacement_assigned_job_position?: string | null,
|
|
148
|
+
replacement_start_date?: Date | null,
|
|
149
|
+
replacement_end_date?: Date | null,
|
|
150
|
+
replacement_assignment_allowance?: number | null,
|
|
131
151
|
replacement_reason?: string | null,
|
|
132
152
|
replaced_by_user_id?: number | null,
|
|
133
153
|
replaced_at?: Date | null
|
|
@@ -155,10 +175,16 @@ export class HrServiceRequest extends BaseModel {
|
|
|
155
175
|
this.assignment_allowance = assignment_allowance || null;
|
|
156
176
|
this.phone_number = phone_number || "";
|
|
157
177
|
this.reason_for_request = reason_for_request || "";
|
|
178
|
+
// Replacement fields initialization
|
|
158
179
|
this.is_replaced = is_replaced || false;
|
|
159
180
|
this.replacement_employee_name = replacement_employee_name || null;
|
|
160
181
|
this.replacement_employee_id = replacement_employee_id || null;
|
|
161
182
|
this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
|
|
183
|
+
this.replacement_current_job_position = replacement_current_job_position || null;
|
|
184
|
+
this.replacement_assigned_job_position = replacement_assigned_job_position || null;
|
|
185
|
+
this.replacement_start_date = replacement_start_date || null;
|
|
186
|
+
this.replacement_end_date = replacement_end_date || null;
|
|
187
|
+
this.replacement_assignment_allowance = replacement_assignment_allowance || null;
|
|
162
188
|
this.replacement_reason = replacement_reason || null;
|
|
163
189
|
this.replaced_by_user_id = replaced_by_user_id || null;
|
|
164
190
|
this.replaced_at = replaced_at || null;
|