@platform-modules/foreign-ministry 1.3.3 → 1.3.4

package/.env

@@ -1,5 +1,5 @@
 DB_HOST=localhost
 DB_PORT=5432
 DB_USER=postgres
-DB_PASS=stevejobs
+DB_PASS=Fa@123
 DB_NAME=FM

package/dist/models/GeneralServiceApprovalsModel.js

@@ -57,7 +57,7 @@ __decorate([
     __metadata("design:type", Object)
 ], GeneralServiceApprovals.prototype, "approver_user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], GeneralServiceApprovals.prototype, "approver_role_id", void 0);
 __decorate([

package/dist/models/MissionTravelApprovalModel.d.ts

@@ -3,8 +3,7 @@ export declare enum MissionTravelApprovalStatus {
     PENDING = "Pending",
     APPROVED = "Approved",
     REJECTED = "Rejected",
-    RFC = "RFC",// Request for Change
-    IN_PROGRESS = "In Progress"
+    RFC = "RFC"
 }
 export declare class MissionTravelApprovalDetails extends BaseModel {
     request_id: number;
@@ -22,6 +21,5 @@ export declare class MissionTravelApprovalDetails extends BaseModel {
     is_allowed: boolean;
     is_reassign: boolean;
     is_approval: boolean;
-    is_review: boolean;
-    constructor(request_id: number, service_id: number | null, sub_service_id: number | null, level: number, approver_role_id: number, department_id: number | null, section_id: number | null, approver_user_id: number | null, delegate_user_id: number | null, approved_by: number | null, comment: string, approval_status: MissionTravelApprovalStatus, is_allowed: boolean, is_reassign: boolean, is_approval: boolean, is_review?: boolean);
+    constructor(request_id: number, service_id: number | null, sub_service_id: number | null, level: number, approver_role_id: number, department_id: number | null, section_id: number | null, approver_user_id: number | null, delegate_user_id: number | null, approved_by: number | null, comment: string, approval_status: MissionTravelApprovalStatus, is_allowed: boolean, is_reassign: boolean, is_approval: boolean);
 }

package/dist/models/MissionTravelApprovalModel.js

@@ -17,11 +17,10 @@ var MissionTravelApprovalStatus;
     MissionTravelApprovalStatus["PENDING"] = "Pending";
     MissionTravelApprovalStatus["APPROVED"] = "Approved";
     MissionTravelApprovalStatus["REJECTED"] = "Rejected";
-    MissionTravelApprovalStatus["RFC"] = "RFC";
-    MissionTravelApprovalStatus["IN_PROGRESS"] = "In Progress";
+    MissionTravelApprovalStatus["RFC"] = "RFC"; // Request for Change
 })(MissionTravelApprovalStatus || (exports.MissionTravelApprovalStatus = MissionTravelApprovalStatus = {}));
 let MissionTravelApprovalDetails = class MissionTravelApprovalDetails extends BaseModel_1.BaseModel {
-    constructor(request_id, service_id, sub_service_id, level, approver_role_id, department_id, section_id, approver_user_id, delegate_user_id, approved_by, comment, approval_status, is_allowed, is_reassign, is_approval, is_review) {
+    constructor(request_id, service_id, sub_service_id, level, approver_role_id, department_id, section_id, approver_user_id, delegate_user_id, approved_by, comment, approval_status, is_allowed, is_reassign, is_approval) {
         super();
         this.request_id = request_id;
         this.service_id = service_id;
@@ -38,7 +37,6 @@ let MissionTravelApprovalDetails = class MissionTravelApprovalDetails extends Ba
         this.is_allowed = is_allowed;
         this.is_reassign = is_reassign;
         this.is_approval = is_approval;
-        this.is_review = is_review ?? false;
     }
 };
 exports.MissionTravelApprovalDetails = MissionTravelApprovalDetails;
@@ -102,11 +100,7 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
     __metadata("design:type", Boolean)
 ], MissionTravelApprovalDetails.prototype, "is_approval", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
-    __metadata("design:type", Boolean)
-], MissionTravelApprovalDetails.prototype, "is_review", void 0);
 exports.MissionTravelApprovalDetails = MissionTravelApprovalDetails = __decorate([
     (0, typeorm_1.Entity)({ name: 'mission_travel_approvals' }),
-    __metadata("design:paramtypes", [Number, Object, Object, Number, Number, Object, Object, Object, Object, Object, String, String, Boolean, Boolean, Boolean, Boolean])
+    __metadata("design:paramtypes", [Number, Object, Object, Number, Number, Object, Object, Object, Object, Object, String, String, Boolean, Boolean, Boolean])
 ], MissionTravelApprovalDetails);

package/dist/models/RegisterVacancyRequestModel.d.ts

@@ -16,7 +16,6 @@ export declare class RegisterVacancyRequests extends BaseModel {
     no_of_positions: number;
     description: string | null;
     salary: string;
-    currency_type: string | null;
     position_details: string;
     status: RegisterVacancyStatus;
     workflow_execution_id: string | null;

package/dist/models/RegisterVacancyRequestModel.js

@@ -59,10 +59,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: false }),
     __metadata("design:type", String)
 ], RegisterVacancyRequests.prototype, "salary", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", Object)
