@platform-modules/civil-aviation-authority 2.3.111 → 2.3.121

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.
Files changed (51) hide show
  1. package/.env +9 -17
  2. package/dist/models/DocumentModel.d.ts +3 -0
  3. package/dist/models/DocumentModel.js +10 -0
  4. package/dist/models/ITApprovalSettings.d.ts +7 -0
  5. package/dist/models/ITApprovalSettings.js +40 -0
  6. package/dist/models/ITServicesTypesMuscatModel.d.ts +6 -0
  7. package/dist/models/ITServicesTypesMuscatModel.js +34 -0
  8. package/dist/models/ITServicesTypesSalalahModel.d.ts +6 -0
  9. package/dist/models/ITServicesTypesSalalahModel.js +34 -0
  10. package/dist/models/TrainingRoomBookingRequestModel.d.ts +2 -1
  11. package/dist/models/TrainingRoomBookingRequestModel.js +7 -2
  12. package/dist/models/Workflows.d.ts +9 -0
  13. package/dist/models/Workflows.js +31 -0
  14. package/dist/models/user.d.ts +3 -1
  15. package/dist/models/user.js +12 -2
  16. package/package.json +1 -1
  17. package/src/data-source.ts +303 -303
  18. package/src/index.ts +292 -292
  19. package/src/models/AnnualIncrementRequestEmployeeModel.ts +65 -65
  20. package/src/models/AnnualIncrementRequestModel.ts +25 -25
  21. package/src/models/AnnualTrainingPlanRequestModel.ts +153 -153
  22. package/src/models/CashAllowanceLeaveRequestModel.ts +11 -11
  23. package/src/models/DepartmentsModel.ts +25 -25
  24. package/src/models/DocumentDriveModel.ts +28 -28
  25. package/src/models/DocumentFolderModel.ts +45 -45
  26. package/src/models/DocumentModel.ts +8 -0
  27. package/src/models/HrServiceRequestModel.ts +193 -193
  28. package/src/models/ITRequestChatModel.ts +62 -62
  29. package/src/models/ItApprovalsModel.ts +84 -84
  30. package/src/models/ItWorkflowModel.ts +55 -55
  31. package/src/models/MissionTravelPassportExpiryNotificationConfigModel.ts +36 -36
  32. package/src/models/PerformanceCyclePeriodModel.ts +23 -23
  33. package/src/models/PerformanceGoalMasterModel.ts +27 -27
  34. package/src/models/PerformanceManagementRequestGoalModel.ts +36 -36
  35. package/src/models/PerformanceManagementRequestModel.ts +14 -14
  36. package/src/models/PromotionRequestModel.ts +11 -11
  37. package/src/models/ServicesNotificationConfigModel.ts +55 -55
  38. package/src/models/StudyLeaveRequestModel.ts +144 -144
  39. package/src/models/TrainingRoomBookingRequestModel.ts +142 -137
  40. package/src/models/TrainingRoomNotificationConfigModel.ts +30 -30
  41. package/src/models/user.ts +11 -1
  42. package/dist/models/DocumentMetadataModel.d.ts +0 -45
  43. package/dist/models/DocumentMetadataModel.js +0 -171
  44. package/dist/models/DocumentationDepartmentsModel.d.ts +0 -13
  45. package/dist/models/DocumentationDepartmentsModel.js +0 -53
  46. package/dist/models/FolderModel.d.ts +0 -16
  47. package/dist/models/FolderModel.js +0 -85
  48. package/dist/models/PermissionModel.d.ts +0 -18
  49. package/dist/models/PermissionModel.js +0 -68
  50. package/dist/models/UUIDBaseModel.d.ts +0 -14
  51. package/dist/models/UUIDBaseModel.js +0 -66
package/.env CHANGED
@@ -1,20 +1,12 @@
1
- DB_HOST=164.52.222.169
2
- DB_PORT=5432
3
- DB_USER=postgres_admin_user
4
- DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
5
- DB_NAME=CAA
6
-
7
- # DB_HOST=216.48.187.46
1
+ # DB_HOST=164.52.222.169
8
2
  # DB_PORT=5432
