@platform-modules/civil-aviation-authority 2.3.59 → 2.3.61

package/dist/data-source.js

@@ -125,6 +125,7 @@ const RequestForCoverageApprovalModel_1 = require("./models/RequestForCoverageAp
 const RequestForCoverageChatModel_1 = require("./models/RequestForCoverageChatModel");
 const RequestForCoverageAttachmentModel_1 = require("./models/RequestForCoverageAttachmentModel");
 const CashAllowanceLeaveRequestModel_1 = require("./models/CashAllowanceLeaveRequestModel");
+const PromotionRequestModel_1 = require("./models/PromotionRequestModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -253,6 +254,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         AssignTasksEmpWorkflowModel_1.AssignTasksEmpWorkFlow,
         AssignTasksEmpAttachmentModel_1.AssignTasksEmpRequestAttachment,
         AssignTasksEmpChatModel_1.AssignTasksEmpRequestChat,
-        CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequest
+        CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequest,
+        PromotionRequestModel_1.PromotionRequest
     ],
 });

package/dist/index.d.ts

@@ -197,3 +197,5 @@ export { NotificationFrequency } from './models/TrainingRoomNotificationConfigMo
 export * from './models/MissionTravelPassportExpiryNotificationConfigModel';
 export * from './models/CashAllowanceLeaveRequestModel';
 export { CashAllowanceLeaveRequestStatus } from './models/CashAllowanceLeaveRequestModel';
+export * from './models/PromotionRequestModel';
+export { PromotionRequestStatus } from './models/PromotionRequestModel';

package/dist/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestForCoverageWorkFlowStatus = exports.RequestForCoverageNewsSize = exports.RequestForCoverageRequestStatus = exports.ServiceTransferRequestType = exports.SalaryDetailsType = exports.ServiceTransferRequestStatus = exports.TemporaryAssignmentRequestType = exports.TemporaryAssignmentRequestStatus = exports.SecondmentRequestStatus = exports.TrainingRoomBookingChatStatus = exports.TrainingRoomBookingMessageType = exports.TrainingRoomBookingRequestChat = exports.TrainingRoomBookingRequestAttachment = exports.TrainingRoomBookingWorkFlowStatus = exports.TrainingRoomBookingApprovalStatus = exports.TrainingRoomBookingRoomType = exports.TrainingRoomBookingRequestStatus = exports.AnnualTrainingPlanChatStatus = exports.AnnualTrainingPlanMessageType = exports.AnnualTrainingPlanRequestChat = exports.AnnualTrainingPlanRequestAttachment = exports.AnnualTrainingPlanWorkFlowStatus = exports.AnnualTrainingPlanApprovalStatus = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = exports.StudyLeaveChatStatus = exports.StudyLeaveMessageType = exports.StudyLeaveRequestChat = exports.StudyLeaveRequestAttachment = exports.StudyLeaveWorkFlowStatus = exports.StudyLeaveApprovalStatus = exports.StudyLeaveRequestStatus = 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 = exports.LogisticsVehicleMaintenanceWorkFlowStatus = exports.LogisticsVehicleMaintenanceMessageType = exports.LogisticsVehicleMaintenanceApprovalStatus = exports.VehicleMaintenanceStatus = exports.VehicleMaintenanceType = void 0;
-exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = void 0;
+exports.PromotionRequestStatus = exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -296,3 +296,7 @@ __exportStar(require("./models/MissionTravelPassportExpiryNotificationConfigMode
 __exportStar(require("./models/CashAllowanceLeaveRequestModel"), exports);
 var CashAllowanceLeaveRequestModel_1 = require("./models/CashAllowanceLeaveRequestModel");
 Object.defineProperty(exports, "CashAllowanceLeaveRequestStatus", { enumerable: true, get: function () { return CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequestStatus; } });
+// Promotion Request Service
+__exportStar(require("./models/PromotionRequestModel"), exports);
+var PromotionRequestModel_1 = require("./models/PromotionRequestModel");
+Object.defineProperty(exports, "PromotionRequestStatus", { enumerable: true, get: function () { return PromotionRequestModel_1.PromotionRequestStatus; } });

package/dist/models/JobTransferRequestModel.d.ts

@@ -27,5 +27,6 @@ export declare class JobTransferRequest extends BaseModel {
     current_job_position: string;
     position_to_be_transferred: string;
     effective_from_date: Date;
+    decision_number: number | null;
     constructor(user_id: number, status?: JobTransferRequestStatus, 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, reason_for_request?: string, assigned_employee_name?: string, civil_id_card_number?: string | null, employee_id?: string, current_job_position?: string, position_to_be_transferred?: string, effective_from_date?: Date);
 }

package/dist/models/JobTransferRequestModel.js

@@ -122,6 +122,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], JobTransferRequest.prototype, "effective_from_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], JobTransferRequest.prototype, "decision_number", void 0);
 exports.JobTransferRequest = JobTransferRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "job_transfer_requests" }),
     __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Object, String, String, String, Date])