-], RegisterVacancyRequests.prototype, "currency_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: false }),
     __metadata("design:type", String)

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/models/GeneralServiceApprovalsModel.ts

@@ -21,7 +21,7 @@ export class GeneralServiceApprovals extends BaseModel {
   @Column({ type: 'int', nullable: true })
   approver_user_id: number | null;
 
-  @Column({ type: 'int' })
+  @Column({ type: 'int', nullable: true  })
   approver_role_id: number;
 
   @Column({ type: 'text', nullable: true })

package/src/models/LeaveConfigModel.ts

@@ -1,72 +1,72 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum enumFrequency {
-    Monthly = 'Monthly',
-    Yearly = 'Yearly',
-}
-
-//This model is used to store the Financial Grade declaration on the Admin Side
-@Entity({ name: 'leave_configuration' })
-export class LeaveConfiguration extends BaseModel {
-
-    @Column({ type: 'varchar', nullable: true })
-    category: string;
-
-    @Column({ type: 'int', nullable: true })
-    MandC_id: number;
-
-    @Column({ type: 'int', nullable: true })
-    leave_type_id: number;
-
-    @Column({ type: 'varchar', nullable: true })
-    frequency: enumFrequency;
-
-    @Column({ type: 'varchar', nullable: true })
-    region: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    country: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    location: string;
-
-    @Column({ nullable: true, default: false })
-    is_carryforward: boolean;
-
-    @Column({ type: 'int', nullable: true, default: 0 })
-    carryforward_limit: number;
-
-    @Column({ type: 'date', nullable: true })
-    from_date: Date;
-
-    @Column({ type: 'date', nullable: true })
-    to_date: Date;
-
-    @Column({ type: 'varchar', nullable: true })
-    reason: string;
-
-    @Column({ type: 'int', nullable: true })
-    emergency_balance_days: number | null;
-
-    @Column({ type: 'date', nullable: true })
-    last_credited: Date | null;
-
-    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
-        super();
-        this.category = category;
-        this.MandC_id = MandC_id;
-        this.leave_type_id = leave_type_id;
-        this.frequency = frequency;
-        this.region = region;
-        this.country = country;
-        this.location = location;
-        this.is_carryforward = is_carryforward;
-        this.carryforward_limit = carryforward_limit;
-        this.from_date = from_date;
-        this.to_date = to_date;
-        this.reason = reason;
-        this.emergency_balance_days = emergency_balance_days ?? null;
-        this.last_credited = last_credited ?? null;
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum enumFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Financial Grade declaration on the Admin Side
+@Entity({ name: 'leave_configuration' })
+export class LeaveConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    leave_type_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: enumFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ nullable: true, default: false })
+    is_carryforward: boolean;
+
+    @Column({ type: 'int', nullable: true, default: 0 })
+    carryforward_limit: number;
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'varchar', nullable: true })
+    reason: string;
+
+    @Column({ type: 'int', nullable: true })
+    emergency_balance_days: number | null;
+
+    @Column({ type: 'date', nullable: true })
+    last_credited: Date | null;
+
+    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.leave_type_id = leave_type_id;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.is_carryforward = is_carryforward;
+        this.carryforward_limit = carryforward_limit;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+        this.emergency_balance_days = emergency_balance_days ?? null;
+        this.last_credited = last_credited ?? null;
+    }
 }

package/src/models/MissionTravelApprovalModel.ts

