@platform-modules/foreign-ministry 1.3.53 → 1.3.54

package/src/models/MissionTravelPersonModel.ts

@@ -1,105 +1,105 @@
-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;
-  }
-}
-
-
-
+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: 'varchar', length: 255, nullable: true })
+  country_name: string | 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_name: string | 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_name = country_name;
+    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

@@ -107,3 +107,4 @@ export class MissionTravelRequests extends BaseModel {
 
 
 
+

package/src/models/MissionTravelWorkflowModel.ts

@@ -1,55 +1,55 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum MissionTravelWorkFlowStatus {
-  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: MissionTravelWorkFlowStatus, default: MissionTravelWorkFlowStatus.NOT_YET_STARTED, nullable: false })
-  status: MissionTravelWorkFlowStatus;
-
-  @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: MissionTravelWorkFlowStatus, 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;
-  }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum MissionTravelWorkFlowStatus {
+  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: MissionTravelWorkFlowStatus, default: MissionTravelWorkFlowStatus.NOT_YET_STARTED, nullable: false })
+  status: MissionTravelWorkFlowStatus;
+
+  @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: MissionTravelWorkFlowStatus, 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;
+  }
 }