@platform-modules/civil-aviation-authority 2.3.173 → 2.3.174

package/dist/models/RespondToEnquiriesRequestModel.d.ts

@@ -0,0 +1,42 @@
+import { BaseModel } from "./BaseModel";
+export declare enum RespondToEnquiriesRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare enum RespondToEnquiriesEnquiryCategory {
+    GENERAL = "general",
+    CANCELLED_TENDER = "cancelled_tender",
+    REFLOATED_TENDER = "refloated_tender"
+}
+export declare class RespondToEnquiriesRequest 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;
+    status: RespondToEnquiriesRequestStatus;
+    reviewer_user_id: number | null;
+    assigned_to_user_id: number | null;
+    assigned_at: Date | null;
+    workflow_execution_id: string | null;
+    reference_number: string | null;
+    title_of_enquiry: string;
+    request_id: string | null;
+    date_of_submission: Date;
+    phone: string;
+    enquiry_category: RespondToEnquiriesEnquiryCategory;
+    tender_date_of_submission: Date | null;
+    tender_phone: string | null;
+    budget_code: string | null;
+    estimated_cost: string | null;
+    implementation_period: string | null;
+    requesting_entity: string | null;
+    relevant_department_id: number | null;
+    constructor(user_id: number, title_of_enquiry: string, description: string, date_of_submission: Date, phone: string, status?: RespondToEnquiriesRequestStatus, 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, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, request_id?: string | null, enquiry_category?: RespondToEnquiriesEnquiryCategory, tender_date_of_submission?: Date | null, tender_phone?: string | null, budget_code?: string | null, estimated_cost?: string | null, implementation_period?: string | null, requesting_entity?: string | null, relevant_department_id?: number | null);
+}

package/dist/models/RespondToEnquiriesRequestModel.js

