@platform-modules/civil-aviation-authority 2.3.4 → 2.3.6

package/.env

@@ -1,31 +1,17 @@
-<<<<<<< Updated upstream
-# DB_HOST=164.52.222.169
-# DB_PORT=5432 
-=======
 # DB_HOST=localhost
 # DB_PORT=5433
 # DB_USER=postgres
 # DB_PASS=123
 # DB_NAME=CAA
 
-# DB_HOST=164.52.222.169
-# DB_PORT=5432
->>>>>>> Stashed changes
-# DB_USER=postgres_admin_user
-# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-# DB_NAME=CAA
-
-<<<<<<< Updated upstream
-
-DB_HOST=localhost
-DB_PORT=5432 
-DB_USER=postgres
-DB_PASS=stevejobs
-DB_NAME=CAA
-=======
-DB_HOST=216.48.187.46
+DB_HOST=164.52.222.169
 DB_PORT=5432
-DB_USER=adminuser
-DB_PASS=postgres_caa_fm_qa_34567
-DB_NAME=CAA_QA
->>>>>>> Stashed changes
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_NAME=CAA
+
+# DB_HOST=216.48.187.46
+# DB_PORT=5432
+# DB_USER=adminuser
+# DB_PASS=postgres_caa_fm_qa_34567
+# DB_NAME=CAA_QA

package/dist/index.d.ts

@@ -103,3 +103,5 @@ export { DutyMissionWorkFlowStatus } from './models/DutyMissionWorkflowModel';
 export { DutyMissionRequestAttachment } from './models/DutyMissionAttachmentModel';
 export { DutyMissionRequestChat } from './models/DutyMissionChatModel';
 export { DutyMissionMessageType } from './models/DutyMissionChatModel';
+export { DutyMissionEmployeeDetails } from './models/DutyMissionEmployeeDetailsModel';
+export { DutyMissionAirTicketDetails } from './models/DutyMissionAirTicketDetailsModel';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DutyMissionMessageType = exports.DutyMissionRequestChat = exports.DutyMissionRequestAttachment = exports.DutyMissionWorkFlowStatus = exports.DutyMissionApprovalStatus = exports.DutyMissionStatus = exports.SecondmentRequestStatus = exports.TrainingMessageType = exports.TrainingRequestChat = exports.TrainingRequestAttachment = exports.TrainingWorkFlowStatus = exports.TrainingApprovalStatus = exports.TrainingRequestStatus = exports.HrServiceChatStatus = exports.HrServiceMessageType = exports.HrServiceRequestChat = exports.HrServiceRequestAttachment = exports.HrServiceWorkFlowStatus = exports.HrServiceApprovalStatus = exports.HrServiceRequestStatus = void 0;
+exports.DutyMissionAirTicketDetails = exports.DutyMissionEmployeeDetails = exports.DutyMissionMessageType = exports.DutyMissionRequestChat = exports.DutyMissionRequestAttachment = exports.DutyMissionWorkFlowStatus = exports.DutyMissionApprovalStatus = exports.DutyMissionStatus = exports.SecondmentRequestStatus = exports.TrainingMessageType = exports.TrainingRequestChat = exports.TrainingRequestAttachment = exports.TrainingWorkFlowStatus = exports.TrainingApprovalStatus = exports.TrainingRequestStatus = exports.HrServiceChatStatus = exports.HrServiceMessageType = exports.HrServiceRequestChat = exports.HrServiceRequestAttachment = exports.HrServiceWorkFlowStatus = exports.HrServiceApprovalStatus = exports.HrServiceRequestStatus = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -144,3 +144,7 @@ var DutyMissionChatModel_1 = require("./models/DutyMissionChatModel");
 Object.defineProperty(exports, "DutyMissionRequestChat", { enumerable: true, get: function () { return DutyMissionChatModel_1.DutyMissionRequestChat; } });
 var DutyMissionChatModel_2 = require("./models/DutyMissionChatModel");
 Object.defineProperty(exports, "DutyMissionMessageType", { enumerable: true, get: function () { return DutyMissionChatModel_2.DutyMissionMessageType; } });
+var DutyMissionEmployeeDetailsModel_1 = require("./models/DutyMissionEmployeeDetailsModel");
+Object.defineProperty(exports, "DutyMissionEmployeeDetails", { enumerable: true, get: function () { return DutyMissionEmployeeDetailsModel_1.DutyMissionEmployeeDetails; } });
+var DutyMissionAirTicketDetailsModel_1 = require("./models/DutyMissionAirTicketDetailsModel");
+Object.defineProperty(exports, "DutyMissionAirTicketDetails", { enumerable: true, get: function () { return DutyMissionAirTicketDetailsModel_1.DutyMissionAirTicketDetails; } });

package/dist/models/DutyMissionRequestModel.d.ts

@@ -58,10 +58,7 @@ export declare class DutyMissionRequests extends BaseModel {
     travel_return_date: Date;
     allowance_percentage: string | null;
     air_ticket_required: AirTicketRequired | null;
-    passport_no: string;
-    passport_issue_date: Date | null;
-    passport_expiry_date: Date | null;
     vehicle_required: VehicleRequired | null;
     remarks: string | null;
-    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, passport_no: string, 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, passport_issue_date?: Date | null, passport_expiry_date?: Date | null, vehicle_required?: VehicleRequired | null, remarks?: string | null, workflow_execution_id?: string | null);
+    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, workflow_execution_id?: string | null);
 }

