@platform-modules/foreign-ministry 1.2.21 → 1.2.23

package/src/models/MissionTravelPersonModel.ts

@@ -1,116 +1,105 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum TravelClass {
-  ECONOMY = "Economy",
-  BUSINESS = "Business",
-  FIRST = "First"
-}
-
-export enum AllowanceRatio {
-  RATIO_100 = "100",
-  RATIO_75 = "75",
-  RATIO_50 = "50"
-}
-
-@Entity({ name: 'mission_travel_persons' })
-export class MissionTravelPersons extends BaseModel {
-
-  @Column({ type: 'int', nullable: false })
-  request_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  travel_person_name: string;
-
-  @Column({ type: 'int', nullable: true })
-  user_id: number | null; // If employee, link to user table
-
-  @Column({ type: 'int', nullable: true })
-  country_id: number | null;
-
-  @Column({ type: 'varchar', length: 10, nullable: true })
-  allowance_ratio: AllowanceRatio | null; // 100, 75, or 50
-
-  @Column({ type: 'date', nullable: true })
-  travel_from_date: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  travel_to_date: Date | null;
-
-  @Column({ type: 'enum', enum: TravelClass, nullable: true })
-  travel_class: TravelClass | null;
-
-  @Column({ type: 'int', nullable: true })
-  number_of_days: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  hotel_name: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  hotel_rating: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  hotel_price: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  travel_agent_name: string | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  allowance_amount: number | null; // Auto-calculated based on ratio & perdiem
-
-  @Column({ type: 'int', nullable: true })
-  grade: number | null; // Employee grade for perdiem calculation
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  position: string | null; // Employee position for travel class
-
-  constructor(
-    request_id: number,
-    service_id: number | null,
-    sub_service_id: number | null,
-    travel_person_name: string,
-    user_id: number | null,
-    country_id: number | null,
-    allowance_ratio: AllowanceRatio | null,
-    travel_from_date: Date | null,
-    travel_to_date: Date | null,
-    travel_class: TravelClass | null,
-    number_of_days: number | null,
-    hotel_name: string | null,
-    hotel_rating: number | null,
-    hotel_price: number | null,
-    travel_agent_name: string | null,
-    allowance_amount: number | null,
-    grade: number | null,
-    position: string | null
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.travel_person_name = travel_person_name;
-    this.user_id = user_id;
-    this.country_id = country_id;
-    this.allowance_ratio = allowance_ratio;
-    this.travel_from_date = travel_from_date;
-    this.travel_to_date = travel_to_date;
-    this.travel_class = travel_class;
-    this.number_of_days = number_of_days;
-    this.hotel_name = hotel_name;
-    this.hotel_rating = hotel_rating;
-    this.hotel_price = hotel_price;
-    this.travel_agent_name = travel_agent_name;
-    this.allowance_amount = allowance_amount;
-    this.grade = grade;
-    this.position = position;
-  }
-}
-
-
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum AllowanceRatio {
+  RATIO_100 = "100",
+  RATIO_75 = "75",
+  RATIO_50 = "50"
+}
+
+@Entity({ name: 'mission_travel_persons' })
+export class MissionTravelPersons extends BaseModel {
+
+  @Column({ type: 'int', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_person_name: string;
+
+  @Column({ type: 'int', nullable: true })
+  user_id: number | null; // If employee, link to user table
+
+  @Column({ type: 'int', nullable: true })
+  country_id: number | null;
+
+  @Column({ type: 'varchar', length: 10, nullable: true })
+  allowance_ratio: AllowanceRatio | null; // 100, 75, or 50
+
+  @Column({ type: 'date', nullable: true })
+  travel_from_date: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  travel_to_date: Date | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  travel_class: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  number_of_days: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  hotel_name: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  hotel_rating: number | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  hotel_price: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  travel_agent_name: string | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  allowance_amount: number | null; // Auto-calculated based on ratio & perdiem
+
+  @Column({ type: 'int', nullable: true })
+  grade: number | null; // Employee grade for perdiem calculation
+
+  constructor(
+    request_id: number,
+    service_id: number | null,
+    sub_service_id: number | null,
+    travel_person_name: string,
+    user_id: number | null,
+    country_id: number | null,
+    allowance_ratio: AllowanceRatio | null,
+    travel_from_date: Date | null,
+    travel_to_date: Date | null,
+    travel_class: string | null,
+    number_of_days: number | null,
+    hotel_name: string | null,
+    hotel_rating: number | null,
+    hotel_price: number | null,
+    travel_agent_name: string | null,
+    allowance_amount: number | null,
+    grade: number | null
+  ) {
+    super();
+    this.request_id = request_id;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.travel_person_name = travel_person_name;
+    this.user_id = user_id;
+    this.country_id = country_id;
+    this.allowance_ratio = allowance_ratio;
+    this.travel_from_date = travel_from_date;
+    this.travel_to_date = travel_to_date;
+    this.travel_class = travel_class;
+    this.number_of_days = number_of_days;
+    this.hotel_name = hotel_name;
+    this.hotel_rating = hotel_rating;
+    this.hotel_price = hotel_price;
+    this.travel_agent_name = travel_agent_name;
+    this.allowance_amount = allowance_amount;
+    this.grade = grade;
+  }
+}
+
+
+

package/src/models/MissionTravelRequestModel.ts

@@ -42,9 +42,6 @@ export class MissionTravelRequests extends BaseModel {
   @Column({ type: 'enum', enum: DecisionType, nullable: true })
   decision_type: DecisionType | null;
 
-  @Column({ type: 'int', nullable: true })
-  country_id: number | null;
-
   @Column({ type: 'date', nullable: true })
   from_date: Date | null;
 
@@ -63,24 +60,15 @@ export class MissionTravelRequests extends BaseModel {
   @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
   mission_allowance_cost: number | null;
 
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  hotel_name: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  hotel_rating: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  hotel_price: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  travelling_agent: string | null;
-
   @Column({ type: 'enum', enum: MissionTravelStatus, default: MissionTravelStatus.PENDING, nullable: false })
   status: MissionTravelStatus;
 
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
 
+  @Column({ type: 'varchar', nullable: true })
+  request_type: string | null;
+
   constructor(
     user_id: number,
     service_id: number | null,
@@ -88,17 +76,13 @@ export class MissionTravelRequests extends BaseModel {
     department_participation: boolean,
     mission_type: MissionType | null,
     decision_type: DecisionType | null,
-    country_id: number | null,
     from_date: Date | null,
     to_date: Date | null,
     purpose_of_mission: string | null,
     exchange_ratio: string | null,
     number_of_days: number | null,
     mission_allowance_cost: number | null,
-    hotel_name: string | null,
-    hotel_rating: number | null,
-    hotel_price: number | null,
-    travelling_agent: string | null
+    request_type: string | null
   ) {
     super();
     this.user_id = user_id;
@@ -107,18 +91,15 @@ export class MissionTravelRequests extends BaseModel {
     this.department_participation = department_participation;
     this.mission_type = mission_type;
     this.decision_type = decision_type;
-    this.country_id = country_id;
     this.from_date = from_date;
     this.to_date = to_date;
     this.purpose_of_mission = purpose_of_mission;
     this.exchange_ratio = exchange_ratio;
     this.number_of_days = number_of_days;
     this.mission_allowance_cost = mission_allowance_cost;
-    this.hotel_name = hotel_name;
-    this.hotel_rating = hotel_rating;
-    this.hotel_price = hotel_price;
-    this.travelling_agent = travelling_agent;
     this.status = MissionTravelStatus.PENDING;
+    this.request_type = request_type;
+
   }
 }
 

package/src/models/MissionTravelWorkflowModel.ts

@@ -1,38 +1,55 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'mission_travel_workflows' })
-export class MissionTravelWorkFlow 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: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  action: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  comment: string | null;
-
-  @Column({ type: 'timestamp', nullable: true })
-  action_date: Date | null;
-}
-
-
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum workFlowStatus {
+  COMPLETED = "Completed",
+  NOT_YET_STARTED = "Not Yet Started",
+  PENDING = "Pending"
+}
+
+@Entity({ name: 'mission_travel_workflows' })
+export class MissionTravelWorkFlow extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @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;
+
+  @Column({ type: 'integer', nullable: true })
+  user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  role_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null, user_id?: number | null, role_id?: number | null, department_id?: number | null, section_id?: number | null) {
+    super();
+    this.request_id = request_id;
+    this.content = content;
+    this.status = status;
+    this.order = order || null;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.user_id = user_id || null;
+    this.role_id = role_id || null;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+  }
+}