package/dist/models/LogisticsForeignVehicleModel.d.ts

@@ -31,6 +31,15 @@ export declare class LogisticsForeignVehicleRequests extends BaseModel {
     vehicle_required_location: Foreign_Vehicle_Required_Location;
     employee_id_passport: string | null;
     contact_number: string;
+    driver_name: string | null;
+    vehicle_number: string | null;
+    fuel_card: string | null;
+    expected_vehicle_return_time: string | null;
+    expected_return_date: Date | null;
+    actual_vehicle_return_time: string | null;
+    actual_return_date: Date | null;
+    vehicle_condition: string | null;
+    reason: string | null;
     request_type: Foreign_Request_Type;
     origin_city: string | null;
     destination_city: string;
@@ -38,5 +47,5 @@ export declare class LogisticsForeignVehicleRequests extends BaseModel {
     special_instructions: string | null;
     status: Foreign_Request_Status;
     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, number_of_passengers: number, purpose_of_travel: string, vehicle_required_location: Foreign_Vehicle_Required_Location, contact_number: string, request_type: Foreign_Request_Type, destination_city: string, arrival_departure_datetime: Date, status: Foreign_Request_Status, employee_id_passport?: string | null, origin_city?: string | null, special_instructions?: 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, number_of_passengers: number, purpose_of_travel: string, vehicle_required_location: Foreign_Vehicle_Required_Location, contact_number: string, request_type: Foreign_Request_Type, destination_city: string, arrival_departure_datetime: Date, status: Foreign_Request_Status, employee_id_passport?: string | null, origin_city?: string | null, special_instructions?: string | null, workflow_execution_id?: string | null, driver_name?: string | null, vehicle_number?: string | null, fuel_card?: string | null, expected_vehicle_return_time?: string | null, expected_return_date?: Date | null, actual_vehicle_return_time?: string | null, actual_return_date?: Date | null, vehicle_condition?: string | null, reason?: string | null);
 }

package/dist/models/LogisticsForeignVehicleModel.js

@@ -38,7 +38,7 @@ var Foreign_Request_Status;
     Foreign_Request_Status["REJECTED"] = "Rejected";
 })(Foreign_Request_Status || (exports.Foreign_Request_Status = Foreign_Request_Status = {}));
 let LogisticsForeignVehicleRequests = class LogisticsForeignVehicleRequests extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, number_of_passengers, purpose_of_travel, vehicle_required_location, contact_number, request_type, destination_city, arrival_departure_datetime, status, employee_id_passport, origin_city, special_instructions, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, number_of_passengers, purpose_of_travel, vehicle_required_location, contact_number, request_type, destination_city, arrival_departure_datetime, status, employee_id_passport, origin_city, special_instructions, workflow_execution_id, driver_name, vehicle_number, fuel_card, expected_vehicle_return_time, expected_return_date, actual_vehicle_return_time, actual_return_date, vehicle_condition, reason) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -51,9 +51,18 @@ let LogisticsForeignVehicleRequests = class LogisticsForeignVehicleRequests exte
         this.employee_id_passport = employee_id_passport ?? null;
         this.contact_number = contact_number;
         this.request_type = request_type;
