@platform-modules/civil-aviation-authority 2.3.101 → 2.3.102

package/dist/data-source.js

@@ -141,6 +141,11 @@ const ResidentialUnitRentalWorkflowModel_1 = require("./models/ResidentialUnitRe
 const ResidentialUnitRentalApprovalModel_1 = require("./models/ResidentialUnitRentalApprovalModel");
 const ResidentialUnitRentalChatModel_1 = require("./models/ResidentialUnitRentalChatModel");
 const ResidentialUnitRentalAttachmentModel_1 = require("./models/ResidentialUnitRentalAttachmentModel");
+const AccommodationRequestModel_1 = require("./models/AccommodationRequestModel");
+const AccommodationWorkflowModel_1 = require("./models/AccommodationWorkflowModel");
+const AccommodationApprovalModel_1 = require("./models/AccommodationApprovalModel");
+const AccommodationChatModel_1 = require("./models/AccommodationChatModel");
+const AccommodationAttachmentModel_1 = require("./models/AccommodationAttachmentModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -280,6 +285,11 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ResidentialUnitRentalApprovalModel_1.ResidentialUnitRentalApproval,
         ResidentialUnitRentalChatModel_1.ResidentialUnitRentalChat,
         ResidentialUnitRentalAttachmentModel_1.ResidentialUnitRentalAttachment,
+        AccommodationRequestModel_1.AccommodationRequest,
+        AccommodationWorkflowModel_1.AccommodationWorkflow,
+        AccommodationApprovalModel_1.AccommodationApproval,
+        AccommodationChatModel_1.AccommodationChat,
+        AccommodationAttachmentModel_1.AccommodationAttachment,
         DocumentModel_1.Document,
         DocumentFolderModel_1.DocumentFolder,
         DocumentTypeModel_1.DocumentType,

package/dist/index.d.ts

@@ -226,6 +226,11 @@ export * from './models/ResidentialUnitRentalWorkflowModel';
 export * from './models/ResidentialUnitRentalApprovalModel';
 export * from './models/ResidentialUnitRentalChatModel';
 export * from './models/ResidentialUnitRentalAttachmentModel';
+export * from './models/AccommodationRequestModel';
+export * from './models/AccommodationWorkflowModel';
+export * from './models/AccommodationApprovalModel';
+export * from './models/AccommodationChatModel';
+export * from './models/AccommodationAttachmentModel';
 export * from './models/HousingContractRenewalRequestModel';
 export * from './models/HousingContractRenewalWorkflowModel';
 export * from './models/HousingContractRenewalApprovalModel';

package/dist/index.js

@@ -342,6 +342,12 @@ __exportStar(require("./models/ResidentialUnitRentalWorkflowModel"), exports);
 __exportStar(require("./models/ResidentialUnitRentalApprovalModel"), exports);
 __exportStar(require("./models/ResidentialUnitRentalChatModel"), exports);
 __exportStar(require("./models/ResidentialUnitRentalAttachmentModel"), exports);
+// Accommodation Request Service (Request for Accommodation in Muscat Governorate)
+__exportStar(require("./models/AccommodationRequestModel"), exports);
+__exportStar(require("./models/AccommodationWorkflowModel"), exports);
+__exportStar(require("./models/AccommodationApprovalModel"), exports);
+__exportStar(require("./models/AccommodationChatModel"), exports);
+__exportStar(require("./models/AccommodationAttachmentModel"), exports);
 // Housing Contract Renewal (CAA042)
 __exportStar(require("./models/HousingContractRenewalRequestModel"), exports);
 __exportStar(require("./models/HousingContractRenewalWorkflowModel"), exports);

package/dist/models/AccommodationApprovalModel.d.ts

@@ -0,0 +1,24 @@
+import { BaseModel } from "./BaseModel";
+export declare enum AccommodationApprovalStatus {
+    PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    ASSIGNED = "Assigned"
+}
+export declare class AccommodationApproval extends BaseModel {
+    request_id: number;
+    service_id: number;
+    sub_service_id: number;
+    approver_role_id: number;
+    approver_user_id: number;
+    delegate_user_id: number;
+    approved_by: number;
+    department_id: number;
+    section_id: number;
+    level: number;
+    approval_status: AccommodationApprovalStatus;
+    comment: string;
+    created_by: number;
+    constructor();
+}

package/dist/models/AccommodationApprovalModel.js

@@ -0,0 +1,89 @@
+"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.AccommodationApproval = exports.AccommodationApprovalStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var AccommodationApprovalStatus;
+(function (AccommodationApprovalStatus) {
+    AccommodationApprovalStatus["PENDING"] = "Pending";
+    AccommodationApprovalStatus["IN_PROGRESS"] = "In Progress";
+    AccommodationApprovalStatus["APPROVED"] = "Approved";
+    AccommodationApprovalStatus["REJECTED"] = "Rejected";
+    AccommodationApprovalStatus["ASSIGNED"] = "Assigned";
+})(AccommodationApprovalStatus || (exports.AccommodationApprovalStatus = AccommodationApprovalStatus = {}));
+let AccommodationApproval = class AccommodationApproval extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.AccommodationApproval = AccommodationApproval;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "approver_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "approver_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "delegate_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: AccommodationApprovalStatus,
+        default: AccommodationApprovalStatus.PENDING,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AccommodationApproval.prototype, "approval_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], AccommodationApproval.prototype, "comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationApproval.prototype, "created_by", void 0);
+exports.AccommodationApproval = AccommodationApproval = __decorate([
+    (0, typeorm_1.Entity)({ name: 'accommodation_approvals' }),
+    __metadata("design:paramtypes", [])
+], AccommodationApproval);

package/dist/models/AccommodationAttachmentModel.d.ts

@@ -0,0 +1,16 @@
+import { BaseModel } from "./BaseModel";
+export declare class AccommodationAttachment extends BaseModel {
+    request_id: number;
+    service_id: number;
+    sub_service_id: number;
+    file_name: string;
+    file_url: string;
+    file_type: string;
+    file_size: number;
+    mime_type: string;
+    file_path: string;
+    description: string;
+    uploaded_by: number;
+    created_by: number;
+    constructor();
+}

package/dist/models/AccommodationAttachmentModel.js

@@ -0,0 +1,72 @@
+"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.AccommodationAttachment = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let AccommodationAttachment = class AccommodationAttachment extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.AccommodationAttachment = AccommodationAttachment;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "file_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "file_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "file_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "file_size", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "mime_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "file_path", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], AccommodationAttachment.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "uploaded_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationAttachment.prototype, "created_by", void 0);
+exports.AccommodationAttachment = AccommodationAttachment = __decorate([
+    (0, typeorm_1.Entity)({ name: 'accommodation_attachments' }),
+    __metadata("design:paramtypes", [])
+], AccommodationAttachment);

