@platform-modules/civil-aviation-authority 2.0.30 → 2.0.31

package/src/index.ts

@@ -2,13 +2,13 @@ export * from './models/user';
 export * from './models/role';
 export * from './models/user-sessions';
 export * from './models/ITHelpDeskModel';
-// export * from './models/ITServicesTypesSalalahModel'; // REMOVED - table no longer used
-// export * from './models/ITServicesTypesMuscatModel'; // REMOVED - table no longer used
+export * from './models/ITServicesTypesSalalahModel';
+export * from './models/ITServicesTypesMuscatModel';
 export * from './models/ServiceTypeModel';
 export * from './models/CAAServices';   
 export * from './models/CAASubServices';
-// export * from './models/ITApprovalSettings'; // REMOVED - table no longer used
-// export * from './models/Workflows'; // REMOVED - table no longer used
+export * from './models/ITApprovalSettings';
+// export * from './models/Workflows';
 export * from './models/ItApprovalsModel';
 export * from './models/ItWorkflowModel';
 export * from './models/WorkflowDefinitions';
@@ -35,5 +35,8 @@ 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';
+export * from './models/HotelApprovalModel';
+export * from './models/HotelWorkFlowModel';
+export * from './models/HotelChatModel';
+export * from './models/HotelAttachedModel';

package/src/models/HotelApprovalModel.ts

@@ -0,0 +1,79 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+export enum HotelApprovalStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'hotelapprovals' })
+
+export  class HotelApprovalDetails 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: 'integer', nullable: false })
+  level: number;
+
+  @Column({ type: 'integer', nullable: false })
+  approver_role_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegate_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
+  comment: string;
+
+  @Column({ type: 'enum', enum: HotelApprovalStatus,default: HotelApprovalStatus.PENDING, nullable: false })
+  approval_status: HotelApprovalStatus;
+
+    constructor(
+      request_id: number, 
+      approver_role_id: number, 
+      comment: string, 
+      approval_status: HotelApprovalStatus, 
+      level: number,
+      department_id?: number | null,
+      section_id?: number | null,
+      approver_user_id?: number | null,
+      delegate_user_id?: number | null,
+      approved_by?: number | null,
+      service_id?: number,
+      sub_service_id?: number
+    ) {
+    super();
+    this.request_id = request_id;
+    this.service_id = service_id || null;
+    this.sub_service_id = sub_service_id || null;
+    this.approver_role_id = approver_role_id;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.level = level;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+    this.approver_user_id = approver_user_id || null;
+    this.delegate_user_id = delegate_user_id || null;
+    this.approved_by = approved_by || null;
+  }
+}

package/src/models/HotelAttachedModel.ts

@@ -0,0 +1,54 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+@Entity({ name: 'hotel_request_attachments' })
+export  class HotelRequestAttachment 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: 500, nullable: false })
+    file_url: string;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    file_name: string;
+
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    file_type: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    file_size: number | null;
+
+    @Column({ type: 'integer', nullable: true })
+    chat_id: number | null;
+
+
+    constructor(
+        request_id: number,
+        file_url: string,
+        file_name?: string,
+        file_type?: string,
+        file_size?: number,
+        service_id?: number,
+        sub_service_id?: number,
+        chat_id?: number
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.file_url = file_url;
+        this.file_name = file_name || '';
+        this.file_type = file_type || '';
+        this.file_size = file_size || null;
+        this.chat_id = chat_id || null;
+    }
+}
+

package/src/models/HotelChatModel.ts

@@ -0,0 +1,55 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum HotelMessageTypes {
+  TEXT = "text",
+  IMAGE = "image",
+  VIDEO = "video",
+  FILE = "file",
+  LINK = "link"
+}
+
+@Entity({ name: 'Hotel_request_chat' })
+export class HotelRequestChat 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: 'integer', nullable: false })
+    user_id: number;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ 
+        type: 'enum', 
+        enum: HotelMessageTypes, 
+        default: HotelMessageTypes.TEXT,
+        nullable: false
+    })
+    messageType: HotelMessageTypes;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        service_id?: number,
+        sub_service_id?: number,
+        messageType?: HotelMessageTypes
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.message = message;
+        this.messageType = messageType || HotelMessageTypes.TEXT;
+    }
+}
+