+        this.vehicle_number = vehicle_number ?? null;
+        this.fuel_card = fuel_card ?? null;
+        this.expected_vehicle_return_time = expected_vehicle_return_time ?? null;
+        this.expected_return_date = expected_return_date ?? null;
+        this.actual_vehicle_return_time = actual_vehicle_return_time ?? null;
+        this.actual_return_date = actual_return_date ?? null;
+        this.vehicle_condition = vehicle_condition ?? null;
+        this.reason = reason ?? null;
         this.origin_city = origin_city ?? null;
         this.destination_city = destination_city;
         this.arrival_departure_datetime = arrival_departure_datetime;
+        this.driver_name = driver_name ?? null;
         this.special_instructions = special_instructions ?? null;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id ?? null;
@@ -110,6 +119,42 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
     __metadata("design:type", String)
 ], LogisticsForeignVehicleRequests.prototype, "contact_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "driver_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "vehicle_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "fuel_card", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "expected_vehicle_return_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "expected_return_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "actual_vehicle_return_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "actual_return_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "vehicle_condition", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsForeignVehicleRequests.prototype, "reason", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
@@ -150,5 +195,5 @@ __decorate([
 ], LogisticsForeignVehicleRequests.prototype, "workflow_execution_id", void 0);
 exports.LogisticsForeignVehicleRequests = LogisticsForeignVehicleRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_foreign_vehicle_requests' }),
-    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, Number, String, String, String, String, String, Date, String, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, Number, String, String, String, String, String, Date, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], LogisticsForeignVehicleRequests);

package/dist/models/LogisticsModel.d.ts

@@ -26,6 +26,8 @@ export declare enum Purpose_of_Travel {
     OTHER = "Other"
 }
 export declare enum Type_of_Vehicle {
+    LIGHT = "Light vehicle",
+    HEAVY = "Heavy vehicle",
     SEDAN = "Sedan",
     SUV = "SUV"
 }
@@ -48,10 +50,17 @@ export declare class LogisticsRequests extends BaseModel {
     type_of_request: Type_of_Request;
     date_of_travel: Date;
     time_of_travel: string;
-    exp_duration_of_use_hrs: number;
-    exp_duration_of_use_days: number;
     description: string;
     status: Status;
     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, category: Request_Type, vehicle_required_for: Vehicle_Required_For, vehicle_required_location: Vehicle_Required_Location, title: string, purpose_of_travel: Purpose_of_Travel, type_of_vehicle_required: Type_of_Vehicle, type_of_request: Type_of_Request, date_of_travel: Date, time_of_travel: string, exp_duration_of_use_hrs: number, exp_duration_of_use_days: number, description: string, status: Status, workflow_execution_id?: string | null);
+    vehicle_number: string | null;
+    fuel_card: string | null;
+    expected_vehicle_return_time: string | null;
+    expected_return_date: Date | null;
+    actual_vehicle_return_time: string | null;
+    actual_return_date: Date | null;
+    vehicle_condition: string | null;
+    reason: string | null;
+    driver_name: 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, category: Request_Type, vehicle_required_for: Vehicle_Required_For, vehicle_required_location: Vehicle_Required_Location, title: string, purpose_of_travel: Purpose_of_Travel, type_of_vehicle_required: Type_of_Vehicle, type_of_request: Type_of_Request, date_of_travel: Date, time_of_travel: string, description: string, status: Status, workflow_execution_id?: string | null, vehicle_number?: string | null, fuel_card?: string | null, expected_vehicle_return_time?: string | null, expected_return_date?: Date | null, actual_vehicle_return_time?: string | null, actual_return_date?: Date | null, vehicle_condition?: string | null, reason?: string | null, driver_name?: string | null);
 }

package/dist/models/LogisticsModel.js