@@ -0,0 +1,175 @@
+"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.RespondToEnquiriesRequest = exports.RespondToEnquiriesEnquiryCategory = exports.RespondToEnquiriesRequestStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var RespondToEnquiriesRequestStatus;
+(function (RespondToEnquiriesRequestStatus) {
+    RespondToEnquiriesRequestStatus["PENDING"] = "Pending";
+    RespondToEnquiriesRequestStatus["ASSIGNED"] = "Assigned";
+    RespondToEnquiriesRequestStatus["IN_PROGRESS"] = "In Progress";
+    RespondToEnquiriesRequestStatus["COMPLETED"] = "Completed";
+    RespondToEnquiriesRequestStatus["APPROVED"] = "Approved";
+    RespondToEnquiriesRequestStatus["REJECTED"] = "Rejected";
+})(RespondToEnquiriesRequestStatus || (exports.RespondToEnquiriesRequestStatus = RespondToEnquiriesRequestStatus = {}));
+var RespondToEnquiriesEnquiryCategory;
+(function (RespondToEnquiriesEnquiryCategory) {
+    RespondToEnquiriesEnquiryCategory["GENERAL"] = "general";
+    RespondToEnquiriesEnquiryCategory["CANCELLED_TENDER"] = "cancelled_tender";
+    RespondToEnquiriesEnquiryCategory["REFLOATED_TENDER"] = "refloated_tender";
+})(RespondToEnquiriesEnquiryCategory || (exports.RespondToEnquiriesEnquiryCategory = RespondToEnquiriesEnquiryCategory = {}));
+let RespondToEnquiriesRequest = class RespondToEnquiriesRequest extends BaseModel_1.BaseModel {
+    constructor(user_id, title_of_enquiry, description, date_of_submission, phone, status = RespondToEnquiriesRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, request_id, enquiry_category, tender_date_of_submission, tender_phone, budget_code, estimated_cost, implementation_period, requesting_entity, relevant_department_id) {
+        super();
+        this.user_id = user_id;
+        this.title_of_enquiry = title_of_enquiry;
+        this.description = description;
+        this.date_of_submission = date_of_submission;
+        this.phone = phone;
+        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.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.reference_number = null;
+        this.request_id = request_id || null;
+        this.enquiry_category = enquiry_category ?? RespondToEnquiriesEnquiryCategory.GENERAL;
+        this.tender_date_of_submission = tender_date_of_submission ?? null;
+        this.tender_phone = tender_phone ?? null;
+        this.budget_code = budget_code ?? null;
+        this.estimated_cost = estimated_cost ?? null;
+        this.implementation_period = implementation_period ?? null;
+        this.requesting_entity = requesting_entity ?? null;
+        this.relevant_department_id = relevant_department_id ?? null;
+    }
+};
+exports.RespondToEnquiriesRequest = RespondToEnquiriesRequest;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "req_user_position_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], RespondToEnquiriesRequest.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: false }),
+    __metadata("design:type", String)
+], RespondToEnquiriesRequest.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: RespondToEnquiriesRequestStatus,
+        default: RespondToEnquiriesRequestStatus.PENDING,
+        nullable: false
+    }),
+    __metadata("design:type", String)
+], RespondToEnquiriesRequest.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "reviewer_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "assigned_to_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "assigned_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "reference_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: false }),
+    __metadata("design:type", String)
+], RespondToEnquiriesRequest.prototype, "title_of_enquiry", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    __metadata("design:type", Date)
+], RespondToEnquiriesRequest.prototype, "date_of_submission", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: false }),
+    __metadata("design:type", String)
+], RespondToEnquiriesRequest.prototype, "phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: RespondToEnquiriesEnquiryCategory,
+        default: RespondToEnquiriesEnquiryCategory.GENERAL,
+        nullable: false,
+        enumName: "respond_to_enquiries_category_en"
+    }),
+    __metadata("design:type", String)
+], RespondToEnquiriesRequest.prototype, "enquiry_category", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "tender_date_of_submission", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 30, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "tender_phone", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "budget_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 18, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "estimated_cost", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "implementation_period", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 500, nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "requesting_entity", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesRequest.prototype, "relevant_department_id", void 0);
+exports.RespondToEnquiriesRequest = RespondToEnquiriesRequest = __decorate([
+    (0, typeorm_1.Entity)({ name: "respond_to_enquiries_requests" }),
+    __metadata("design:paramtypes", [Number, String, String, Date, String, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, Object, Object, Object, Object, Object, Object, Object])
+], RespondToEnquiriesRequest);

package/dist/models/RespondToEnquiriesWorkflowModel.d.ts

@@ -0,0 +1,19 @@
+import { BaseModel } from "./BaseModel";
+export declare enum RespondToEnquiriesWorkFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending",
+    REJECTED = "Rejected"
+}
+export declare class RespondToEnquiriesWorkFlow extends BaseModel {
+    request_id: number;
+    service_id: number | null;
+    sub_service_id: number | null;
+    order: number | null;
+    content: string;
+    approver_role_id: number | null;
+    approver_user_id: number | null;
+    approved_by: number | null;
+    status: RespondToEnquiriesWorkFlowStatus;
+    constructor(request_id: number, content: string, status: RespondToEnquiriesWorkFlowStatus, service_id?: number | null, sub_service_id?: number | null, order?: number, approver_role_id?: number | null, approver_user_id?: number | null, approved_by?: number | null);
+}

package/dist/models/RespondToEnquiriesWorkflowModel.js