package/src/models/HotelWorkFlowModel.ts

@@ -0,0 +1,42 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum HotelWorkFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending"
+  }
+
+//This model is used to store the logistics workflow status and activity logs
+@Entity({ name: 'hotel_workflows' })
+export class HotelWorkFlow 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: 500, nullable: false })
+  content: string;
+
+  @Column({ type: 'enum', enum: HotelWorkFlowStatus, default: HotelWorkFlowStatus.NOT_YET_STARTED, nullable: false })
+  status: HotelWorkFlowStatus;
+
+  constructor(
+    request_id: number, 
+    content: string, 
+    status: HotelWorkFlowStatus,
+    service_id?: number,
+    sub_service_id?: number
+  ) {
+    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;
+  }
+}

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

@@ -0,0 +1,29 @@
+import { Column, Entity, Unique } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'it_approval_settings' })
+@Unique(['workflow_id', 'level'])
+export class ITApprovalSettings extends BaseModel {
+    
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
+
+    @Column({ type: 'int', nullable: false })
+    approval_role_id: number;
+
+    @Column({ type: 'int', nullable: false })
+    workflow_id: number;
+    constructor(
+        level: number,
+        approval_role_id: number,
+        workflow_id: number
+    ) {
+        super();
+        this.level = level;
+        this.approval_role_id = approval_role_id;
+        this.workflow_id = workflow_id;
+        }
+}
+
+

package/src/models/ITHelpDeskModel.ts

@@ -53,9 +53,17 @@ export class ITHelpDeskRequests extends BaseModel {
     @Column({ type: "date", nullable: false })
     request_date: Date;
 
+    @Column({ nullable: true })
+    attachment_url: string;
+
     @Column({ nullable: false })
     user_id: number;
 
+    @Column({ nullable: true })
+    reporting_manager: number;
+
+    @Column({ nullable: true })
+    assigned_to: number;
 
     @Column({
         type: "enum",
@@ -77,6 +85,9 @@ export class ITHelpDeskRequests extends BaseModel {
         extn_num: string,
         contact_num: string, 
         request_date: Date,
+        attachment_url: string,
+        reporting_manager: number,
+        assigned_to: number,
         status: status,     
         workflow_execution_id?: string,
         req_user_department_id?: number | null,
@@ -92,6 +103,9 @@ export class ITHelpDeskRequests extends BaseModel {
         this.extn_num = extn_num;
         this.contact_num = contact_num;
         this.request_date = request_date;
+        this.attachment_url = attachment_url;
+        this.reporting_manager = reporting_manager;
+        this.assigned_to = assigned_to;
         this.status = status;
         this.workflow_execution_id = workflow_execution_id || null;
         this.req_user_department_id = req_user_department_id || null;

package/src/models/ITServicesTypesMuscatModel.ts

@@ -0,0 +1,22 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'it_services_types_muscat' })
+export class ITServicesTypesMuscat extends BaseModel {
+
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ nullable: false })
+    name_in_arabic: string;
+
+    constructor(     
+        name: string,
+        name_in_arabic: string
+    ) {
+        super();     
+        this.name = name
+        this.name_in_arabic = name_in_arabic
+    }
+}

package/src/models/ITServicesTypesSalalahModel.ts

@@ -0,0 +1,22 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'it_services_types_salalah' })
+export class ITServicesTypesSalalah extends BaseModel {
+
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ nullable: false })
+    name_in_arabic: string;
+
+    constructor(     
+        name: string,
+        name_in_arabic: string
+    ) {
+        super();     
+        this.name = name
+        this.name_in_arabic = name_in_arabic
+    }
+}

