@platform-modules/foreign-ministry 1.3.93 → 1.3.94

package/dist/index.d.ts

@@ -215,6 +215,7 @@ export * from './models/MissionTravelRequestModel';
 export { MissionTravelStatus, MissionType, DecisionType } from './models/MissionTravelRequestModel';
 export * from './models/MissionTravelPersonModel';
 export { AllowanceRatio } from './models/MissionTravelPersonModel';
+export * from './models/MissionTravelCostModel';
 export * from './models/MissionTravelApprovalModel';
 export { MissionTravelApprovalStatus } from './models/MissionTravelApprovalModel';
 export * from './models/MissionTravelAttachmentModel';

package/dist/index.js

@@ -270,6 +270,7 @@ Object.defineProperty(exports, "DecisionType", { enumerable: true, get: function
 __exportStar(require("./models/MissionTravelPersonModel"), exports);
 var MissionTravelPersonModel_1 = require("./models/MissionTravelPersonModel");
 Object.defineProperty(exports, "AllowanceRatio", { enumerable: true, get: function () { return MissionTravelPersonModel_1.AllowanceRatio; } });
+__exportStar(require("./models/MissionTravelCostModel"), exports);
 __exportStar(require("./models/MissionTravelApprovalModel"), exports);
 var MissionTravelApprovalModel_1 = require("./models/MissionTravelApprovalModel");
 Object.defineProperty(exports, "MissionTravelApprovalStatus", { enumerable: true, get: function () { return MissionTravelApprovalModel_1.MissionTravelApprovalStatus; } });

package/dist/models/MissionTravelPersonModel.d.ts

@@ -22,9 +22,5 @@ export declare class MissionTravelPersons extends BaseModel {
     travel_agent_name: string | null;
     allowance_amount: number | null;
     grade: number | null;
-    ticket_charges: number | null;
-    hotel_charges: number | null;
-    others: number | null;
-    sub_total: number | null;
-    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, ticket_charges: number | null, hotel_charges: number | null, others: number | null, sub_total: number | null);
+    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);
 }

package/dist/models/MissionTravelPersonModel.js

@@ -19,7 +19,7 @@ var AllowanceRatio;
     AllowanceRatio["RATIO_50"] = "50";
 })(AllowanceRatio || (exports.AllowanceRatio = AllowanceRatio = {}));
 let MissionTravelPersons = class MissionTravelPersons extends BaseModel_1.BaseModel {
-    constructor(request_id, service_id, sub_service_id, travel_person_name, user_id, country_name, allowance_ratio, travel_from_date, travel_to_date, travel_class, number_of_days, hotel_name, hotel_rating, hotel_price, travel_agent_name, allowance_amount, grade, ticket_charges, hotel_charges, others, sub_total) {
+    constructor(request_id, service_id, sub_service_id, travel_person_name, user_id, country_name, allowance_ratio, travel_from_date, travel_to_date, travel_class, number_of_days, hotel_name, hotel_rating, hotel_price, travel_agent_name, allowance_amount, grade) {
         super();
         this.request_id = request_id;
         this.service_id = service_id;
@@ -38,10 +38,6 @@ let MissionTravelPersons = class MissionTravelPersons extends BaseModel_1.BaseMo
         this.travel_agent_name = travel_agent_name;
         this.allowance_amount = allowance_amount;
         this.grade = grade;
-        this.ticket_charges = ticket_charges;
-        this.hotel_charges = hotel_charges;
-        this.others = others;
-        this.sub_total = sub_total;
     }
 };
 exports.MissionTravelPersons = MissionTravelPersons;
@@ -113,23 +109,7 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Object)
 ], MissionTravelPersons.prototype, "grade", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPersons.prototype, "ticket_charges", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPersons.prototype, "hotel_charges", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPersons.prototype, "others", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: true }),
-    __metadata("design:type", Object)
-], MissionTravelPersons.prototype, "sub_total", void 0);
 exports.MissionTravelPersons = MissionTravelPersons = __decorate([
     (0, typeorm_1.Entity)({ name: 'mission_travel_persons' }),
-    __metadata("design:paramtypes", [Number, Object, Object, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Object, Object, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], MissionTravelPersons);

package/package.json

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

package/src/index.ts

@@ -219,6 +219,7 @@ export * from './models/MissionTravelRequestModel';
 export { MissionTravelStatus, MissionType, DecisionType } from './models/MissionTravelRequestModel';
 export * from './models/MissionTravelPersonModel';
 export { AllowanceRatio } from './models/MissionTravelPersonModel';
+export * from './models/MissionTravelCostModel';
 export * from './models/MissionTravelApprovalModel';
 export { MissionTravelApprovalStatus } from './models/MissionTravelApprovalModel';
 export * from './models/MissionTravelAttachmentModel';

package/src/models/MissionTravelCostModel.ts

@@ -0,0 +1,62 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'mission_travel_costs' })
+export class MissionTravelCosts 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 })
+  person_id: number;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  person_name: string | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  allowance_amount: number | null;
+
+  @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;
+
+  constructor(
+    request_id: number,
+    person_id: number,
+    service_id?: number | null,
+    sub_service_id?: number | null,
+    person_name?: string | null,
+    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.person_id = person_id;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.person_name = person_name || null;
+    this.allowance_amount = allowance_amount || null;
+    this.ticket_charges = ticket_charges || null;
+    this.hotel_charges = hotel_charges || null;
+    this.others = others || null;
+    this.sub_total = sub_total || null;
+  }
+}
+
+

package/src/models/MissionTravelPersonModel.ts

@@ -61,18 +61,6 @@ export class MissionTravelPersons extends BaseModel {
   @Column({ type: 'int', nullable: true })
   grade: number | null; // Employee grade for perdiem calculation
 
-  @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;
-
   constructor(
     request_id: number,
     service_id: number | null,
@@ -90,11 +78,7 @@ export class MissionTravelPersons extends BaseModel {
     hotel_price: number | null,
     travel_agent_name: string | null,
     allowance_amount: number | null,
-    grade: number | null,
-    ticket_charges: number | null,
-    hotel_charges: number | null,
-    others: number | null,
-    sub_total: number | null
+    grade: number | null
   ) {
     super();
     this.request_id = request_id;
@@ -114,10 +98,6 @@ export class MissionTravelPersons extends BaseModel {
     this.travel_agent_name = travel_agent_name;
     this.allowance_amount = allowance_amount;
     this.grade = grade;
-    this.ticket_charges = ticket_charges;
-    this.hotel_charges = hotel_charges;
-    this.others = others;
-    this.sub_total = sub_total;
   }
 }