@platform-modules/civil-aviation-authority 2.0.24 → 2.0.26

package/.env

@@ -1,11 +1,5 @@
-# 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_USER=postgres_admin_user
-DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+DB_HOST=localhost
+DB_PORT=5433
+DB_USER=postgres
+DB_PASS=123
 DB_NAME=CAA

package/dist/data-source.js

@@ -42,8 +42,7 @@ const LogisticsAttachmentModel_1 = require("./models/LogisticsAttachmentModel");
 const LogisticsWorkflowModel_1 = require("./models/LogisticsWorkflowModel");
 const importantLinksModel_1 = require("./models/importantLinksModel");
 const DelegateSettingsModel_1 = require("./models/DelegateSettingsModel");
-const feedbackModel_1 = require("./models/feedbackModel");
-const PortalFeedbackModel_1 = require("./models/PortalFeedbackModel");
+const HotelreservationModel_1 = require("./models/HotelreservationModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -90,7 +89,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         LogisticsWorkflowModel_1.LogisticsWorkFlow,
         importantLinksModel_1.ImportantLinks,
         DelegateSettingsModel_1.DelegateSettings,
-        feedbackModel_1.Feedback,
-        PortalFeedbackModel_1.PortalFeedback
+        HotelreservationModel_1.HotelReservation
     ],
 });

package/dist/index.d.ts

@@ -34,5 +34,4 @@ export * from './models/LogisticsAttachmentModel';
 export * from './models/importantLinksModel';
 export * from './models/LogisticsWorkflowModel';
 export * from './models/DelegateSettingsModel';
-export * from './models/feedbackModel';
-export * from './models/PortalFeedbackModel';
+export * from './models/HotelreservationModel';

package/dist/index.js

@@ -51,5 +51,4 @@ __exportStar(require("./models/LogisticsAttachmentModel"), exports);
 __exportStar(require("./models/importantLinksModel"), exports);
 __exportStar(require("./models/LogisticsWorkflowModel"), exports);
 __exportStar(require("./models/DelegateSettingsModel"), exports);
-__exportStar(require("./models/feedbackModel"), exports);
-__exportStar(require("./models/PortalFeedbackModel"), exports);
+__exportStar(require("./models/HotelreservationModel"), exports);

package/dist/models/HotelreservationModal.d.ts

@@ -0,0 +1,30 @@
+import { BaseModel } from './BaseModel';
+export declare enum MealType {
+    BREAKFAST = "Breakfast",
+    LUNCH = "Lunch",
+    DINNER = "Dinner"
+}
+export declare enum ServiceTypes {
+    LAUNDRY = "Laundry",
+    TELEPHONE = "Telephone Service"
+}
+export declare class HotelReservation extends BaseModel {
+    type_of_accommodation: string;
+    price: number;
+    meal: MealType;
+    service: ServiceTypes;
+    date_of_request: Date;
+    hotel_name: string;
+    check_in_date: Date;
+    check_in_time: string;
+    check_out_date: Date;
+    check_out_time: string;
+    number_of_guests: number;
+    description: string;
+    attachment_url: string;
+    requested_by: string;
+    visitor_name: string;
+    hr_approval: boolean;
+    pr_approval: boolean;
+    constructor(type_of_accommodation: string, price: number, meal: MealType, service: ServiceTypes, date_of_request: Date, hotel_name: string, check_in_date: Date, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string, hr_approval: boolean, pr_approval: boolean);
+}

package/dist/models/HotelreservationModal.js

@@ -0,0 +1,119 @@
+"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.HotelReservation = exports.ServiceTypes = exports.MealType = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var MealType;
+(function (MealType) {
+    MealType["BREAKFAST"] = "Breakfast";
+    MealType["LUNCH"] = "Lunch";
+    MealType["DINNER"] = "Dinner";
+})(MealType || (exports.MealType = MealType = {}));
+var ServiceTypes;
+(function (ServiceTypes) {
+    ServiceTypes["LAUNDRY"] = "Laundry";
+    ServiceTypes["TELEPHONE"] = "Telephone Service";
+})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
+let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
+    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, hr_approval, pr_approval) {
+        super();
+        this.type_of_accommodation = type_of_accommodation;
+        this.price = price;
+        this.meal = meal;
+        this.service = service;
+        this.date_of_request = date_of_request;
+        this.hotel_name = hotel_name;
+        this.check_in_date = check_in_date;
+        this.check_in_time = check_in_time;
+        this.check_out_date = check_out_date;
+        this.check_out_time = check_out_time;
+        this.number_of_guests = number_of_guests;
+        this.description = description;
+        this.requested_by = requested_by;
+        this.visitor_name = visitor_name;
+        this.hr_approval = hr_approval;
+        this.pr_approval = pr_approval;
+    }
+};
+exports.HotelReservation = HotelReservation;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "type_of_accommodation", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "price", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "meal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "service", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "date_of_request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "hotel_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_in_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_in_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_out_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_out_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "number_of_guests", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "attachment_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "requested_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "visitor_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "hr_approval", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "pr_approval", void 0);
+exports.HotelReservation = HotelReservation = __decorate([
+    (0, typeorm_1.Entity)({ name: 'hotel_reservations' }),
+    __metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Boolean, Boolean])
+], HotelReservation);