package/dist/models/AccommodationChatModel.d.ts

@@ -0,0 +1,21 @@
+import { BaseModel } from "./BaseModel";
+export declare enum AccommodationMessageType {
+    text = "text",
+    image = "image",
+    video = "video",
+    file = "file",
+    link = "link"
+}
+export declare class AccommodationChat extends BaseModel {
+    request_id: number;
+    service_id: number;
+    sub_service_id: number;
+    user_id: number;
+    message: string;
+    message_type: string;
+    is_internal: boolean;
+    approver_role_id: number;
+    status: string;
+    created_by: number;
+    constructor();
+}

package/dist/models/AccommodationChatModel.js

@@ -0,0 +1,72 @@
+"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.AccommodationChat = exports.AccommodationMessageType = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var AccommodationMessageType;
+(function (AccommodationMessageType) {
+    AccommodationMessageType["text"] = "text";
+    AccommodationMessageType["image"] = "image";
+    AccommodationMessageType["video"] = "video";
+    AccommodationMessageType["file"] = "file";
+    AccommodationMessageType["link"] = "link";
+})(AccommodationMessageType || (exports.AccommodationMessageType = AccommodationMessageType = {}));
+let AccommodationChat = class AccommodationChat extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.AccommodationChat = AccommodationChat;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], AccommodationChat.prototype, "message", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationChat.prototype, "message_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', nullable: false, default: false }),
+    __metadata("design:type", Boolean)
+], AccommodationChat.prototype, "is_internal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "approver_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", String)
+], AccommodationChat.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationChat.prototype, "created_by", void 0);
+exports.AccommodationChat = AccommodationChat = __decorate([
+    (0, typeorm_1.Entity)({ name: 'accommodation_chat' }),
+    __metadata("design:paramtypes", [])
+], AccommodationChat);

package/dist/models/AccommodationRequestModel.d.ts

