@platform-modules/foreign-ministry 1.3.81 → 1.3.82

package/src/models/MissionTravelChatModel.ts

@@ -1,52 +1,52 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'mission_travel_chats' })
-export class MissionTravelRequestChat 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: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'text', nullable: false })
-  message: string;
-
-  @Column({ type: 'text', nullable: true })
-  status: string | null;
-
-  @Column({ type: 'boolean', default: false })
-  is_internal: boolean;
-
-  constructor(
-      request_id: number,
-      user_id: number,
-      message: string,
-      is_internal?: boolean,
-      service_id?: number | null,
-      sub_service_id?: number | null,
-      role_id?: number | null,
-      status?: string | null
-  ) {
-      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.role_id = role_id || null;
-      this.message = message;
-      this.status = status || null;
-      this.is_internal = is_internal || false;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'mission_travel_chats' })
+export class MissionTravelRequestChat 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: 'integer', nullable: true })
+  role_id: number | null;
+
+  @Column({ type: 'text', nullable: false })
+  message: string;
+
+  @Column({ type: 'text', nullable: true })
+  status: string | null;
+
+  @Column({ type: 'boolean', default: false })
+  is_internal: boolean;
+
+  constructor(
+      request_id: number,
+      user_id: number,
+      message: string,
+      is_internal?: boolean,
+      service_id?: number | null,
+      sub_service_id?: number | null,
+      role_id?: number | null,
+      status?: string | null
+  ) {
+      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.role_id = role_id || null;
+      this.message = message;
+      this.status = status || null;
+      this.is_internal = is_internal || false;
+  }
+}
+

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: '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;
-  }
-}
-
-
-
+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/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;
+  }
 }

package/src/models/SectionModel.ts

@@ -1,36 +1,36 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'sections' })
-export class Sections extends BaseModel {
-
-    @Column({ type: 'varchar', length: 64, nullable: false })
-    section_name: string;
-
-    @Column({ type: 'varchar', length: 64, nullable: false })
-    section_code: string;
-
-    @Column({ nullable: false })
-    section_description: string;
-
-    @Column({ type: 'bigint', nullable: true })
-    department_id: number;
-
-    @Column({ nullable: true , default: false})
-    is_followup_sec?: boolean;
-
-    constructor(     
-        section_name: string,
-        section_code: string,
-        section_description: string,
-        department_id: number,
-        is_followup_sec: boolean
-    ) {
-        super();     
-        this.section_name = section_name
-        this.section_code = section_code
-        this.section_description = section_description
-        this.department_id = department_id
-        this.is_followup_sec = is_followup_sec
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'sections' })
+export class Sections extends BaseModel {
+
+    @Column({ type: 'varchar', length: 64, nullable: false })
+    section_name: string;
+
+    @Column({ type: 'varchar', length: 64, nullable: false })
+    section_code: string;
+
+    @Column({ nullable: false })
+    section_description: string;
+
+    @Column({ type: 'bigint', nullable: true })
+    department_id: number;
+
+    @Column({ nullable: true , default: false})
+    is_followup_sec?: boolean;
+
+    constructor(     
+        section_name: string,
+        section_code: string,
+        section_description: string,
+        department_id: number,
+        is_followup_sec: boolean
+    ) {
+        super();     
+        this.section_name = section_name
+        this.section_code = section_code
+        this.section_description = section_description
+        this.department_id = department_id
+        this.is_followup_sec = is_followup_sec
+    }
 }

package/src/models/UserEmploymentDetailsModel.ts

