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

package/.env

@@ -1,17 +1,12 @@
-# DB_HOST=localhost
-# DB_PORT=5433
-# DB_USER=postgres
-# DB_PASS=123
-# DB_NAME=CAA
-
 # DB_HOST=164.52.222.169
-# DB_PORT=5432
+# DB_PORT=5432 
 # 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
+
+DB_HOST=localhost
+DB_PORT=5432 
+DB_USER=postgres
+DB_PASS=stevejobs
+DB_NAME=CAA

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/LogisticsModel.d.ts

@@ -27,7 +27,9 @@ export declare enum Purpose_of_Travel {
 }
 export declare enum Type_of_Vehicle {
     LIGHT = "Light vehicle",
-    HEAVY = "Heavy vehicle"
+    HEAVY = "Heavy vehicle",
+    SEDAN = "Sedan",
+    SUV = "SUV"
 }
 export declare enum Type_of_Request {
     NEW_REQUEST = "New Request",

package/dist/models/LogisticsModel.js

@@ -47,6 +47,8 @@ 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 = {}));
 var Type_of_Request;
 (function (Type_of_Request) {

package/dist/models/PromotionRequestModel.d.ts

@@ -0,0 +1,32 @@
+import { BaseModel } from "./BaseModel";
+export declare enum PromotionRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class PromotionRequest extends BaseModel {
+    req_user_department_id: number | null;
+    req_user_section_id: number | null;
+    req_user_position_id: number | null;
+    service_id: number | null;
+    sub_service_id: number | null;
+    user_id: number;
+    description: string | null;
+    status: PromotionRequestStatus;
+    reviewer_user_id: number | null;
+    assigned_to_user_id: number | null;
+    assigned_at: Date | null;
+    workflow_execution_id: string | null;
+    employee_name: string;
+    employee_id: string;
+    current_job_title: string;
+    proposed_job_title: string;
+    current_salary_grade: string;
+    proposed_salary_grade: string;
+    current_basic_salary: number;
+    proposed_basic_salary: number;
+    constructor(user_id: number, status?: PromotionRequestStatus, 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, employee_name?: string, employee_id?: string, current_job_title?: string, proposed_job_title?: string, current_salary_grade?: string, proposed_salary_grade?: string, current_basic_salary?: number, proposed_basic_salary?: number);
+}

package/dist/models/PromotionRequestModel.js

@@ -0,0 +1,133 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromotionRequest = exports.PromotionRequestStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var PromotionRequestStatus;
+(function (PromotionRequestStatus) {
+    PromotionRequestStatus["PENDING"] = "Pending";
+    PromotionRequestStatus["ASSIGNED"] = "Assigned";
+    PromotionRequestStatus["IN_PROGRESS"] = "In Progress";
+    PromotionRequestStatus["COMPLETED"] = "Completed";
+    PromotionRequestStatus["APPROVED"] = "Approved";
+    PromotionRequestStatus["REJECTED"] = "Rejected";
+})(PromotionRequestStatus || (exports.PromotionRequestStatus = PromotionRequestStatus = {}));
+let PromotionRequest = class PromotionRequest extends BaseModel_1.BaseModel {
+    constructor(user_id, status = PromotionRequestStatus.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, employee_name, employee_id, current_job_title, proposed_job_title, current_salary_grade, proposed_salary_grade, current_basic_salary, proposed_basic_salary) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.employee_name = employee_name || "";
+        this.employee_id = employee_id || "";
+        this.current_job_title = current_job_title || "";
+        this.proposed_job_title = proposed_job_title || "";
+        this.current_salary_grade = current_salary_grade || "";
+        this.proposed_salary_grade = proposed_salary_grade || "";
+        this.current_basic_salary = current_basic_salary || 0;
+        this.proposed_basic_salary = proposed_basic_salary || 0;
+    }
+};
+exports.PromotionRequest = PromotionRequest;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "req_user_position_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], PromotionRequest.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: PromotionRequestStatus, default: PromotionRequestStatus.PENDING, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "reviewer_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "assigned_to_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "assigned_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], PromotionRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "employee_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "employee_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "current_job_title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "proposed_job_title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "current_salary_grade", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
+    __metadata("design:type", String)
+], PromotionRequest.prototype, "proposed_salary_grade", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: false }),
+    __metadata("design:type", Number)
+], PromotionRequest.prototype, "current_basic_salary", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: false }),
+    __metadata("design:type", Number)
+], PromotionRequest.prototype, "proposed_basic_salary", void 0);
+exports.PromotionRequest = PromotionRequest = __decorate([
+    (0, typeorm_1.Entity)({ name: "promotion_requests" }),
+    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, String, String, String, String, Number, Number])
+], PromotionRequest);