@@ -1,100 +1,94 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum MissionTravelApprovalStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  RFC = "RFC", // Request for Change
-  IN_PROGRESS = "In Progress"
-}
-
-@Entity({ name: 'mission_travel_approvals' })
-export class MissionTravelApprovalDetails 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: true })
-  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: MissionTravelApprovalStatus, default: MissionTravelApprovalStatus.PENDING, nullable: false })
-  approval_status: MissionTravelApprovalStatus;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
-
-  @Column({ type: 'boolean', default: false, nullable: false })
-  is_reassign: boolean;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_approval: boolean;
-
-  @Column({ type: 'boolean', default: false, nullable: false })
-  is_review: boolean;
-
-  constructor(
-    request_id: number,
-    service_id: number | null,
-    sub_service_id: number | null,
-    level: number,
-    approver_role_id: number,
-    department_id: number | null,
-    section_id: number | null,
-    approver_user_id: number | null,
-    delegate_user_id: number | null,
-    approved_by: number | null,
-    comment: string,
-    approval_status: MissionTravelApprovalStatus,
-    is_allowed: boolean,
-    is_reassign: boolean,
-    is_approval: boolean,
-    is_review?: boolean
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.level = level;
-    this.approver_role_id = approver_role_id;
-    this.department_id = department_id;
-    this.section_id = section_id;
-    this.approver_user_id = approver_user_id;
-    this.delegate_user_id = delegate_user_id;
-    this.approved_by = approved_by;
-    this.comment = comment;
-    this.approval_status = approval_status;
-    this.is_allowed = is_allowed;
-    this.is_reassign = is_reassign;
-    this.is_approval = is_approval;
-    this.is_review = is_review ?? false;
-  }
-}
-
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum MissionTravelApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  RFC = "RFC" // Request for Change
+}
+
+@Entity({ name: 'mission_travel_approvals' })
+export class MissionTravelApprovalDetails 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: true })
+  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: MissionTravelApprovalStatus, default: MissionTravelApprovalStatus.PENDING, nullable: false })
+  approval_status: MissionTravelApprovalStatus;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+
+  @Column({ type: 'boolean', default: false, nullable: false })
+  is_reassign: boolean;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_approval: boolean;
+
+  constructor(
+    request_id: number,
+    service_id: number | null,
+    sub_service_id: number | null,
+    level: number,
+    approver_role_id: number,
+    department_id: number | null,
+    section_id: number | null,
+    approver_user_id: number | null,
+    delegate_user_id: number | null,
+    approved_by: number | null,
+    comment: string,
+    approval_status: MissionTravelApprovalStatus,
+    is_allowed: boolean,
+    is_reassign: boolean,
+    is_approval: boolean
+  ) {
+    super();
+    this.request_id = request_id;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.level = level;
+    this.approver_role_id = approver_role_id;
+    this.department_id = department_id;
+    this.section_id = section_id;
+    this.approver_user_id = approver_user_id;
+    this.delegate_user_id = delegate_user_id;
+    this.approved_by = approved_by;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.is_allowed = is_allowed;
+    this.is_reassign = is_reassign;
+    this.is_approval = is_approval;
+  }
+}
+
+

package/src/models/MissionTravelAttachmentModel.ts

@@ -1,56 +1,56 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'mission_travel_attachments' })
-export class MissionTravelRequestAttachment 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 })
-  uploaded_by: number;
-
-  @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: 'text', nullable: true })
-  description: string;
-
-  constructor(
-      request_id: number,
-      uploaded_by: number,
-      file_url: string,
-      file_name?: string,
-      file_type?: string,
-      file_size?: number,
-      description?: string,
-      service_id?: number | null,
-      sub_service_id?: number | null
-  ) {
-      super();
-      this.request_id = request_id;
-      this.uploaded_by = uploaded_by;
-      this.file_url = file_url;
-      this.file_name = file_name || '';
-      this.file_type = file_type || '';
-      this.file_size = file_size || null;
-      this.description = description || '';
-      this.service_id = service_id ?? null;
-      this.sub_service_id = sub_service_id ?? null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'mission_travel_attachments' })
+export class MissionTravelRequestAttachment 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 })
+  uploaded_by: number;
+
+  @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: 'text', nullable: true })
+  description: string;
+
+  constructor(
+      request_id: number,
+      uploaded_by: number,
+      file_url: string,
+      file_name?: string,
+      file_type?: string,
+      file_size?: number,
+      description?: string,
+      service_id?: number | null,
+      sub_service_id?: number | null
+  ) {
+      super();
+      this.request_id = request_id;
+      this.uploaded_by = uploaded_by;
+      this.file_url = file_url;
+      this.file_name = file_name || '';
+      this.file_type = file_type || '';
+      this.file_size = file_size || null;
+      this.description = description || '';
+      this.service_id = service_id ?? null;
+      this.sub_service_id = sub_service_id ?? null;
+  }
+}
+

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: '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: '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

@@ -106,4 +106,3 @@ 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;
+  }
 }

package/src/models/RegisterVacancyRequestModel.ts

@@ -40,9 +40,6 @@ export class RegisterVacancyRequests extends BaseModel {
   @Column({ type: 'varchar', nullable: false })
   salary: string;
 
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  currency_type: string | null;
-
   @Column({ type: 'text', nullable: false })
   position_details: string;
 

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);
-}

package/dist/models/MissionTravelPerdiemModel.js

@@ -1,54 +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.MissionTravelPerdiem = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let MissionTravelPerdiem = class MissionTravelPerdiem extends BaseModel_1.BaseModel {
-    constructor(grade, perdiem_amount, currency, effective_from, effective_to) {
-        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;
-    }
-};
-exports.MissionTravelPerdiem = MissionTravelPerdiem;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], MissionTravelPerdiem.prototype, "grade", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
-    __metadata("design:type", Number)
-], MissionTravelPerdiem.prototype, "perdiem_amount", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPerdiem.prototype, "currency", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPerdiem.prototype, "effective_from", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPerdiem.prototype, "effective_to", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: true }),
-    __metadata("design:type", Boolean)
-], MissionTravelPerdiem.prototype, "is_active", void 0);
-exports.MissionTravelPerdiem = MissionTravelPerdiem = __decorate([
-    (0, typeorm_1.Entity)({ name: 'mission_travel_perdiem' }),
-    __metadata("design:paramtypes", [Number, Number, Object, Object, Object])
-], MissionTravelPerdiem);