@@ -45,6 +45,8 @@ var Purpose_of_Travel;
 })(Purpose_of_Travel || (exports.Purpose_of_Travel = Purpose_of_Travel = {}));
 var Type_of_Vehicle;
 (function (Type_of_Vehicle) {
+    Type_of_Vehicle["LIGHT"] = "Light vehicle";
+    Type_of_Vehicle["HEAVY"] = "Heavy vehicle";
     Type_of_Vehicle["SEDAN"] = "Sedan";
     Type_of_Vehicle["SUV"] = "SUV";
 })(Type_of_Vehicle || (exports.Type_of_Vehicle = Type_of_Vehicle = {}));
@@ -54,7 +56,10 @@ var Type_of_Request;
     Type_of_Request["EXTENSION"] = "Extension of Previous Request";
 })(Type_of_Request || (exports.Type_of_Request = Type_of_Request = {}));
 let LogisticsRequests = class LogisticsRequests extends BaseModel_1.BaseModel {
-    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, category, vehicle_required_for, vehicle_required_location, title, purpose_of_travel, type_of_vehicle_required, type_of_request, date_of_travel, time_of_travel, exp_duration_of_use_hrs, exp_duration_of_use_days, description, status, workflow_execution_id) {
+    constructor(req_user_department_id, req_user_section_id, service_id, sub_service_id, user_id, category, vehicle_required_for, vehicle_required_location, title, purpose_of_travel, type_of_vehicle_required, type_of_request, date_of_travel, time_of_travel, 
+    // exp_duration_of_use_hrs: number,
+    // exp_duration_of_use_days: number,
+    description, status, workflow_execution_id, vehicle_number, fuel_card, expected_vehicle_return_time, expected_return_date, actual_vehicle_return_time, actual_return_date, vehicle_condition, reason, driver_name) {
         super();
         this.req_user_department_id = req_user_department_id ?? null;
         this.req_user_section_id = req_user_section_id ?? null;
@@ -70,11 +75,20 @@ let LogisticsRequests = class LogisticsRequests extends BaseModel_1.BaseModel {
         this.type_of_request = type_of_request;
         this.date_of_travel = date_of_travel;
         this.time_of_travel = time_of_travel;
-        this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;
-        this.exp_duration_of_use_days = exp_duration_of_use_days;
+        // this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;
+        // this.exp_duration_of_use_days = exp_duration_of_use_days;
         this.description = description;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id ?? null;
+        this.vehicle_number = vehicle_number ?? null;
+        this.fuel_card = fuel_card ?? null;
+        this.expected_vehicle_return_time = expected_vehicle_return_time ?? null;
+        this.expected_return_date = expected_return_date ?? null;
+        this.actual_vehicle_return_time = actual_vehicle_return_time ?? null;
+        this.actual_return_date = actual_return_date ?? null;
+        this.vehicle_condition = vehicle_condition ?? null;
+        this.reason = reason ?? null;
+        this.driver_name = driver_name ?? null;
     }
 };
 exports.LogisticsRequests = LogisticsRequests;
@@ -142,7 +156,7 @@ __decorate([
     (0, typeorm_1.Column)({
         type: "enum",
         enum: Type_of_Vehicle,
-        default: Type_of_Vehicle.SEDAN,
+        default: Type_of_Vehicle.LIGHT,
         nullable: false,
     }),
     __metadata("design:type", String)
@@ -164,14 +178,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: "time", nullable: true }),
     __metadata("design:type", String)
 ], LogisticsRequests.prototype, "time_of_travel", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], LogisticsRequests.prototype, "exp_duration_of_use_hrs", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], LogisticsRequests.prototype, "exp_duration_of_use_days", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
@@ -189,7 +195,43 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
     __metadata("design:type", Object)
 ], LogisticsRequests.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "vehicle_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "fuel_card", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "expected_vehicle_return_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "expected_return_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "actual_vehicle_return_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "actual_return_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "vehicle_condition", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "reason", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], LogisticsRequests.prototype, "driver_name", void 0);
 exports.LogisticsRequests = LogisticsRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'logistics_requests' }),
-    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, String, String, Date, String, Number, Number, String, String, Object])
+    __metadata("design:paramtypes", [Object, Object, Number, Number, Number, String, String, String, String, String, String, String, Date, String, String, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], LogisticsRequests);