package/dist/models/HotelreservationModel.d.ts

@@ -0,0 +1,44 @@
+import { BaseModel } from './BaseModel';
+export declare enum MealType {
+    BREAKFAST = "Breakfast",
+    LUNCH = "Lunch",
+    DINNER = "Dinner"
+}
+export declare enum ServiceTypes {
+    LAUNDRY = "Laundry",
+    TELEPHONE = "Telephone Service"
+}
+export declare enum HotelReservationStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    IN_PROGRESS = "In Progress"
+}
+export declare class HotelReservation extends BaseModel {
+    req_user_department_id: number | null;
+    req_user_section_id: number | null;
+    service_id: number | null;
+    sub_service_id: number | null;
+    service_type: string | null;
+    workflow_execution_id: string | null;
+    status: HotelReservationStatus;
+    user_id: number;
+    type_of_accommodation: string;
+    price: number;
+    meal: MealType;
+    service: ServiceTypes;
+    date_of_request: Date;
+    hotel_name: string;
+    check_in_date: Date;
+    check_in_time: string;
+    check_out_date: Date;
+    check_out_time: string;
+    number_of_guests: number;
+    description: string;
+    attachment_url: string;
+    requested_by: string;
+    visitor_name: string;
+    hr_approval: boolean;
+    pr_approval: boolean;
+    constructor(type_of_accommodation: string, price: number, meal: MealType, service: ServiceTypes, date_of_request: Date, hotel_name: string, check_in_date: Date, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string, user_id: number, status?: HotelReservationStatus, hr_approval?: boolean, pr_approval?: boolean, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null, workflow_execution_id?: string | null, req_user_department_id?: number | null, req_user_section_id?: number | null);
+}

package/dist/models/HotelreservationModel.js

@@ -0,0 +1,171 @@
+"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.HotelReservation = exports.HotelReservationStatus = exports.ServiceTypes = exports.MealType = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var MealType;
+(function (MealType) {
+    MealType["BREAKFAST"] = "Breakfast";
+    MealType["LUNCH"] = "Lunch";
+    MealType["DINNER"] = "Dinner";
+})(MealType || (exports.MealType = MealType = {}));
+var ServiceTypes;
+(function (ServiceTypes) {
+    ServiceTypes["LAUNDRY"] = "Laundry";
+    ServiceTypes["TELEPHONE"] = "Telephone Service";
+})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
+var HotelReservationStatus;
+(function (HotelReservationStatus) {
+    HotelReservationStatus["PENDING"] = "Pending";
+    HotelReservationStatus["APPROVED"] = "Approved";
+    HotelReservationStatus["REJECTED"] = "Rejected";
+    HotelReservationStatus["IN_PROGRESS"] = "In Progress";
+})(HotelReservationStatus || (exports.HotelReservationStatus = HotelReservationStatus = {}));
+let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
+    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, user_id, status = HotelReservationStatus.PENDING, hr_approval = false, pr_approval = false, service_id, sub_service_id, service_type, workflow_execution_id, req_user_department_id, req_user_section_id) {
+        super();
+        this.type_of_accommodation = type_of_accommodation;
+        this.price = price;
+        this.meal = meal;
+        this.service = service;
+        this.date_of_request = date_of_request;
+        this.hotel_name = hotel_name;
+        this.check_in_date = check_in_date;
+        this.check_in_time = check_in_time;
+        this.check_out_date = check_out_date;
+        this.check_out_time = check_out_time;
+        this.number_of_guests = number_of_guests;
+        this.description = description;
+        this.requested_by = requested_by;
+        this.visitor_name = visitor_name;
+        this.user_id = user_id;
+        this.status = status;
+        this.hr_approval = hr_approval;
+        this.pr_approval = pr_approval;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.service_type = service_type ?? null;
+        this.workflow_execution_id = workflow_execution_id ?? null;
+        this.req_user_department_id = req_user_department_id ?? null;
+        this.req_user_section_id = req_user_section_id ?? null;
+    }
+};
+exports.HotelReservation = HotelReservation;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "service_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", Object)
+], HotelReservation.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        type: "enum",
+        enum: HotelReservationStatus,
+        default: HotelReservationStatus.PENDING,
+        nullable: false,
+    }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "type_of_accommodation", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "price", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "meal", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "service", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "date_of_request", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "hotel_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_in_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_in_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
+    __metadata("design:type", Date)
+], HotelReservation.prototype, "check_out_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "check_out_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], HotelReservation.prototype, "number_of_guests", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "attachment_url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "requested_by", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
+    __metadata("design:type", String)
+], HotelReservation.prototype, "visitor_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "hr_approval", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
+    __metadata("design:type", Boolean)
+], HotelReservation.prototype, "pr_approval", void 0);
+exports.HotelReservation = HotelReservation = __decorate([
+    (0, typeorm_1.Entity)({ name: 'hotelreservations' }),
+    __metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Number, String, Boolean, Boolean, Object, Object, Object, Object, Object, Object])
+], HotelReservation);