package/dist/models/Workflows.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from './BaseModel';
+export declare class Workflows extends BaseModel {
+    name: string;
+    service_id: number;
+    sub_service_id: number;
+    request_for: string;
+    levels: number;
+    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.60",
+  "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/HrServiceRequestModel.ts

@@ -1,167 +1,167 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum HrServiceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "hr_service_requests" })
-export class HrServiceRequest extends BaseModel {
-    @Column({ type: "integer", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_position_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
-    status: HrServiceRequestStatus;
-
-    @Column({ type: "integer", nullable: true })
-    reviewer_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    assigned_to_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    assigned_at: Date | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    // Assignment Decision specific fields
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_employee_name: string;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    current_job_position: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_job_position: string;
-
-    @Column({ type: "date", nullable: false })
-    start_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    end_date: Date;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    assignment_allowance: number | null; // 0-100 percentage
-
-    @Column({ type: "varchar", length: 20, nullable: false })
-    phone_number: string;
-
-    @Column({ type: "text", nullable: false })
-    reason_for_request: string;
-
-    // Replacement tracking fields
-    @Column({ type: "boolean", default: false, nullable: false })
-    is_replaced: boolean;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    replacement_employee_id: string | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    replacement_civil_id_card_number: string | null;
-
-    @Column({ type: "text", nullable: true })
-    replacement_reason: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    replaced_by_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    replaced_at: Date | null;
-
-    constructor(
-        user_id: number,
-        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
-        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
-    ) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.assigned_job_position = assigned_job_position || "";
-        this.start_date = start_date || new Date();
-        this.end_date = end_date || new Date();
-        this.assignment_allowance = assignment_allowance || null;
-        this.phone_number = phone_number || "";
-        this.reason_for_request = reason_for_request || "";
-        this.is_replaced = is_replaced || false;
-        this.replacement_employee_name = replacement_employee_name || null;
-        this.replacement_employee_id = replacement_employee_id || null;
-        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
-        this.replacement_reason = replacement_reason || null;
-        this.replaced_by_user_id = replaced_by_user_id || null;
-        this.replaced_at = replaced_at || null;
-    }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum HrServiceRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "hr_service_requests" })
+export class HrServiceRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
+    status: HrServiceRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // Assignment Decision specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_employee_name: string;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    current_job_position: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_job_position: string;
+
+    @Column({ type: "date", nullable: false })
+    start_date: Date;
+
+    @Column({ type: "date", nullable: false })
+    end_date: Date;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    assignment_allowance: number | null; // 0-100 percentage
+
+    @Column({ type: "varchar", length: 20, nullable: false })
+    phone_number: string;
+
+    @Column({ type: "text", nullable: false })
+    reason_for_request: string;
+
+    // Replacement tracking fields
+    @Column({ type: "boolean", default: false, nullable: false })
+    is_replaced: boolean;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    replacement_employee_id: string | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    replacement_civil_id_card_number: string | null;
+
+    @Column({ type: "text", nullable: true })
+    replacement_reason: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    replaced_by_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    replaced_at: Date | null;
+
+    constructor(
+        user_id: number,
+        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
+        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
+    ) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.assigned_employee_name = assigned_employee_name || "";
+        this.civil_id_card_number = civil_id_card_number || null;
+        this.employee_id = employee_id || "";
+        this.current_job_position = current_job_position || "";
+        this.assigned_job_position = assigned_job_position || "";
+        this.start_date = start_date || new Date();
+        this.end_date = end_date || new Date();
+        this.assignment_allowance = assignment_allowance || null;
+        this.phone_number = phone_number || "";
+        this.reason_for_request = reason_for_request || "";
+        this.is_replaced = is_replaced || false;
+        this.replacement_employee_name = replacement_employee_name || null;
+        this.replacement_employee_id = replacement_employee_id || null;
+        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
+        this.replacement_reason = replacement_reason || null;
+        this.replaced_by_user_id = replaced_by_user_id || null;
+        this.replaced_at = replaced_at || null;
+    }
+}
+

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/LogisticsModel.ts

@@ -34,7 +34,9 @@ export enum Purpose_of_Travel {
 
 export enum Type_of_Vehicle {
   LIGHT = "Light vehicle",
-  HEAVY = "Heavy vehicle"
+  HEAVY = "Heavy vehicle",
+  SEDAN = "Sedan",
+  SUV = "SUV"
 }
 
 export enum Type_of_Request {

package/src/models/PromotionRequestModel.ts

@@ -0,0 +1,120 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum PromotionRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "promotion_requests" })
+export class PromotionRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: PromotionRequestStatus, default: PromotionRequestStatus.PENDING, nullable: false })
+    status: PromotionRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // Promotion Decision specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    current_job_title: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    proposed_job_title: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    current_salary_grade: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    proposed_salary_grade: string;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: false })
+    current_basic_salary: number;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: false })
+    proposed_basic_salary: number;
+
+    constructor(
+        user_id: number,
+        status: PromotionRequestStatus = PromotionRequestStatus.PENDING,
+        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,
+        employee_name?: string,
+        employee_id?: string,
+        current_job_title?: string,
+        proposed_job_title?: string,
+        current_salary_grade?: string,
+        proposed_salary_grade?: string,
+        current_basic_salary?: number,
+        proposed_basic_salary?: number
+    ) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.employee_name = employee_name || "";
+        this.employee_id = employee_id || "";
+        this.current_job_title = current_job_title || "";
+        this.proposed_job_title = proposed_job_title || "";
+        this.current_salary_grade = current_salary_grade || "";
+        this.proposed_salary_grade = proposed_salary_grade || "";
+        this.current_basic_salary = current_basic_salary || 0;
+        this.proposed_basic_salary = proposed_basic_salary || 0;
+    }
+}