package/package.json

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

package/src/data-source.ts

@@ -123,6 +123,7 @@ import { RequestForCoverageApprovalDetails } from './models/RequestForCoverageAp
 import { RequestForCoverageRequestChat } from './models/RequestForCoverageChatModel';
 import { RequestForCoverageRequestAttachment } from './models/RequestForCoverageAttachmentModel';
 import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
+import { PromotionRequest } from './models/PromotionRequestModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -252,6 +253,7 @@ export const AppDataSource = new DataSource({
     AssignTasksEmpWorkFlow,
     AssignTasksEmpRequestAttachment,
     AssignTasksEmpRequestChat,
-    CashAllowanceLeaveRequest
+    CashAllowanceLeaveRequest,
+    PromotionRequest
   ],
 });

package/src/index.ts

@@ -220,4 +220,8 @@ export {NotificationFrequency} from './models/TrainingRoomNotificationConfigMode
 export * from './models/MissionTravelPassportExpiryNotificationConfigModel';
 
 export * from './models/CashAllowanceLeaveRequestModel'
-export  { CashAllowanceLeaveRequestStatus } from './models/CashAllowanceLeaveRequestModel'
+export  { CashAllowanceLeaveRequestStatus } from './models/CashAllowanceLeaveRequestModel'
+
+// Promotion Request Service
+export * from './models/PromotionRequestModel';
+export { PromotionRequestStatus } from './models/PromotionRequestModel';

package/src/models/JobTransferRequestModel.ts