@@ -0,0 +1,55 @@
+import { BaseModel } from "./BaseModel";
+export declare enum AccommodationRequestStatus {
+    Pending = "Pending",
+    Approved = "Approved",
+    Rejected = "Rejected",
+    InProgress = "In Progress",
+    Assigned = "Assigned",
+    Completed = "Completed"
+}
+export declare enum OfficialPurposeOfTravel {
+    Workshop = "Workshop",
+    Training = "Training",
+    DutyMission = "Duty Mission",
+    Assignment = "Assignment",
+    Other = "Other"
+}
+export declare enum AccommodationType {
+    Apartment = "Apartment",
+    Villa = "Villa",
+    SharedUnit = "Shared Unit"
+}
+export declare class AccommodationRequest extends BaseModel {
+    reference_number: string | null;
+    req_user_department_id: number | null;
+    req_user_section_id: number | null;
+    service_id: number;
+    sub_service_id: number;
+    workflow_execution_id: string | null;
+    user_id: number;
+    created_by: number;
+    official_purpose_of_travel: OfficialPurposeOfTravel;
+    other_purpose_specification: string | null;
+    accommodation_type_requested: AccommodationType;
+    start_date_of_stay: Date;
+    duration_of_days: number;
+    travel_from: string;
+    travel_to: string;
+    time_of_arrival: string;
+    travelling_from_region: string;
+    number_of_employees_travelling: number;
+    employee_details: Array<{
+        employee_id: string;
+        employee_name: string;
+        designation: string;
+        grade: string;
+        contact_number: string;
+    }>;
+    status: AccommodationRequestStatus;
+    description: string | null;
+    assigned_to_user_id: number | null;
+    approver_comment: string | null;
+    approved_by: number | null;
+    approved_at: Date | null;
+    constructor();
+}

package/dist/models/AccommodationRequestModel.js

@@ -0,0 +1,160 @@
+"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.AccommodationRequest = exports.AccommodationType = exports.OfficialPurposeOfTravel = exports.AccommodationRequestStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var AccommodationRequestStatus;
+(function (AccommodationRequestStatus) {
+    AccommodationRequestStatus["Pending"] = "Pending";
+    AccommodationRequestStatus["Approved"] = "Approved";
+    AccommodationRequestStatus["Rejected"] = "Rejected";
+    AccommodationRequestStatus["InProgress"] = "In Progress";
+    AccommodationRequestStatus["Assigned"] = "Assigned";
+    AccommodationRequestStatus["Completed"] = "Completed";
+})(AccommodationRequestStatus || (exports.AccommodationRequestStatus = AccommodationRequestStatus = {}));
+var OfficialPurposeOfTravel;
+(function (OfficialPurposeOfTravel) {
+    OfficialPurposeOfTravel["Workshop"] = "Workshop";
+    OfficialPurposeOfTravel["Training"] = "Training";
+    OfficialPurposeOfTravel["DutyMission"] = "Duty Mission";
+    OfficialPurposeOfTravel["Assignment"] = "Assignment";
+    OfficialPurposeOfTravel["Other"] = "Other";
+})(OfficialPurposeOfTravel || (exports.OfficialPurposeOfTravel = OfficialPurposeOfTravel = {}));
+var AccommodationType;
+(function (AccommodationType) {
+    AccommodationType["Apartment"] = "Apartment";
+    AccommodationType["Villa"] = "Villa";
+    AccommodationType["SharedUnit"] = "Shared Unit";
+})(AccommodationType || (exports.AccommodationType = AccommodationType = {}));
+let AccommodationRequest = class AccommodationRequest extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.AccommodationRequest = AccommodationRequest;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "reference_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: OfficialPurposeOfTravel,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "official_purpose_of_travel", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "other_purpose_specification", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: AccommodationType,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "accommodation_type_requested", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], AccommodationRequest.prototype, "start_date_of_stay", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "duration_of_days", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "travel_from", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "travel_to", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "time_of_arrival", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "travelling_from_region", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationRequest.prototype, "number_of_employees_travelling", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'json', nullable: false }),
+    __metadata("design:type", Array)
+], AccommodationRequest.prototype, "employee_details", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: AccommodationRequestStatus,
+        default: AccommodationRequestStatus.Pending,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AccommodationRequest.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "assigned_to_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "approver_comment", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], AccommodationRequest.prototype, "approved_at", void 0);
+exports.AccommodationRequest = AccommodationRequest = __decorate([
+    (0, typeorm_1.Entity)({ name: 'accommodation_requests' }),
+    __metadata("design:paramtypes", [])
+], AccommodationRequest);