package/dist/models/LogisticsForeignVehicleModel.d.ts

@@ -1,8 +1,9 @@
 import { BaseModel } from './BaseModel';
 export declare enum Foreign_Purpose_of_Travel {
-    SITE = "Site Visit",
-    AIRPORT = "Airport Duty",
-    OFFICIAL = "Official Meeting",
+    AIRPORT_PICKUP = "Airport Pickup/Drop-off",
+    OFFICIAL_MEETING = "Official Meeting",
+    SITE_VISIT = "Site Visit",
+    CONFERENCE = "Conference/Event",
     OTHER = "Other"
 }
 export declare enum Foreign_Vehicle_Required_Location {

package/dist/models/LogisticsForeignVehicleModel.js

@@ -14,9 +14,10 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 var Foreign_Purpose_of_Travel;
 (function (Foreign_Purpose_of_Travel) {
-    Foreign_Purpose_of_Travel["SITE"] = "Site Visit";
-    Foreign_Purpose_of_Travel["AIRPORT"] = "Airport Duty";
-    Foreign_Purpose_of_Travel["OFFICIAL"] = "Official Meeting";
+    Foreign_Purpose_of_Travel["AIRPORT_PICKUP"] = "Airport Pickup/Drop-off";
+    Foreign_Purpose_of_Travel["OFFICIAL_MEETING"] = "Official Meeting";
+    Foreign_Purpose_of_Travel["SITE_VISIT"] = "Site Visit";
+    Foreign_Purpose_of_Travel["CONFERENCE"] = "Conference/Event";
     Foreign_Purpose_of_Travel["OTHER"] = "Other";
 })(Foreign_Purpose_of_Travel || (exports.Foreign_Purpose_of_Travel = Foreign_Purpose_of_Travel = {}));
 var Foreign_Vehicle_Required_Location;

package/package.json

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

package/src/data-source.ts

@@ -39,8 +39,7 @@ import { LogisticsRequestAttachment } from './models/LogisticsAttachmentModel';
 import { LogisticsWorkFlow } from './models/LogisticsWorkflowModel';
 import { ImportantLinks } from './models/importantLinksModel';
 import { DelegateSettings } from './models/DelegateSettingsModel';
-import { Feedback } from './models/feedbackModel';
-import { PortalFeedback } from './models/PortalFeedbackModel';
+import { HotelReservation } from './models/HotelreservationModel'
 
 
 export const AppDataSource = new DataSource({
@@ -89,7 +88,6 @@ export const AppDataSource = new DataSource({
     LogisticsWorkFlow,
     ImportantLinks,
     DelegateSettings,
-    Feedback,
-    PortalFeedback
+    HotelReservation
   ],
 });

package/src/index.ts

@@ -35,5 +35,4 @@ export * from './models/LogisticsAttachmentModel';
 export * from './models/importantLinksModel';
 export * from './models/LogisticsWorkflowModel';
 export * from './models/DelegateSettingsModel';
-export * from './models/feedbackModel';
-export * from './models/PortalFeedbackModel';
+export * from './models/HotelreservationModel';

package/src/models/HotelreservationModel.ts

@@ -0,0 +1,159 @@
+import { Entity, Column } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+export enum MealType {
+    BREAKFAST = "Breakfast",
+    LUNCH = "Lunch",
+    DINNER = "Dinner",
+}
+
+export enum ServiceTypes {
+    LAUNDRY = "Laundry",
+    TELEPHONE = "Telephone Service",
+}
+
+export enum HotelReservationStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected",
+    IN_PROGRESS = "In Progress"
+}
+
+@Entity({ name:'hotelreservations'})
+export class HotelReservation extends BaseModel {
+    // Workflow fields (similar to IT Help Desk)
+    @Column({ type: 'int', nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ nullable: true })
+    service_id: number | null;
+
+    @Column({ nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: 'varchar', length: 20, nullable: true })
+    service_type: string | null; // 'internal' or 'external'
+
+    @Column({ type: 'varchar', nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({
+        type: "enum",
+        enum: HotelReservationStatus,
+        default: HotelReservationStatus.PENDING,
+        nullable: false,
+    })
+    status: HotelReservationStatus;
+
+    @Column({ nullable: false })
+    user_id: number;
+
+    // Hotel reservation specific fields
+    @Column({ type: 'varchar', length: 50 })
+    type_of_accommodation: string;
+
+    @Column({ type: 'decimal', precision: 10, scale: 2, nullable: false })
+    price: number;
+
+    @Column({ type: 'enum', enum: MealType, nullable: false, })
+    meal: MealType;
+
+    @Column({ type: 'enum', enum: ServiceTypes, nullable: false, })
+    service: ServiceTypes;
+
+    @Column({ type: 'timestamptz', nullable: false })
+    date_of_request: Date;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    hotel_name: string;
+
+    @Column({ type: 'date', nullable: false })
+    check_in_date: Date;
+
+    @Column({ type: 'time', nullable: false })
+    check_in_time: string;
+
+    @Column({ type: 'date', nullable: false })
+    check_out_date: Date;
+
+    @Column({ type: 'time', nullable: false })
+    check_out_time: string;
+
+    @Column({ type: 'int', nullable: false })
+    number_of_guests: number;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    @Column({ type: 'text', nullable: false })
+    attachment_url: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    requested_by: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    visitor_name: string;
+
+    @Column({ type: 'boolean', default: false })
+    hr_approval: boolean;
+
+    @Column({ type: 'boolean', default: false })
+    pr_approval: boolean;
+
+
+    constructor(
+        type_of_accommodation: string,
+        price: number,
+        meal: MealType,
+        service: ServiceTypes,
+        date_of_request: Date,
+        hotel_name: string,
+        check_in_date: Date,
+        check_in_time: string,
+        check_out_date: Date,
+        check_out_time: string,
+        number_of_guests: number,
+        description: string,
+        requested_by: string,
+        visitor_name: string,
+        user_id: number,
+        status: HotelReservationStatus = HotelReservationStatus.PENDING,
+        hr_approval: boolean = false,
+        pr_approval: boolean = false,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        service_type?: string | null,
+        workflow_execution_id?: string | null,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null
+    ) {
+        super();
+        this.type_of_accommodation = type_of_accommodation;
+        this.price = price;
+        this.meal = meal;
+        this.service = service;
+        this.date_of_request = date_of_request;
+        this.hotel_name = hotel_name;
+        this.check_in_date = check_in_date;
+        this.check_in_time = check_in_time;
+        this.check_out_date = check_out_date;
+        this.check_out_time = check_out_time;
+        this.number_of_guests = number_of_guests;
+        this.description = description;
+        this.requested_by = requested_by;
+        this.visitor_name = visitor_name;
+        this.user_id = user_id;
+        this.status = status;
+        this.hr_approval = hr_approval;
+        this.pr_approval = pr_approval;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.service_type = service_type ?? null;
+        this.workflow_execution_id = workflow_execution_id ?? null;
+        this.req_user_department_id = req_user_department_id ?? null;
+        this.req_user_section_id = req_user_section_id ?? null;
+    }
+}

package/src/models/LogisticsForeignVehicleModel.ts

@@ -2,9 +2,10 @@ import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
 export enum Foreign_Purpose_of_Travel {
-  SITE = "Site Visit",
-  AIRPORT = "Airport Duty",
-  OFFICIAL = "Official Meeting",
+  AIRPORT_PICKUP = "Airport Pickup/Drop-off",
+  OFFICIAL_MEETING = "Official Meeting",
+  SITE_VISIT = "Site Visit",
+  CONFERENCE = "Conference/Event",
   OTHER = "Other"
 }
 

package/dist/models/PortalFeedbackModel.d.ts

@@ -1,8 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { Rating } from './feedbackModel';
-export declare class PortalFeedback extends BaseModel {
-    comment: string;
-    rating: Rating;
-    user_Id: number;
-    constructor(comment: string, rating: Rating, user_Id: number);
-}

package/dist/models/PortalFeedbackModel.js

@@ -1,44 +0,0 @@
-"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.PortalFeedback = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const feedbackModel_1 = require("./feedbackModel");
-let PortalFeedback = class PortalFeedback extends BaseModel_1.BaseModel {
-    constructor(comment, rating, user_Id) {
-        super();
-        this.comment = comment,
-            this.rating = rating,
-            this.user_Id = user_Id;
-    }
-};
-exports.PortalFeedback = PortalFeedback;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], PortalFeedback.prototype, "comment", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: feedbackModel_1.Rating,
-        nullable: true,
-    }),
-    __metadata("design:type", Number)
-], PortalFeedback.prototype, "rating", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], PortalFeedback.prototype, "user_Id", void 0);
-exports.PortalFeedback = PortalFeedback = __decorate([
-    (0, typeorm_1.Entity)({ name: 'portal_feedback' }),
-    __metadata("design:paramtypes", [String, Number, Number])
-], PortalFeedback);