@@ -0,0 +1,82 @@
+"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.RespondToEnquiriesWorkFlow = exports.RespondToEnquiriesWorkFlowStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var RespondToEnquiriesWorkFlowStatus;
+(function (RespondToEnquiriesWorkFlowStatus) {
+    RespondToEnquiriesWorkFlowStatus["COMPLETED"] = "Completed";
+    RespondToEnquiriesWorkFlowStatus["NOT_YET_STARTED"] = "Not Yet Started";
+    RespondToEnquiriesWorkFlowStatus["PENDING"] = "Pending";
+    RespondToEnquiriesWorkFlowStatus["REJECTED"] = "Rejected";
+})(RespondToEnquiriesWorkFlowStatus || (exports.RespondToEnquiriesWorkFlowStatus = RespondToEnquiriesWorkFlowStatus = {}));
+let RespondToEnquiriesWorkFlow = class RespondToEnquiriesWorkFlow extends BaseModel_1.BaseModel {
+    constructor(request_id, content, status, service_id, sub_service_id, order, approver_role_id, approver_user_id, approved_by) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.content = content;
+        this.status = status;
+        this.order = order || null;
+        this.approver_role_id = approver_role_id || null;
+        this.approver_user_id = approver_user_id || null;
+        this.approved_by = approved_by || null;
+    }
+};
+exports.RespondToEnquiriesWorkFlow = RespondToEnquiriesWorkFlow;
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], RespondToEnquiriesWorkFlow.prototype, "request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "order", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], RespondToEnquiriesWorkFlow.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "approver_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "approver_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], RespondToEnquiriesWorkFlow.prototype, "approved_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: RespondToEnquiriesWorkFlowStatus,
+        default: RespondToEnquiriesWorkFlowStatus.PENDING,
+        nullable: false,
+        enumName: "respond_to_enquiries_workflow_status_en"
+    }),
+    __metadata("design:type", String)
+], RespondToEnquiriesWorkFlow.prototype, "status", void 0);
+exports.RespondToEnquiriesWorkFlow = RespondToEnquiriesWorkFlow = __decorate([
+    (0, typeorm_1.Entity)({ name: "respond_to_enquiries_work_flows" }),
+    __metadata("design:paramtypes", [Number, String, String, Object, Object, Number, Object, Object, Object])
+], RespondToEnquiriesWorkFlow);

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/dist/models/Workflows.js

@@ -0,0 +1,31 @@
+"use strict";
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }

package/package.json

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

package/src/data-source.ts

@@ -182,6 +182,11 @@ import { LegalComplaintWorkflow } from './models/LegalComplaintWorkflowModel';
 import { LegalComplaintApproval } from './models/LegalComplaintApprovalModel';
 import { LegalComplaintChat } from './models/LegalComplaintChatModel';
 import { LegalComplaintAttachment } from './models/LegalComplaintAttachmentModel';
+import {RespondToEnquiriesRequest} from './models/RespondToEnquiriesRequestModel';
+import { RespondToEnquiriesWorkFlow } from './models/RespondToEnquiriesWorkflowModel';
+import { RespondToEnquiriesApprovalDetails } from './models/RespondToEnquiriesApprovalModel';
+import { RespondToEnquiriesRequestChat } from './models/RespondToEnquiriesChatModel';
+import { RespondToEnquiriesRequestAttachment } from './models/RespondToEnquiriesAttachmentModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -370,6 +375,11 @@ export const AppDataSource = new DataSource({
     DocumentAuditLog,
     DocumentVersion,
     DocumentAccess,
-    DepartmentDocumentOwner
+    DepartmentDocumentOwner,
+    RespondToEnquiriesRequest,
+    RespondToEnquiriesWorkFlow,
+    RespondToEnquiriesApprovalDetails,
+    RespondToEnquiriesRequestChat,
+    RespondToEnquiriesRequestAttachment
   ],
 });

package/src/index.ts

@@ -391,3 +391,23 @@ export * from './models/LegalComplaintAttachmentModel';
 // Asset Affairs Admin Configuration
 export * from './models/AssetApartmentTypeModel';
 export * from './models/AssetUnitLocationModel';
+
+// Tender — Request a Service to Respond to Enquiries
+export * from './models/RespondToEnquiriesRequestModel';
+export {
+    RespondToEnquiriesRequestStatus,
+    RespondToEnquiriesRequest,
+    RespondToEnquiriesEnquiryCategory
+} from './models/RespondToEnquiriesRequestModel';
+export * from './models/RespondToEnquiriesApprovalModel';
+export {RespondToEnquiriesApprovalStatus, RespondToEnquiriesApprovalDetails} from './models/RespondToEnquiriesApprovalModel';
+export * from './models/RespondToEnquiriesChatModel';
+export {
+    RespondToEnquiriesMessageType,
+    RespondToEnquiriesChatStatus,
+    RespondToEnquiriesRequestChat
+} from './models/RespondToEnquiriesChatModel';
+export * from './models/RespondToEnquiriesWorkflowModel';
+export {RespondToEnquiriesWorkFlowStatus, RespondToEnquiriesWorkFlow} from './models/RespondToEnquiriesWorkflowModel';
+export * from './models/RespondToEnquiriesAttachmentModel';
+export {RespondToEnquiriesRequestAttachment} from './models/RespondToEnquiriesAttachmentModel';