package/dist/models/DutyMissionRequestModel.js

@@ -49,7 +49,7 @@ var DutyMissionStatus;
     DutyMissionStatus["REJECTED"] = "Rejected";
 })(DutyMissionStatus || (exports.DutyMissionStatus = DutyMissionStatus = {}));
 let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseModel {
-    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, passport_no, status, request_id, mission_id, mission_days, distance, if_sponsored, allowance_percentage, air_ticket_required, passport_issue_date, passport_expiry_date, vehicle_required, remarks, workflow_execution_id) {
+    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) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -70,7 +70,6 @@ let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseMode
         this.travel_place = travel_place;
         this.travel_start_date = travel_start_date;
         this.travel_return_date = travel_return_date;
-        this.passport_no = passport_no;
         this.status = status;
         this.request_id = request_id ?? null;
         this.mission_id = mission_id ?? null;
@@ -79,8 +78,6 @@ let DutyMissionRequests = class DutyMissionRequests extends BaseModel_1.BaseMode
         this.if_sponsored = if_sponsored ?? null;
         this.allowance_percentage = allowance_percentage ?? null;
         this.air_ticket_required = air_ticket_required ?? null;
-        this.passport_issue_date = passport_issue_date ?? null;
-        this.passport_expiry_date = passport_expiry_date ?? null;
         this.vehicle_required = vehicle_required ?? null;
         this.remarks = remarks ?? null;
         this.workflow_execution_id = workflow_execution_id ?? null;
@@ -220,18 +217,6 @@ __decorate([
     }),
     __metadata("design:type", Object)
 ], DutyMissionRequests.prototype, "air_ticket_required", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], DutyMissionRequests.prototype, "passport_no", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: true }),
-    __metadata("design:type", Object)
-], DutyMissionRequests.prototype, "passport_issue_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: true }),
-    __metadata("design:type", Object)
-], DutyMissionRequests.prototype, "passport_expiry_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -248,5 +233,5 @@ exports.DutyMissionRequests = DutyMissionRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'duty_mission_requests' }),
     __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, Date,
         Date, String, String, String, String, String, Date,
-        Date, String, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+        Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], DutyMissionRequests);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/index.ts

@@ -107,3 +107,5 @@ export {DutyMissionWorkFlowStatus} from './models/DutyMissionWorkflowModel';
 export {DutyMissionRequestAttachment} from './models/DutyMissionAttachmentModel';
 export {DutyMissionRequestChat} from './models/DutyMissionChatModel';
 export {DutyMissionMessageType} from './models/DutyMissionChatModel';
+export {DutyMissionEmployeeDetails} from './models/DutyMissionEmployeeDetailsModel';
+export {DutyMissionAirTicketDetails} from './models/DutyMissionAirTicketDetailsModel';

package/src/models/DutyMissionRequestModel.ts

@@ -147,15 +147,6 @@ export class DutyMissionRequests extends BaseModel {
   })
   air_ticket_required: AirTicketRequired | null;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  passport_no: string;
-
-  @Column({ type: "date", nullable: true })
-  passport_issue_date: Date | null;
-
-  @Column({ type: "date", nullable: true })
-  passport_expiry_date: Date | null;
-
   @Column({
     type: "enum",
     enum: VehicleRequired,
@@ -186,7 +177,6 @@ export class DutyMissionRequests extends BaseModel {
     travel_place: string,
     travel_start_date: Date,
     travel_return_date: Date,
-    passport_no: string,
     status: DutyMissionStatus,
     request_id?: string | null,
     mission_id?: string | null,
@@ -195,8 +185,6 @@ export class DutyMissionRequests extends BaseModel {
     if_sponsored?: string | null,
     allowance_percentage?: string | null,
     air_ticket_required?: AirTicketRequired | null,
-    passport_issue_date?: Date | null,
-    passport_expiry_date?: Date | null,
     vehicle_required?: VehicleRequired | null,
     remarks?: string | null,
     workflow_execution_id?: string | null,
@@ -221,7 +209,6 @@ export class DutyMissionRequests extends BaseModel {
     this.travel_place = travel_place;
     this.travel_start_date = travel_start_date;
     this.travel_return_date = travel_return_date;
-    this.passport_no = passport_no;
     this.status = status;
     this.request_id = request_id ?? null;
     this.mission_id = mission_id ?? null;
@@ -230,8 +217,6 @@ export class DutyMissionRequests extends BaseModel {
     this.if_sponsored = if_sponsored ?? null;
     this.allowance_percentage = allowance_percentage ?? null;
     this.air_ticket_required = air_ticket_required ?? null;
-    this.passport_issue_date = passport_issue_date ?? null;
-    this.passport_expiry_date = passport_expiry_date ?? null;
     this.vehicle_required = vehicle_required ?? null;
     this.remarks = remarks ?? null;
     this.workflow_execution_id = workflow_execution_id ?? null;