package/src/models/MissionTravelClassConfigModel.ts

@@ -1,39 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { TravelClass } from './MissionTravelPersonModel';
-
-@Entity({ name: 'mission_travel_class_config' })
-export class MissionTravelClassConfig extends BaseModel {
-
-  @Column({ type: 'int', nullable: true })
-  grade: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  position: string | null;
-
-  @Column({ type: 'enum', enum: TravelClass, nullable: false })
-  travel_class: TravelClass;
-
-  @Column({ type: 'boolean', default: true })
-  is_active: boolean;
-
-  @Column({ type: 'text', nullable: true })
-  description: string | null;
-
-  constructor(
-    grade: number | null,
-    position: string | null,
-    travel_class: TravelClass,
-    description: string | null
-  ) {
-    super();
-    this.grade = grade;
-    this.position = position;
-    this.travel_class = travel_class;
-    this.description = description;
-    this.is_active = true;
-  }
-}
-
-
-

package/src/models/MissionTravelCostModel.ts

@@ -1,64 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'mission_travel_costs' })
-export class MissionTravelCosts extends BaseModel {
-
-  @Column({ type: 'int', nullable: false })
-  request_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'int', nullable: false })
-  person_id: number; // Reference to mission_travel_persons.id
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  person_name: string;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  allowance_amount: number | null; // Pulled from calculated allowance
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  ticket_charges: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  hotel_charges: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  others: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  sub_total: number | null; // Auto-calculated: allowance + ticket + hotel + others
-
-  constructor(
-    request_id: number,
-    service_id: number | null,
-    sub_service_id: number | null,
-    person_id: number,
-    person_name: string,
-    allowance_amount: number | null,
-    ticket_charges: number | null,
-    hotel_charges: number | null,
-    others: number | null,
-    sub_total: number | null
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.person_id = person_id;
-    this.person_name = person_name;
-    this.allowance_amount = allowance_amount;
-    this.ticket_charges = ticket_charges;
-    this.hotel_charges = hotel_charges;
-    this.others = others;
-    this.sub_total = sub_total;
-  }
-}
-
-
-

package/src/models/MissionTravelPerdiemModel.ts

@@ -1,43 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'mission_travel_perdiem' })
-export class MissionTravelPerdiem extends BaseModel {
-
-  @Column({ type: 'int', nullable: false })
-  grade: number;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: false })
-  perdiem_amount: number;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  currency: string | null;
-
-  @Column({ type: 'date', nullable: true })
-  effective_from: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  effective_to: Date | null;
-
-  @Column({ type: 'boolean', default: true })
-  is_active: boolean;
-
-  constructor(
-    grade: number,
-    perdiem_amount: number,
-    currency: string | null,
-    effective_from: Date | null,
-    effective_to: Date | null
-  ) {
-    super();
-    this.grade = grade;
-    this.perdiem_amount = perdiem_amount;
-    this.currency = currency;
-    this.effective_from = effective_from;
-    this.effective_to = effective_to;
-    this.is_active = true;
-  }
-}
-
-
-