@platform-modules/civil-aviation-authority 2.3.72 → 2.3.74
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/FinancialGradeModel.d.ts +2 -1
- package/dist/models/FinancialGradeModel.js +7 -2
- package/package.json +1 -1
- package/src/models/DutyMissionRequestModel.ts +5 -0
- package/src/models/FinancialGradeModel.ts +6 -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);
|
|
@@ -8,5 +8,6 @@ export declare class FinancialGrade extends BaseModel {
|
|
|
8
8
|
leave_count: number | null;
|
|
9
9
|
daily_allowance: number | null;
|
|
10
10
|
travel_class: string | null;
|
|
11
|
-
|
|
11
|
+
is_active: boolean;
|
|
12
|
+
constructor(arabic_title?: string | null, financial_grade?: number | null, leave_count?: number | null, daily_allowance?: number | null, travel_class?: string | null, is_active?: boolean);
|
|
12
13
|
}
|
|
@@ -16,13 +16,14 @@ const BaseModel_1 = require("./BaseModel");
|
|
|
16
16
|
* This model is used to store the Financial Grade master data on the Admin Side
|
|
17
17
|
*/
|
|
18
18
|
let FinancialGrade = class FinancialGrade extends BaseModel_1.BaseModel {
|
|
19
|
-
constructor(arabic_title, financial_grade, leave_count, daily_allowance, travel_class) {
|
|
19
|
+
constructor(arabic_title, financial_grade, leave_count, daily_allowance, travel_class, is_active) {
|
|
20
20
|
super();
|
|
21
21
|
this.arabic_title = arabic_title || null;
|
|
22
22
|
this.financial_grade = financial_grade || null;
|
|
23
23
|
this.leave_count = leave_count || null;
|
|
24
24
|
this.daily_allowance = daily_allowance || null;
|
|
25
25
|
this.travel_class = travel_class || null;
|
|
26
|
+
this.is_active = is_active !== undefined ? is_active : true;
|
|
26
27
|
}
|
|
27
28
|
};
|
|
28
29
|
exports.FinancialGrade = FinancialGrade;
|
|
@@ -46,7 +47,11 @@ __decorate([
|
|
|
46
47
|
(0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
|
|
47
48
|
__metadata("design:type", Object)
|
|
48
49
|
], FinancialGrade.prototype, "travel_class", void 0);
|
|
50
|
+
__decorate([
|
|
51
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true }),
|
|
52
|
+
__metadata("design:type", Boolean)
|
|
53
|
+
], FinancialGrade.prototype, "is_active", void 0);
|
|
49
54
|
exports.FinancialGrade = FinancialGrade = __decorate([
|
|
50
55
|
(0, typeorm_1.Entity)({ name: 'financial_grade' }),
|
|
51
|
-
__metadata("design:paramtypes", [Object, Object, Object, Object, Object])
|
|
56
|
+
__metadata("design:paramtypes", [Object, Object, Object, Object, Object, Boolean])
|
|
52
57
|
], FinancialGrade);
|
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
|
}
|
|
@@ -22,12 +22,16 @@ export class FinancialGrade extends BaseModel {
|
|
|
22
22
|
@Column({ type: 'varchar', nullable: true })
|
|
23
23
|
travel_class: string | null;
|
|
24
24
|
|
|
25
|
+
@Column({ type: 'boolean', default: true })
|
|
26
|
+
is_active: boolean;
|
|
27
|
+
|
|
25
28
|
constructor(
|
|
26
29
|
arabic_title?: string | null,
|
|
27
30
|
financial_grade?: number | null,
|
|
28
31
|
leave_count?: number | null,
|
|
29
32
|
daily_allowance?: number | null,
|
|
30
|
-
travel_class?: string | null
|
|
33
|
+
travel_class?: string | null,
|
|
34
|
+
is_active?: boolean
|
|
31
35
|
) {
|
|
32
36
|
super();
|
|
33
37
|
this.arabic_title = arabic_title || null;
|
|
@@ -35,5 +39,6 @@ export class FinancialGrade extends BaseModel {
|
|
|
35
39
|
this.leave_count = leave_count || null;
|
|
36
40
|
this.daily_allowance = daily_allowance || null;
|
|
37
41
|
this.travel_class = travel_class || null;
|
|
42
|
+
this.is_active = is_active !== undefined ? is_active : true;
|
|
38
43
|
}
|
|
39
44
|
}
|