@@ -12,6 +12,12 @@ export class UserEmploymentDetails extends BaseModel {
   user_id: number; // Foreign key to users table
 
   // Job Information
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  job_title: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  man_power_number: string | null;
+
   @Column({ type: 'date', nullable: true })
   date_of_decree_issuance: Date | null;
 
@@ -51,6 +57,9 @@ export class UserEmploymentDetails extends BaseModel {
   @Column({ type: 'date', nullable: true })
   retirement_start_date: Date | null;
 
+  @Column({ type: 'date', nullable: true })
+  retirement_end_date: Date | null;
+
   @Column({ type: 'date', nullable: true })
   contract_end_date: Date | null;
 
@@ -74,6 +83,9 @@ export class UserEmploymentDetails extends BaseModel {
   job_description: string | null;
 
   // Appointment Information
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  country_of_appointment: string | null;
+
   @Column({ type: 'date', nullable: true })
   date_of_appointment: Date | null;
 
@@ -95,6 +107,9 @@ export class UserEmploymentDetails extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   works_in_department: string | null;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  office: string | null;
+
   // Mission Information
   @Column({ type: 'varchar', length: 255, nullable: true })
   full_name_of_mission: string | null;

package/src/models/user.ts

@@ -118,12 +118,22 @@ export class User extends BaseModel {
 
     @Column({ nullable: true })
     spouse_name?: string;
+
+    @Column({ type: 'int', nullable: true })
+    father_age?: number;
     
     @Column({ nullable: true })
-    children1_name?: string;
- 
-    @Column({ nullable: true })
-    children2_name?: string;
+    mother_name?: string;
+
+    @Column({ type: 'int', nullable: true })
+    mother_age?: number;
+
+
+    @Column({ type: 'int', nullable: true })
+    spouse_age?: number;
+
+    @Column({ type: 'jsonb', nullable: true })
+    children?: { name: string; age: number }[];
 
     
     @Column({ nullable: true })
@@ -176,9 +186,12 @@ export class User extends BaseModel {
         civil_employee_id?: number,
         qualification?: string,
         father_name?: string,
+        father_age?: number,
+        mother_name?: string,
+        mother_age?: number,
         spouse_name?: string,
-        children1_name?: string,
-        children2_name?: string,
+        spouse_age?: number,
+        children?: { name: string; age: number }[],
         language_preferences?: string,
         category?: "FM" | "Embassy",
         mandc_number?: number,
@@ -222,9 +235,12 @@ export class User extends BaseModel {
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
         this.father_name = father_name;
+        this.father_age = father_age;
+        this.mother_name = mother_name;
+        this.mother_age = mother_age;
         this.spouse_name = spouse_name;
-        this.children1_name = children1_name;
-        this.children2_name = children2_name;
+        this.spouse_age = spouse_age;
+        this.children = children;
         this.language_preferences = language_preferences;
         this.category = category || "FM";
         this.mandc_number = mandc_number || 0;

package/dist/models/MissionTravelClassConfigModel.d.ts

@@ -1,10 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { TravelClass } from './MissionTravelPersonModel';
-export declare class MissionTravelClassConfig extends BaseModel {
-    grade: number | null;
-    position: string | null;
-    travel_class: TravelClass;
-    is_active: boolean;
-    description: string | null;
-    constructor(grade: number | null, position: string | null, travel_class: TravelClass, description: string | null);
-}

package/dist/models/MissionTravelClassConfigModel.js

@@ -1,50 +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.MissionTravelClassConfig = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const MissionTravelPersonModel_1 = require("./MissionTravelPersonModel");
-let MissionTravelClassConfig = class MissionTravelClassConfig extends BaseModel_1.BaseModel {
-    constructor(grade, position, travel_class, description) {
-        super();
-        this.grade = grade;
-        this.position = position;
-        this.travel_class = travel_class;
-        this.description = description;
-        this.is_active = true;
-    }
-};
-exports.MissionTravelClassConfig = MissionTravelClassConfig;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "grade", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "position", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: MissionTravelPersonModel_1.TravelClass, nullable: false }),
-    __metadata("design:type", String)
-], MissionTravelClassConfig.prototype, "travel_class", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
-    __metadata("design:type", Boolean)
-], MissionTravelClassConfig.prototype, "is_active", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelClassConfig.prototype, "description", void 0);
-exports.MissionTravelClassConfig = MissionTravelClassConfig = __decorate([
-    (0, typeorm_1.Entity)({ name: 'mission_travel_class_config' }),
-    __metadata("design:paramtypes", [Object, Object, String, Object])
-], MissionTravelClassConfig);

package/dist/models/MissionTravelPerdiemModel.d.ts

@@ -1,10 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class MissionTravelPerdiem extends BaseModel {
-    grade: number;
-    perdiem_amount: number;
-    currency: string | null;
-    effective_from: Date | null;
-    effective_to: Date | null;
-    is_active: boolean;
-    constructor(grade: number, perdiem_amount: number, currency: string | null, effective_from: Date | null, effective_to: Date | null);
-}