9
- # DB_USER=adminuser
10
- # DB_PASS=postgres_caa_fm_qa_34567
11
- # DB_NAME=CAA_QA
12
-
3
+ # DB_USER=postgres_admin_user
4
+ # DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
5
+ # DB_NAME=CAA
13
6
 
14
7
 
15
-
16
- # DB_HOST=localhost
17
- # DB_PORT=5432
18
- # DB_USER=postgres
19
- # DB_PASS=stevejobs
20
- # DB_NAME=CAA
8
+ DB_HOST=localhost
9
+ DB_PORT=5432
10
+ DB_USER=postgres
11
+ DB_PASS=stevejobs
12
+ DB_NAME=CAA
@@ -1,6 +1,7 @@
1
1
  import { BaseModel } from './BaseModel';
2
2
  import { Departments } from './DepartmentsModel';
3
3
  import { DocumentFolder } from './DocumentFolderModel';
4
+ import { DocumentDrive } from './DocumentDriveModel';
4
5
  import { DocumentType } from './DocumentTypeModel';
5
6
  import { DocumentPermission } from './DocumentPermissionModel';
6
7
  import { DocumentAuditLog } from './DocumentAuditLogModel';
@@ -8,6 +9,7 @@ export declare class Document extends BaseModel {
8
9
  title: string;
9
10
  department_id: number;
10
11
  document_type_id: number;
12
+ drive_id?: number;
11
13
  folder_id?: number;
12
14
  mongodb_file_id: string;
13
15
  file_name: string;
@@ -19,6 +21,7 @@ export declare class Document extends BaseModel {
19
21
  is_active: boolean;
20
22
  department?: Departments;
21
23
  documentType?: DocumentType;
24
+ drive?: DocumentDrive;
22
25
  folder?: DocumentFolder;
23
26
  permissions?: DocumentPermission[];
24
27
  auditLogs?: DocumentAuditLog[];
@@ -14,6 +14,7 @@ const typeorm_1 = require("typeorm");
14
14
  const BaseModel_1 = require("./BaseModel");
15
15
  const DepartmentsModel_1 = require("./DepartmentsModel");
16
16
  const DocumentFolderModel_1 = require("./DocumentFolderModel");
17
+ const DocumentDriveModel_1 = require("./DocumentDriveModel");
17
18
  const DocumentTypeModel_1 = require("./DocumentTypeModel");
18
19
  const DocumentPermissionModel_1 = require("./DocumentPermissionModel");
19
20
  const DocumentAuditLogModel_1 = require("./DocumentAuditLogModel");
@@ -32,6 +33,10 @@ __decorate([
32
33
  (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
33
34
  __metadata("design:type", Number)
34
35
  ], Document.prototype, "document_type_id", void 0);
36
+ __decorate([
37
+ (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
38
+ __metadata("design:type", Number)
39
+ ], Document.prototype, "drive_id", void 0);
35
40
  __decorate([
36
41
  (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
37
42
  __metadata("design:type", Number)
@@ -78,6 +83,11 @@ __decorate([
78
83
  (0, typeorm_1.JoinColumn)({ name: 'document_type_id' }),
79
84
  __metadata("design:type", DocumentTypeModel_1.DocumentType)
80
85
  ], Document.prototype, "documentType", void 0);
86
+ __decorate([
87
+ (0, typeorm_1.ManyToOne)(() => DocumentDriveModel_1.DocumentDrive, { nullable: true }),
88
+ (0, typeorm_1.JoinColumn)({ name: 'drive_id' }),
89
+ __metadata("design:type", DocumentDriveModel_1.DocumentDrive)
90
+ ], Document.prototype, "drive", void 0);
81
91
  __decorate([
82
92
  (0, typeorm_1.ManyToOne)(() => DocumentFolderModel_1.DocumentFolder, { nullable: true }),
83
93
  (0, typeorm_1.JoinColumn)({ name: 'folder_id' }),
@@ -0,0 +1,7 @@
1
+ import { BaseModel } from './BaseModel';
2
+ export declare class ITApprovalSettings extends BaseModel {
3
+ level: number;
4
+ approval_role_id: number;
5
+ workflow_id: number;
6
+ constructor(level: number, approval_role_id: number, workflow_id: number);
7
+ }
@@ -0,0 +1,40 @@
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.ITApprovalSettings = void 0;
13
+ const typeorm_1 = require("typeorm");
14
+ const BaseModel_1 = require("./BaseModel");
15
+ let ITApprovalSettings = class ITApprovalSettings extends BaseModel_1.BaseModel {
16
+ constructor(level, approval_role_id, workflow_id) {
17
+ super();
18
+ this.level = level;
19
+ this.approval_role_id = approval_role_id;
20
+ this.workflow_id = workflow_id;
21
+ }
22
+ };
23
+ exports.ITApprovalSettings = ITApprovalSettings;
24
+ __decorate([
25
+ (0, typeorm_1.Column)({ type: 'int', nullable: false }),
26
+ __metadata("design:type", Number)
27
+ ], ITApprovalSettings.prototype, "level", void 0);
28
+ __decorate([
29
+ (0, typeorm_1.Column)({ type: 'int', nullable: false }),
30
+ __metadata("design:type", Number)
31
+ ], ITApprovalSettings.prototype, "approval_role_id", void 0);
32
+ __decorate([
33
+ (0, typeorm_1.Column)({ type: 'int', nullable: false }),
34
+ __metadata("design:type", Number)
35
+ ], ITApprovalSettings.prototype, "workflow_id", void 0);
36
+ exports.ITApprovalSettings = ITApprovalSettings = __decorate([
37
+ (0, typeorm_1.Entity)({ name: 'it_approval_settings' }),
38
+ (0, typeorm_1.Unique)(['workflow_id', 'level']),
39
+ __metadata("design:paramtypes", [Number, Number, Number])
40
+ ], ITApprovalSettings);
@@ -0,0 +1,6 @@
1
+ import { BaseModel } from './BaseModel';
2
+ export declare class ITServicesTypesMuscat extends BaseModel {
3
+ name: string;
4
+ name_in_arabic: string;
5
+ constructor(name: string, name_in_arabic: string);
6
+ }
@@ -0,0 +1,34 @@
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.ITServicesTypesMuscat = void 0;
13
+ const typeorm_1 = require("typeorm");
14
+ const BaseModel_1 = require("./BaseModel");
15
+ let ITServicesTypesMuscat = class ITServicesTypesMuscat extends BaseModel_1.BaseModel {
16
+ constructor(name, name_in_arabic) {
17
+ super();
18
+ this.name = name;
19
+ this.name_in_arabic = name_in_arabic;
20
+ }
21
+ };
22
+ exports.ITServicesTypesMuscat = ITServicesTypesMuscat;
23
+ __decorate([
24
+ (0, typeorm_1.Column)({ nullable: false }),
25
+ __metadata("design:type", String)
26
+ ], ITServicesTypesMuscat.prototype, "name", void 0);
27
+ __decorate([
28
+ (0, typeorm_1.Column)({ nullable: false }),
29
+ __metadata("design:type", String)
30
+ ], ITServicesTypesMuscat.prototype, "name_in_arabic", void 0);
31
+ exports.ITServicesTypesMuscat = ITServicesTypesMuscat = __decorate([
32
+ (0, typeorm_1.Entity)({ name: 'it_services_types_muscat' }),
33
+ __metadata("design:paramtypes", [String, String])
34
+ ], ITServicesTypesMuscat);
@@ -0,0 +1,6 @@
1
+ import { BaseModel } from './BaseModel';
2
+ export declare class ITServicesTypesSalalah extends BaseModel {
3
+ name: string;
4
+ name_in_arabic: string;
5
+ constructor(name: string, name_in_arabic: string);
6
+ }
@@ -0,0 +1,34 @@
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.ITServicesTypesSalalah = void 0;
13
+ const typeorm_1 = require("typeorm");
14
+ const BaseModel_1 = require("./BaseModel");
15
+ let ITServicesTypesSalalah = class ITServicesTypesSalalah extends BaseModel_1.BaseModel {
16
+ constructor(name, name_in_arabic) {
17
+ super();
18
+ this.name = name;
19
+ this.name_in_arabic = name_in_arabic;
20
+ }
21
+ };
22
+ exports.ITServicesTypesSalalah = ITServicesTypesSalalah;
23
+ __decorate([
24
+ (0, typeorm_1.Column)({ nullable: false }),
25
+ __metadata("design:type", String)
26
+ ], ITServicesTypesSalalah.prototype, "name", void 0);
27
+ __decorate([
28
+ (0, typeorm_1.Column)({ nullable: false }),
29
+ __metadata("design:type", String)
30
+ ], ITServicesTypesSalalah.prototype, "name_in_arabic", void 0);
31
+ exports.ITServicesTypesSalalah = ITServicesTypesSalalah = __decorate([
32
+ (0, typeorm_1.Entity)({ name: 'it_services_types_salalah' }),
33
+ __metadata("design:paramtypes", [String, String])
34
+ ], ITServicesTypesSalalah);
@@ -29,11 +29,12 @@ export declare class TrainingRoomBookingRequest extends BaseModel {
29
29
  network_support_required: boolean;
30
30
  meals_required: boolean;
31
31
  number_of_attendees: number;
32
+ name_of_participants: string[] | null;
32
33
  remarks: string | null;
33
34
  status: TrainingRoomBookingRequestStatus;
34
35
  reviewer_user_id: number | null;
35
36
  assigned_to_user_id: number | null;
36
37
  assigned_at: Date | null;
37
38
  workflow_execution_id: string | null;
38
- constructor(user_id: number, purpose_of_training: string, date_of_event: Date, start_time: string, end_time: string, room_type: TrainingRoomBookingRoomType, number_of_attendees: number, network_support_required?: boolean, meals_required?: boolean, status?: TrainingRoomBookingRequestStatus, 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, remarks?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null);
39
+ constructor(user_id: number, purpose_of_training: string, date_of_event: Date, start_time: string, end_time: string, room_type: TrainingRoomBookingRoomType, number_of_attendees: number, network_support_required?: boolean, meals_required?: boolean, status?: TrainingRoomBookingRequestStatus, 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, name_of_participants?: string[] | null, remarks?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null);
39
40
  }
@@ -30,7 +30,7 @@ var TrainingRoomBookingRoomType;
30
30
  TrainingRoomBookingRoomType["LABORATORY"] = "Laboratory";
31
31
  })(TrainingRoomBookingRoomType || (exports.TrainingRoomBookingRoomType = TrainingRoomBookingRoomType = {}));
32
32
  let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseModel_1.BaseModel {
33
- constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id) {
33
+ constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, name_of_participants, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id) {
34
34
  super();
35
35
  this.user_id = user_id;
36
36
  this.purpose_of_training = purpose_of_training;
@@ -47,6 +47,7 @@ let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseMo
47
47
  this.req_user_department_id = req_user_department_id || null;
48
48
  this.req_user_section_id = req_user_section_id || null;
49
49
  this.req_user_position_id = req_user_position_id || null;
50
+ this.name_of_participants = name_of_participants ?? null;
50
51
  this.remarks = remarks || null;
51
52
  this.reviewer_user_id = reviewer_user_id || null;
52
53
  this.assigned_to_user_id = assigned_to_user_id || null;
@@ -115,6 +116,10 @@ __decorate([
115
116
  (0, typeorm_1.Column)({ type: "integer", nullable: false }),
116
117
  __metadata("design:type", Number)
117
118
  ], TrainingRoomBookingRequest.prototype, "number_of_attendees", void 0);
119
+ __decorate([
120
+ (0, typeorm_1.Column)({ type: "json", nullable: true }),
121
+ __metadata("design:type", Object)
122
+ ], TrainingRoomBookingRequest.prototype, "name_of_participants", void 0);
118
123
  __decorate([
119
124
  (0, typeorm_1.Column)({ type: "text", nullable: true }),
120
125
  __metadata("design:type", Object)
@@ -146,5 +151,5 @@ __decorate([
146
151
  ], TrainingRoomBookingRequest.prototype, "workflow_execution_id", void 0);
147
152
  exports.TrainingRoomBookingRequest = TrainingRoomBookingRequest = __decorate([
148
153
  (0, typeorm_1.Entity)({ name: "training_room_booking_requests" }),
149
- __metadata("design:paramtypes", [Number, String, Date, String, String, String, Number, Boolean, Boolean, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
154
+ __metadata("design:paramtypes", [Number, String, Date, String, String, String, Number, Boolean, Boolean, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
150
155
  ], TrainingRoomBookingRequest);
@@ -0,0 +1,9 @@
1
+ import { BaseModel } from './BaseModel';
2
+ export declare class Workflows extends BaseModel {
3
+ name: string;
4
+ service_id: number;
5
+ sub_service_id: number;
6
+ request_for: string;
7
+ levels: number;
8
+ constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
9
+ }
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ // import { Column, Entity, Unique } from "typeorm";
3
+ // import { BaseModel } from './BaseModel';
4
+ // @Entity({ name: 'workflows' })
5
+ // @Unique(['service_id', 'sub_service_id', 'request_for'])
6
+ // export class Workflows extends BaseModel {
7
+ // @Column({ type: 'varchar', length: 100, nullable: false })
8
+ // name: string;
9
+ // @Column({ type: 'bigint', nullable: false })
10
+ // service_id: number;
11
+ // @Column({ type: 'bigint', nullable: false })
12
+ // sub_service_id: number;
13
+ // @Column({ type: 'varchar', length: 20, nullable: false })
14
+ // request_for: string; // 'Self' | 'Behalf of' | 'Internal'
15
+ // @Column({ type: 'int', nullable: false })
16
+ // levels: number;
17
+ // constructor(
18
+ // name: string,
19
+ // service_id: number,
20
+ // sub_service_id: number,
21
+ // request_for: string,
22
+ // levels: number,
23
+ // ) {
24
+ // super();
25
+ // this.name = name;
26
+ // this.service_id = service_id;
27
+ // this.sub_service_id = sub_service_id;
28
+ // this.request_for = request_for;
29
+ // this.levels = levels;
30
+ // }
31
+ // }
@@ -43,5 +43,7 @@ export declare class User extends BaseModel {
43
43
  children2_name?: string;
44
44
  address?: string;
45
45
  religion?: string;
46
- constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string, religion?: string);
46
+ current_basic_salary: number;
47
+ previous_basic_salary: number;
48
+ constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string, religion?: string, current_basic_salary?: number, previous_basic_salary?: number);
47
49
  }
@@ -13,7 +13,7 @@ exports.User = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
14
  const BaseModel_1 = require("./BaseModel");
15
15
  let User = class User extends BaseModel_1.BaseModel {
16
- constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address, religion) {
16
+ constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address, religion, current_basic_salary, previous_basic_salary) {
17
17
  super();
18
18
  this.employee_id = employee_id;
19
19
  this.civil_employee_id = civil_employee_id;
@@ -57,6 +57,8 @@ let User = class User extends BaseModel_1.BaseModel {
57
57
  this.children2_name = children2_name;
58
58
  this.address = address;
59
59
  this.religion = religion;
60
+ this.current_basic_salary = current_basic_salary || 0;
61
+ this.previous_basic_salary = previous_basic_salary || 0;
60
62
  }
61
63
  };
62
64
  exports.User = User;
@@ -232,7 +234,15 @@ __decorate([
232
234
  (0, typeorm_1.Column)({ nullable: true }),
233
235
  __metadata("design:type", String)
234
236
  ], User.prototype, "religion", void 0);
237
+ __decorate([
238
+ (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: false }),
239
+ __metadata("design:type", Number)
240
+ ], User.prototype, "current_basic_salary", void 0);
241
+ __decorate([
242
+ (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: false }),
243
+ __metadata("design:type", Number)
244
+ ], User.prototype, "previous_basic_salary", void 0);
235
245
  exports.User = User = __decorate([
236
246
  (0, typeorm_1.Entity)({ name: 'users' }),
237
- __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String, String])
247
+ __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String, String, String, String, String, String, String, String, String, Number, Number])
238
248
  ], User);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platform-modules/civil-aviation-authority",
3
- "version": "2.3.111",
3
+ "version": "2.3.121",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "scripts": {