@@ -70,6 +70,10 @@ export class JobTransferRequest extends BaseModel {
     @Column({ type: "date", nullable: false })
     effective_from_date: Date;
 
+    @Column({ type: "integer", nullable: true })
+    decision_number : number | null;
+   
+
     constructor(
         user_id: number,
         status: JobTransferRequestStatus = JobTransferRequestStatus.PENDING,

package/src/models/LogisticsForeignVehicleModel.ts

@@ -69,6 +69,33 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
   @Column({ type: 'varchar', length: 20, nullable: false })
   contact_number: string;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  driver_name: string | null;
+ 
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  vehicle_number: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  fuel_card: string | null;
+
+  @Column({ type: 'time', nullable: true })
+  expected_vehicle_return_time: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  expected_return_date: Date | null;
+
+  @Column({ type: 'time', nullable: true })
+  actual_vehicle_return_time: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  actual_return_date: Date | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  vehicle_condition: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  reason: string | null;
+
   @Column({
     type: "enum",
     enum: Foreign_Request_Type,
@@ -118,6 +145,15 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
     origin_city?: string | null,
     special_instructions?: string | null,
     workflow_execution_id?: string | null,
+    driver_name?: string | null,
+    vehicle_number?: string | null,
+    fuel_card?: string | null,
+    expected_vehicle_return_time?: string | null,
+    expected_return_date?: Date | null,
+    actual_vehicle_return_time?: string | null,
+    actual_return_date?: Date | null,
+    vehicle_condition?: string | null,
+    reason?: string | null,
   ) {
     super();
     this.req_user_department_id = req_user_department_id ?? null;
@@ -131,9 +167,18 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
     this.employee_id_passport = employee_id_passport ?? null;
     this.contact_number = contact_number;
     this.request_type = request_type;
+    this.vehicle_number = vehicle_number ?? null;
+    this.fuel_card = fuel_card ?? null;
+    this.expected_vehicle_return_time = expected_vehicle_return_time ?? null;
+    this.expected_return_date = expected_return_date ?? null;
+    this.actual_vehicle_return_time = actual_vehicle_return_time ?? null;
+    this.actual_return_date = actual_return_date ?? null;
+    this.vehicle_condition = vehicle_condition ?? null;
+    this.reason = reason ?? null;
     this.origin_city = origin_city ?? null;
     this.destination_city = destination_city;
     this.arrival_departure_datetime = arrival_departure_datetime;
+    this.driver_name = driver_name ?? null;
     this.special_instructions = special_instructions ?? null;
     this.status = status;
     this.workflow_execution_id = workflow_execution_id ?? null;

package/src/models/LogisticsModel.ts

@@ -33,6 +33,8 @@ export enum Purpose_of_Travel {
 }
 
 export enum Type_of_Vehicle {
+  LIGHT = "Light vehicle",
+  HEAVY = "Heavy vehicle",
   SEDAN = "Sedan",
   SUV = "SUV"
 }
@@ -98,7 +100,7 @@ export class LogisticsRequests extends BaseModel {
   @Column({
     type: "enum",
     enum: Type_of_Vehicle,
-    default: Type_of_Vehicle.SEDAN,
+    default: Type_of_Vehicle.LIGHT,
     nullable: false,
   })
   type_of_vehicle_required: Type_of_Vehicle;
@@ -117,11 +119,11 @@ export class LogisticsRequests extends BaseModel {
   @Column({ type: "time", nullable: true })
   time_of_travel: string;
 
-  @Column({ type: 'int', nullable: false })
-  exp_duration_of_use_hrs: number;
+  // @Column({ type: 'int', nullable: false })
+  // exp_duration_of_use_hrs: number;
 
-  @Column({ type: 'int', nullable: false })
-  exp_duration_of_use_days: number;
+  // @Column({ type: 'int', nullable: false })
+  // exp_duration_of_use_days: number;
 
   @Column({ nullable: false })
   description: string;
@@ -137,6 +139,33 @@ export class LogisticsRequests extends BaseModel {
   @Column({ type: "varchar", nullable: true })
   workflow_execution_id: string | null;
 
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  vehicle_number: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  fuel_card: string | null;
+
+  @Column({ type: 'time', nullable: true })
+  expected_vehicle_return_time: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  expected_return_date: Date | null;
+
+  @Column({ type: 'time', nullable: true })
+  actual_vehicle_return_time: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  actual_return_date: Date | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  vehicle_condition: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  reason: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  driver_name: string | null;
+
   constructor(
     req_user_department_id: number | null,
     req_user_section_id: number | null,
@@ -152,11 +181,20 @@ export class LogisticsRequests extends BaseModel {
     type_of_request: Type_of_Request,
     date_of_travel: Date,
     time_of_travel: string,
-    exp_duration_of_use_hrs: number,
-    exp_duration_of_use_days: number,
+    // exp_duration_of_use_hrs: number,
+    // exp_duration_of_use_days: number,
     description: string,
     status: Status,
     workflow_execution_id?: string | null,
+    vehicle_number?: string | null,
+    fuel_card?: string | null,
+    expected_vehicle_return_time?: string | null,
+    expected_return_date?: Date | null,
+    actual_vehicle_return_time?: string | null,
+    actual_return_date?: Date | null,
+    vehicle_condition?: string | null,
+    reason?: string | null,
+    driver_name?: string | null,
   ) {
     super();
     this.req_user_department_id = req_user_department_id ?? null;
@@ -173,10 +211,19 @@ export class LogisticsRequests extends BaseModel {
     this.type_of_request = type_of_request;
     this.date_of_travel = date_of_travel;
     this.time_of_travel = time_of_travel;
-    this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;
-    this.exp_duration_of_use_days = exp_duration_of_use_days;
+    // this.exp_duration_of_use_hrs = exp_duration_of_use_hrs;
+    // this.exp_duration_of_use_days = exp_duration_of_use_days;
     this.description = description;
     this.status = status;
     this.workflow_execution_id = workflow_execution_id ?? null;
+    this.vehicle_number = vehicle_number ?? null;
+    this.fuel_card = fuel_card ?? null;
+    this.expected_vehicle_return_time = expected_vehicle_return_time ?? null;
+    this.expected_return_date = expected_return_date ?? null;
+    this.actual_vehicle_return_time = actual_vehicle_return_time ?? null;
+    this.actual_return_date = actual_return_date ?? null;
+    this.vehicle_condition = vehicle_condition ?? null;
+    this.reason = reason ?? null;
+    this.driver_name = driver_name ?? null;
   }
 }