package/dist/models/AccommodationWorkflowModel.d.ts

@@ -0,0 +1,29 @@
+import { BaseModel } from "./BaseModel";
+export declare enum AccommodationWorkFlowStatus {
+    Pending = "Pending",
+    InProgress = "In Progress",
+    Approved = "Approved",
+    Rejected = "Rejected",
+    Completed = "Completed"
+}
+export declare class AccommodationWorkflow extends BaseModel {
+    request_id: number;
+    service_id: number;
+    sub_service_id: number;
+    workflow_definition_id: number;
+    current_level: number;
+    content: string;
+    status: AccommodationWorkFlowStatus;
+    step_order: number;
+    order: number;
+    user_id: number;
+    role_id: number;
+    approver_role_id: number;
+    approver_user_id: number;
+    approved_by: number;
+    department_id: number;
+    section_id: number;
+    workflow_data: string;
+    created_by: number;
+    constructor();
+}

package/dist/models/AccommodationWorkflowModel.js

@@ -0,0 +1,109 @@
+"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.AccommodationWorkflow = exports.AccommodationWorkFlowStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var AccommodationWorkFlowStatus;
+(function (AccommodationWorkFlowStatus) {
+    AccommodationWorkFlowStatus["Pending"] = "Pending";
+    AccommodationWorkFlowStatus["InProgress"] = "In Progress";
+    AccommodationWorkFlowStatus["Approved"] = "Approved";
+    AccommodationWorkFlowStatus["Rejected"] = "Rejected";
+    AccommodationWorkFlowStatus["Completed"] = "Completed";
+})(AccommodationWorkFlowStatus || (exports.AccommodationWorkFlowStatus = AccommodationWorkFlowStatus = {}));
+let AccommodationWorkflow = class AccommodationWorkflow extends BaseModel_1.BaseModel {
+    constructor() {
+        super();
+    }
+};
+exports.AccommodationWorkflow = AccommodationWorkflow;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "workflow_definition_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "current_level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
+    __metadata("design:type", String)
+], AccommodationWorkflow.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: 'enum',
+        enum: AccommodationWorkFlowStatus,
+        default: AccommodationWorkFlowStatus.Pending,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], AccommodationWorkflow.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "step_order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "approver_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "approver_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], AccommodationWorkflow.prototype, "workflow_data", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], AccommodationWorkflow.prototype, "created_by", void 0);
+exports.AccommodationWorkflow = AccommodationWorkflow = __decorate([
+    (0, typeorm_1.Entity)({ name: 'accommodation_workflow' }),
+    __metadata("design:paramtypes", [])
+], AccommodationWorkflow);

package/dist/models/ShiftAllowanceRequestModel.d.ts