package/dist/models/feedbackModel.d.ts

@@ -1,16 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare enum Rating {
-    ONE = 1,
-    TWO = 2,
-    THREE = 3,
-    FOUR = 4,
-    FIVE = 5
-}
-export declare class Feedback extends BaseModel {
-    comment: string;
-    rating: Rating;
-    category_Id: number;
-    sub_category_Id: number;
-    user_Id: number;
-    constructor(comment: string, rating: Rating, category_Id: number, sub_category_Id: number, user_Id: number);
-}

package/dist/models/feedbackModel.js

@@ -1,61 +0,0 @@
-"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.Feedback = exports.Rating = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var Rating;
-(function (Rating) {
-    Rating[Rating["ONE"] = 1] = "ONE";
-    Rating[Rating["TWO"] = 2] = "TWO";
-    Rating[Rating["THREE"] = 3] = "THREE";
-    Rating[Rating["FOUR"] = 4] = "FOUR";
-    Rating[Rating["FIVE"] = 5] = "FIVE";
-})(Rating || (exports.Rating = Rating = {}));
-let Feedback = class Feedback extends BaseModel_1.BaseModel {
-    constructor(comment, rating, category_Id, sub_category_Id, user_Id) {
-        super();
-        this.comment = comment,
-            this.rating = rating,
-            this.category_Id = category_Id,
-            this.sub_category_Id = sub_category_Id,
-            this.user_Id = user_Id;
-    }
-};
-exports.Feedback = Feedback;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], Feedback.prototype, "comment", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: Rating,
-        nullable: true,
-    }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "rating", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "category_Id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "sub_category_Id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Number)
-], Feedback.prototype, "user_Id", void 0);
-exports.Feedback = Feedback = __decorate([
-    (0, typeorm_1.Entity)({ name: 'feedback' }),
-    __metadata("design:paramtypes", [String, Number, Number, Number, Number])
-], Feedback);