package/src/models/ItApprovalsModel.ts

@@ -20,7 +20,7 @@ export class ItApprovalDetails extends BaseModel {
   approver_user_id: number | null;
 
   @Column({ type: 'integer', nullable: false })
-  approver_role_id: number | null;
+  approver_role_id: number;
 
   @Column({ type: 'integer', nullable: true })
   department_id: number | null;
@@ -40,7 +40,7 @@ export class ItApprovalDetails extends BaseModel {
     constructor(
       request_id: number, 
       approver_user_id: number | null, 
-      approver_role_id: number | null, 
+      approver_role_id: number, 
       comment: string, 
       approval_status: ApprovalStatus, 
       level: number,

package/src/models/ItWorkflowModel.ts

@@ -13,20 +13,16 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: false })
   request_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  order: number | null;
-
   @Column({ type: 'varchar', length: 255, nullable: false })
   content: string;
 
   @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
   status: workFlowStatus;
 
-  constructor(request_id: number, content: string, status: workFlowStatus, order?: number) {
+  constructor(request_id: number, content: string, status: workFlowStatus) {
     super();
     this.request_id = request_id;
     this.content = content;
     this.status = status;
-    this.order = order || 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"
 }
 
@@ -47,12 +48,13 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   number_of_passengers: number;
 
-  @Column({ 
-    type: 'varchar', 
-    default: 'Other',
+  @Column({
+    type: "enum",
+    enum: Foreign_Purpose_of_Travel,
+    default: Foreign_Purpose_of_Travel.OTHER,
     nullable: false,
   })
-  purpose_of_travel: string;
+  purpose_of_travel: Foreign_Purpose_of_Travel;
 
   @Column({
     type: "enum",
@@ -106,7 +108,7 @@ export class LogisticsForeignVehicleRequests extends BaseModel {
     sub_service_id: number,
     user_id: number,
     number_of_passengers: number,
-    purpose_of_travel: string,
+    purpose_of_travel: Foreign_Purpose_of_Travel,
     vehicle_required_location: Foreign_Vehicle_Required_Location,
     contact_number: string,
     request_type: Foreign_Request_Type,

package/src/models/NotificationModel.ts

@@ -4,9 +4,6 @@ import { BaseModel } from './BaseModel';
 
 export enum NotificationType {
     REQUEST_RAISED = 'request raised',
-    REQUEST_APPROVE = 'request approve',
-    REQUEST_REJECT = 'request reject',
-    REQUEST_WITHDRAW = 'request withdraw',
     REMINDER = 'reminder',
     IMPORT = 'import',
 }

package/src/models/WorkflowTask.ts

@@ -1,19 +1,5 @@
 import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
-import { TaskType } from "./WorkflowTaskNames";
-import { CategoryType } from "./WorkflowTaskNames";
-
-
-// export enum TaskNameType {
-//     SIMPLE = 'SIMPLE',
-//     HUMAN = 'HUMAN'
-// }
-
-// export enum CategoryNameType {
-//     CREATE = 'CREATE',
-//     APPROVAL = 'APPROVAL',
-//     NOTIFICATION = 'NOTIFICATION'
-// }
 
 @Entity({ name: 'workflow_tasks' })
 export class WorkflowTask extends BaseModel {
@@ -24,30 +10,17 @@ export class WorkflowTask extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
-    @Column({
-        type: 'enum',
-        enum: TaskType,
-        nullable: true
-    })
-    task_type: TaskType;
-
-    @Column({
-        type: 'enum',
-        enum: CategoryType,
-        nullable: true
-    })
-    category: CategoryType;
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
 
     constructor(
         name: string,
         task_id?: number,
-        task_type?: TaskType,
-        category?: CategoryType
+        task_type?: string
     ) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
-        this.task_type = task_type || TaskType.SIMPLE;
-        this.category = category || CategoryType.CREATE;
+        this.task_type = task_type || '';
     }
 }