@@ -8,9 +8,9 @@ export declare enum ShiftAllowanceRequestStatus {
     REJECTED = "Rejected"
 }
 export declare enum ShiftAllowanceValue {
-    TWENTY_TWO_PERCENT = "22%",
-    THIRTY_PERCENT = "30%",
-    SEVENTY_PERCENT = "70%"
+    TWENTY_TWO_PERCENT = "22",
+    THIRTY_PERCENT = "30",
+    SEVENTY_PERCENT = "70"
 }
 export declare class ShiftAllowanceRequest extends BaseModel {
     req_user_department_id: number | null;

package/dist/models/ShiftAllowanceRequestModel.js

@@ -23,9 +23,9 @@ var ShiftAllowanceRequestStatus;
 })(ShiftAllowanceRequestStatus || (exports.ShiftAllowanceRequestStatus = ShiftAllowanceRequestStatus = {}));
 var ShiftAllowanceValue;
 (function (ShiftAllowanceValue) {
-    ShiftAllowanceValue["TWENTY_TWO_PERCENT"] = "22%";
-    ShiftAllowanceValue["THIRTY_PERCENT"] = "30%";
-    ShiftAllowanceValue["SEVENTY_PERCENT"] = "70%";
+    ShiftAllowanceValue["TWENTY_TWO_PERCENT"] = "22";
+    ShiftAllowanceValue["THIRTY_PERCENT"] = "30";
+    ShiftAllowanceValue["SEVENTY_PERCENT"] = "70";
 })(ShiftAllowanceValue || (exports.ShiftAllowanceValue = ShiftAllowanceValue = {}));
 let ShiftAllowanceRequest = class ShiftAllowanceRequest extends BaseModel_1.BaseModel {
     constructor(user_id, status = ShiftAllowanceRequestStatus.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, job_title, financial_grade, allowance_value, shift_start_date, shift_end_date, start_time, end_time, reason_for_request) {

package/package.json

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

package/src/data-source.ts

@@ -128,17 +128,22 @@ import { RequestForCoverageWorkFlow } from './models/RequestForCoverageWorkflowM
 import { RequestForCoverageApprovalDetails } from './models/RequestForCoverageApprovalModel';
 import { RequestForCoverageRequestChat } from './models/RequestForCoverageChatModel';
 import { RequestForCoverageRequestAttachment } from './models/RequestForCoverageAttachmentModel';
-import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
-import { PromotionRequest } from './models/PromotionRequestModel';
-import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
-import { AnnualIncrementRequestEmployee } from './models/AnnualIncrementRequestEmployeeModel';
-import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
+import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
+import { PromotionRequest } from './models/PromotionRequestModel';
+import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
+import { AnnualIncrementRequestEmployee } from './models/AnnualIncrementRequestEmployeeModel';
+import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
 import { CityMaster } from './models/CityMasterModel';
 import { ResidentialUnitRentalRequest } from './models/ResidentialUnitRentalRequestModel';
 import { ResidentialUnitRentalWorkflow } from './models/ResidentialUnitRentalWorkflowModel';
 import { ResidentialUnitRentalApproval } from './models/ResidentialUnitRentalApprovalModel';
 import { ResidentialUnitRentalChat } from './models/ResidentialUnitRentalChatModel';
 import { ResidentialUnitRentalAttachment } from './models/ResidentialUnitRentalAttachmentModel';
+import { AccommodationRequest } from './models/AccommodationRequestModel';
+import { AccommodationWorkflow } from './models/AccommodationWorkflowModel';
+import { AccommodationApproval } from './models/AccommodationApprovalModel';
+import { AccommodationChat } from './models/AccommodationChatModel';
+import { AccommodationAttachment } from './models/AccommodationAttachmentModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -268,17 +273,22 @@ export const AppDataSource = new DataSource({
     AssignTasksEmpWorkFlow,
     AssignTasksEmpRequestAttachment,
     AssignTasksEmpRequestChat,
-    CashAllowanceLeaveRequest,
-    PromotionRequest,
-    AnnualIncrementRequest,
-    AnnualIncrementRequestEmployee,
-    SkillsEnhancementRequest,
+    CashAllowanceLeaveRequest,
+    PromotionRequest,
+    AnnualIncrementRequest,
+    AnnualIncrementRequestEmployee,
+    SkillsEnhancementRequest,
     CityMaster,
     ResidentialUnitRentalRequest,
     ResidentialUnitRentalWorkflow,
     ResidentialUnitRentalApproval,
     ResidentialUnitRentalChat,
     ResidentialUnitRentalAttachment,
+    AccommodationRequest,
+    AccommodationWorkflow,
+    AccommodationApproval,
+    AccommodationChat,
+    AccommodationAttachment,
     Document,
     DocumentFolder,
     DocumentType,

package/src/index.ts

@@ -240,12 +240,12 @@ export * from './models/AnnualIncrementRequestEmployeeModel';
 export * from './models/SkillsEnhancementRequestModel';
 export { SkillsEnhancementRequestStatus } from './models/SkillsEnhancementRequestModel';
 
-// Performance Management Service
-export * from './models/PerformanceManagementRequestModel';
-export { PerformanceManagementRequestStatus, PerformanceManagementCyclePeriod } from './models/PerformanceManagementRequestModel';
-export * from './models/PerformanceManagementRequestGoalModel';
-export * from './models/PerformanceCyclePeriodModel';
-export * from './models/PerformanceGoalMasterModel';
+// Performance Management Service
+export * from './models/PerformanceManagementRequestModel';
+export { PerformanceManagementRequestStatus, PerformanceManagementCyclePeriod } from './models/PerformanceManagementRequestModel';
+export * from './models/PerformanceManagementRequestGoalModel';
+export * from './models/PerformanceCyclePeriodModel';
+export * from './models/PerformanceGoalMasterModel';
 
 // Human Resource Annual Planning Service
 export * from './models/HumanResourceAnnualPlanningRequestModel';
@@ -268,6 +268,13 @@ export * from './models/ResidentialUnitRentalApprovalModel';
 export * from './models/ResidentialUnitRentalChatModel';
 export * from './models/ResidentialUnitRentalAttachmentModel';
 
+// Accommodation Request Service (Request for Accommodation in Muscat Governorate)
+export * from './models/AccommodationRequestModel';
+export * from './models/AccommodationWorkflowModel';
+export * from './models/AccommodationApprovalModel';
+export * from './models/AccommodationChatModel';
+export * from './models/AccommodationAttachmentModel';
+
 // Housing Contract Renewal (CAA042)
 export * from './models/HousingContractRenewalRequestModel';
 export * from './models/HousingContractRenewalWorkflowModel';
@@ -280,4 +287,4 @@ export * from './models/HousingContractCancelRequestModel';
 export * from './models/HousingContractCancelWorkflowModel';
 export * from './models/HousingContractCancelApprovalModel';
 export * from './models/HousingContractCancelChatModel';
-export * from './models/HousingContractCancelAttachmentModel';
+export * from './models/HousingContractCancelAttachmentModel';

package/src/models/AccommodationApprovalModel.ts

@@ -0,0 +1,61 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AccommodationApprovalStatus {
+    PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    ASSIGNED = "Assigned"
+}
+
+@Entity({ name: 'accommodation_approvals' })
+export class AccommodationApproval extends BaseModel {
+    @Column({ type: 'int', nullable: false })
+    request_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    service_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    sub_service_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approver_role_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approver_user_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    delegate_user_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number;
+
+    @Column({ type: 'int', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
+
+    @Column({ 
+        type: 'enum', 
+        enum: AccommodationApprovalStatus, 
+        default: AccommodationApprovalStatus.PENDING, 
+        nullable: false 
+    })
+    approval_status: AccommodationApprovalStatus;
+
+    @Column({ type: 'text', nullable: true })
+    comment: string;
+
+    @Column({ type: 'int', nullable: false })
+    created_by: number;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/AccommodationAttachmentModel.ts

@@ -0,0 +1,45 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: 'accommodation_attachments' })
+export class AccommodationAttachment extends BaseModel {
+    @Column({ type: 'int', nullable: false })
+    request_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    service_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    sub_service_id: number;
+
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    file_name: string;
+
+    @Column({ type: 'varchar', length: 500, nullable: false })
+    file_url: string;
+
+    @Column({ type: 'varchar', length: 50, nullable: false })
+    file_type: string;
+
+    @Column({ type: 'int', nullable: false })
+    file_size: number;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    mime_type: string;
+
+    @Column({ type: 'varchar', length: 500, nullable: true })
+    file_path: string;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    @Column({ type: 'int', nullable: false })
+    uploaded_by: number;
+
+    @Column({ type: 'int', nullable: false })
+    created_by: number;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/AccommodationChatModel.ts

@@ -0,0 +1,47 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AccommodationMessageType {
+    text = 'text',
+    image = 'image',
+    video = 'video',
+    file = 'file',
+    link = 'link'
+}
+
+@Entity({ name: 'accommodation_chat' })
+export class AccommodationChat extends BaseModel {
+    @Column({ type: 'int', nullable: false })
+    request_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    service_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    sub_service_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'varchar', length: 20, nullable: false })
+    message_type: string; // text, image, video, file, link
+
+    @Column({ type: 'boolean', nullable: false, default: false })
+    is_internal: boolean;
+
+    @Column({ type: 'int', nullable: true })
+    approver_role_id: number;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    status: string; // Submitted, Pending, Approved, Rejected
+
+    @Column({ type: 'int', nullable: false })
+    created_by: number;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/AccommodationRequestModel.ts

@@ -0,0 +1,140 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AccommodationRequestStatus {
+    Pending = 'Pending',
+    Approved = 'Approved',
+    Rejected = 'Rejected',
+    InProgress = 'In Progress',
+    Assigned = 'Assigned',
+    Completed = 'Completed'
+}
+
+export enum OfficialPurposeOfTravel {
+    Workshop = 'Workshop',
+    Training = 'Training',
+    DutyMission = 'Duty Mission',
+    Assignment = 'Assignment',
+    Other = 'Other'
+}
+
+export enum AccommodationType {
+    Apartment = 'Apartment',
+    Villa = 'Villa',
+    SharedUnit = 'Shared Unit'
+}
+
+@Entity({ name: 'accommodation_requests' })
+export class AccommodationRequest extends BaseModel {
+    // Request ID - Auto generated
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    reference_number: string | null;
+
+    // Workflow fields
+    @Column({ type: 'int', nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: 'int', nullable: false })
+    service_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    sub_service_id: number;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // User fields
+    @Column({ type: 'int', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    created_by: number;
+
+    // 2. Official Purpose of Travel (Workshop / Training / Duty Mission / Assignment / Other – specify)
+    @Column({ 
+        type: 'enum', 
+        enum: OfficialPurposeOfTravel, 
+        nullable: false 
+    })
+    official_purpose_of_travel: OfficialPurposeOfTravel;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    other_purpose_specification: string | null; // If Other is selected
+
+    // 3. Accommodation Type Requested (Apartment / Villa / Shared Unit)
+    @Column({ 
+        type: 'enum', 
+        enum: AccommodationType, 
+        nullable: false 
+    })
+    accommodation_type_requested: AccommodationType;
+
+    // 4. Start Date of Stay (M)
+    @Column({ type: 'date', nullable: false })
+    start_date_of_stay: Date;
+
+    // 5. Duration of Days (M)
+    @Column({ type: 'int', nullable: false })
+    duration_of_days: number;
+
+    // 6. Travel Details (From – To)
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    travel_from: string;
+
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    travel_to: string;
+
+    // 7. Time of arrival (M)
+    @Column({ type: 'time', nullable: false })
+    time_of_arrival: string; // Format: HH:MM
+
+    // 8. Travelling from which region (M)
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    travelling_from_region: string;
+
+    // 9. No. of employees travelling (M)
+    @Column({ type: 'int', nullable: false })
+    number_of_employees_travelling: number;
+
+    // 10. Details of employee Emp id / Name / Designation/ Grade/ Contact Number
+    @Column({ type: 'json', nullable: false })
+    employee_details: Array<{
+        employee_id: string;
+        employee_name: string;
+        designation: string;
+        grade: string;
+        contact_number: string;
+    }>;
+
+    // Status
+    @Column({ 
+        type: 'enum', 
+        enum: AccommodationRequestStatus, 
+        default: AccommodationRequestStatus.Pending,
+        nullable: false 
+    })
+    status: AccommodationRequestStatus;
+
+    // Additional fields
+    @Column({ type: 'text', nullable: true })
+    description: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: 'text', nullable: true })
+    approver_comment: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number | null;
+
+    @Column({ type: 'date', nullable: true })
+    approved_at: Date | null;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/AccommodationWorkflowModel.ts

@@ -0,0 +1,76 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AccommodationWorkFlowStatus {
+    Pending = 'Pending',
+    InProgress = 'In Progress',
+    Approved = 'Approved',
+    Rejected = 'Rejected',
+    Completed = 'Completed'
+}
+
+@Entity({ name: 'accommodation_workflow' })
+export class AccommodationWorkflow extends BaseModel {
+    @Column({ type: 'int', nullable: false })
+    request_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    service_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    sub_service_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    workflow_definition_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    current_level: number;
+
+    @Column({ type: 'varchar', length: 500, nullable: true })
+    content: string;
+
+    @Column({ 
+        type: 'enum', 
+        enum: AccommodationWorkFlowStatus, 
+        default: AccommodationWorkFlowStatus.Pending,
+        nullable: false 
+    })
+    status: AccommodationWorkFlowStatus;
+
+    @Column({ type: 'int', nullable: true })
+    step_order: number;
+
+    @Column({ type: 'int', nullable: true })
+    order: number;
+
+    @Column({ type: 'int', nullable: true })
+    user_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    role_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approver_role_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approver_user_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number;
+
+    @Column({ type: 'int', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'text', nullable: true })
+    workflow_data: string; // JSON string
+
+    @Column({ type: 'int', nullable: false })
+    created_by: number;
+
+    constructor() {
+        super();
+    }
+}

package/src/models/ShiftAllowanceRequestModel.ts

@@ -11,9 +11,9 @@ export enum ShiftAllowanceRequestStatus {
 }
 
 export enum ShiftAllowanceValue {
-    TWENTY_TWO_PERCENT = "22%",
-    THIRTY_PERCENT = "30%",
-    SEVENTY_PERCENT = "70%"
+    TWENTY_TWO_PERCENT = "22",
+    THIRTY_PERCENT = "30",
+    SEVENTY_PERCENT = "70"
 }
 
 @Entity({ name: "shift_allowance_requests" })