package/src/models/AccommodationApprovalModel.ts

@@ -35,14 +35,14 @@ export class AccommodationApproval extends BaseModel {
     @Column({ type: 'int', nullable: true })
     department_id: number;
 
-    @Column({ type: 'int', nullable: true })
-    section_id: number;
-
-    @Column({ type: 'boolean', nullable: false, default: true })
-    is_allowed: boolean;
-
-    @Column({ type: 'int', nullable: false })
-    level: number;
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'boolean', nullable: false, default: true })
+    is_allowed: boolean;
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
 
     @Column({ 
         type: 'enum', 

package/src/models/AccommodationRequestModel.ts

@@ -134,14 +134,14 @@ export class AccommodationRequest extends BaseModel {
     @Column({ type: 'int', nullable: true })
     assigned_to_user_id: number | null;
 
-    @Column({ type: 'text', nullable: true })
-    approver_comment: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    accommodation_allocated: string | null;
-
-    @Column({ type: 'int', nullable: true })
-    approved_by: number | null;
+    @Column({ type: 'text', nullable: true })
+    approver_comment: string | null;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    accommodation_allocated: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number | null;
 
     @Column({ type: 'date', nullable: true })
     approved_at: Date | null;

package/src/models/AnnualIncrementRequestEmployeeModel.ts

@@ -1,65 +1,65 @@
-import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
-
-@Entity({ name: "annual_increment_request_employees" })
-export class AnnualIncrementRequestEmployee extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    request_id: number;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    employee_name: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "integer", nullable: false })
-    allowance_year: number;
-
-    @Column({ type: "date", nullable: false })
-    effective_date: Date;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    current_basic_salary: number | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    increment_percentage: number | null;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    new_basic_salary: number | null;
-
-    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
-    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
-    request: AnnualIncrementRequest;
-
-    constructor(
-        request_id: number,
-        employee_name: string,
-        employee_id: string,
-        allowance_year: number,
-        effective_date: Date,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        current_basic_salary?: number | null,
-        increment_percentage?: number | null,
-        new_basic_salary?: number | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
-        this.employee_name = employee_name;
-        this.employee_id = employee_id;
-        this.allowance_year = allowance_year;
-        this.effective_date = effective_date;
-        this.current_basic_salary = current_basic_salary ?? null;
-        this.increment_percentage = increment_percentage ?? null;
-        this.new_basic_salary = new_basic_salary ?? null;
-    }
-}
+import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
+
+@Entity({ name: "annual_increment_request_employees" })
+export class AnnualIncrementRequestEmployee extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "integer", nullable: false })
+    allowance_year: number;
+
+    @Column({ type: "date", nullable: false })
+    effective_date: Date;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    increment_percentage: number | null;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    new_basic_salary: number | null;
+
+    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
+    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
+    request: AnnualIncrementRequest;
+
+    constructor(
+        request_id: number,
+        employee_name: string,
+        employee_id: string,
+        allowance_year: number,
+        effective_date: Date,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        current_basic_salary?: number | null,
+        increment_percentage?: number | null,
+        new_basic_salary?: number | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.employee_name = employee_name;
+        this.employee_id = employee_id;
+        this.allowance_year = allowance_year;
+        this.effective_date = effective_date;
+        this.current_basic_salary = current_basic_salary ?? null;
+        this.increment_percentage = increment_percentage ?? null;
+        this.new_basic_salary = new_basic_salary ?? null;
+    }
+}