package/src/models/PortalFeedbackModel.ts

@@ -1,34 +0,0 @@
-
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { Rating } from './feedbackModel';
-
-@Entity({ name: 'portal_feedback' })
-export class PortalFeedback extends BaseModel {
-
-    @Column({ nullable: true })
-    comment: string;
-
-    @Column({
-        type: "enum",
-        enum: Rating,
-        nullable: true,
-    })
-    rating: Rating;
-
-    @Column({ nullable: true })
-    user_Id: number;
-
-    constructor(
-        comment: string,
-        rating: Rating,
-        user_Id: number,
-    ) {
-        super();
-        this.comment = comment,
-        this.rating = rating,
-        this.user_Id = user_Id
-    }
-}
-
-

package/src/models/feedbackModel.ts

@@ -1,50 +0,0 @@
-
-import { Column, Entity, BeforeInsert, BeforeUpdate } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum Rating {
-    ONE = 1,
-    TWO = 2,
-    THREE = 3,
-    FOUR = 4,
-    FIVE = 5,
-}
-
-@Entity({ name: 'feedback' })
-export class Feedback extends BaseModel {
-
-    @Column({ nullable: true })
-    comment: string;
-
-    @Column({
-        type: "enum",
-        enum: Rating,
-        nullable: true,
-    })
-    rating: Rating;
-
-    @Column({ nullable: true })
-    category_Id: number;
-
-    @Column({ nullable: true })
-    sub_category_Id: number;
-
-    @Column({ nullable: true })
-    user_Id: number;
-
-    constructor(
-        comment: string,
-        rating: Rating,
-        category_Id: number,
-        sub_category_Id: number,
-        user_Id: number,
-    ) {
-        super();
-        this.comment = comment,
-        this.rating = rating,
-        this.category_Id = category_Id,
-        this.sub_category_Id = sub_category_Id,
-        this.user_Id = user_Id
-    }
-}
-