@platform-modules/foreign-ministry 1.0.85 → 1.0.87

package/dist/models/AllowanceRequestsModel.d.ts

@@ -1,9 +1,13 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 export declare class AllowanceRequests extends BaseModel {
     financial_request_id: number;
     allowance_type_id: number;
     allowance_amount: number;
     approved_allowance_amount: number;
     currency: string;
-    constructor(financial_request_id: number, allowance_type_id: number, allowance_amount: number, approved_allowance_amount: number, currency: string);
+    contact_number: string;
+    description: string;
+    financialRequest?: FinancialRequests;
+    constructor(financial_request_id: number, allowance_type_id: number, allowance_amount: number, approved_allowance_amount: number, currency: string, contact_number: string, description: string);
 }

package/dist/models/AllowanceRequestsModel.js

@@ -12,14 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllowanceRequests = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let AllowanceRequests = class AllowanceRequests extends BaseModel_1.BaseModel {
-    constructor(financial_request_id, allowance_type_id, allowance_amount, approved_allowance_amount, currency) {
+    constructor(financial_request_id, allowance_type_id, allowance_amount, approved_allowance_amount, currency, contact_number, description) {
         super();
         this.financial_request_id = financial_request_id;
         this.allowance_type_id = allowance_type_id;
         this.allowance_amount = allowance_amount;
         this.approved_allowance_amount = approved_allowance_amount;
         this.currency = currency;
+        this.contact_number = contact_number;
+        this.description = description;
     }
 };
 exports.AllowanceRequests = AllowanceRequests;
@@ -43,7 +46,19 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: false }),
     __metadata("design:type", String)
 ], AllowanceRequests.prototype, "currency", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true }),
+    __metadata("design:type", String)
+], AllowanceRequests.prototype, "contact_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", String)
+], AllowanceRequests.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)('FinancialRequests', 'allowanceRequest'),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], AllowanceRequests.prototype, "financialRequest", void 0);
 exports.AllowanceRequests = AllowanceRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'allowance_requests' }),
-    __metadata("design:paramtypes", [Number, Number, Number, Number, String])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, String, String, String])
 ], AllowanceRequests);

package/dist/models/FinancialSettingsModel.d.ts

@@ -4,5 +4,8 @@ export declare class FinancialSettings extends BaseModel {
     approval_level: number;
     approver_role_id: number;
     is_active: boolean;
-    constructor(service_id: number, approval_level: number, approver_role_id: number);
+    sub_service_id: number;
+    department_id: number;
+    section_id: number;
+    constructor(service_id: number, approval_level: number, approver_role_id: number, sub_service_id: number, department_id: number, section_id: number);
 }

package/dist/models/FinancialSettingsModel.js

@@ -13,12 +13,15 @@ exports.FinancialSettings = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let FinancialSettings = class FinancialSettings extends BaseModel_1.BaseModel {
-    constructor(service_id, approval_level, approver_role_id) {
+    constructor(service_id, approval_level, approver_role_id, sub_service_id, department_id, section_id) {
         super();
         this.service_id = service_id;
         this.approval_level = approval_level;
         this.approver_role_id = approver_role_id;
         this.is_active = true;
+        this.sub_service_id = sub_service_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
     }
 };
 exports.FinancialSettings = FinancialSettings;
@@ -38,7 +41,19 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true }),
     __metadata("design:type", Boolean)
 ], FinancialSettings.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialSettings.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialSettings.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], FinancialSettings.prototype, "section_id", void 0);
 exports.FinancialSettings = FinancialSettings = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_settings' }),
-    __metadata("design:paramtypes", [Number, Number, Number])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Number, Number])
 ], FinancialSettings);

package/dist/models/ReimbursementRequestsModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 export declare class ReimbursementRequests extends BaseModel {
     financial_request_id: number;
     expense_description: string;
@@ -10,5 +11,6 @@ export declare class ReimbursementRequests extends BaseModel {
     payment_processed: boolean;
     payment_mode: string;
     payment_date: Date;
+    financialRequest?: FinancialRequests;
     constructor(financial_request_id: number, amount: number, quantity: number, total_amount: number, approved_amount: number, payment_mode: string, payment_date: Date, expense_description: string);
 }

package/dist/models/ReimbursementRequestsModel.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReimbursementRequests = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
+const FinancialRequestsModel_1 = require("./FinancialRequestsModel");
 let ReimbursementRequests = class ReimbursementRequests extends BaseModel_1.BaseModel {
     constructor(financial_request_id, amount, quantity, total_amount, approved_amount, payment_mode, payment_date, expense_description) {
         super();
@@ -67,6 +68,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
 ], ReimbursementRequests.prototype, "payment_date", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)('FinancialRequests', 'reimbursementRequest'),
+    __metadata("design:type", FinancialRequestsModel_1.FinancialRequests)
+], ReimbursementRequests.prototype, "financialRequest", void 0);
 exports.ReimbursementRequests = ReimbursementRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'reimbursement_requests' }),
     __metadata("design:paramtypes", [Number, Number, Number, Number, Number, String, Date, String])

package/package.json

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

package/src/models/AllowanceRequestsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, OneToOne, JoinColumn, ManyToOne } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 
 @Entity({ name: 'allowance_requests' })
 export class AllowanceRequests extends BaseModel {
@@ -16,7 +17,16 @@ export class AllowanceRequests extends BaseModel {
   approved_allowance_amount: number;
 
   @Column({ type: 'boolean', default: false })
-  currency : string;
+  currency : string;  
+
+  @Column({ type: 'varchar', length: 10, nullable: true })
+  contact_number: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  description: string;
+
+  @OneToOne('FinancialRequests', 'allowanceRequest')
+  financialRequest?: FinancialRequests;
 
 
   constructor(
@@ -24,7 +34,9 @@ export class AllowanceRequests extends BaseModel {
     allowance_type_id: number,
     allowance_amount: number,
     approved_allowance_amount: number,
-    currency: string
+    currency: string,
+    contact_number: string,
+    description: string
 
   ) {
     super();
@@ -33,6 +45,8 @@ export class AllowanceRequests extends BaseModel {
     this.allowance_amount = allowance_amount;
     this.approved_allowance_amount = approved_allowance_amount;
     this.currency = currency;
+    this.contact_number = contact_number;
+    this.description = description;
   }
 }
 

package/src/models/FinancialSettingsModel.ts

@@ -15,16 +15,31 @@ export class FinancialSettings extends BaseModel {
   @Column({ type: 'boolean', default: true })
   is_active: boolean;
 
+  @Column({ type: 'int',nullable: true })
+  sub_service_id: number;
+
+  @Column({ type: 'int',nullable: true })
+  department_id: number;
+
+  @Column({ type: 'int',nullable: true })
+  section_id: number;
+
   constructor(
     service_id: number,
     approval_level: number,
     approver_role_id: number,
+    sub_service_id: number,
+    department_id: number,
+    section_id: number
   ) {
     super();
     this.service_id = service_id;
     this.approval_level = approval_level;
     this.approver_role_id = approver_role_id;
     this.is_active = true;
+    this.sub_service_id = sub_service_id;
+    this.department_id = department_id;
+    this.section_id = section_id;
   }
 }
 

package/src/models/ReimbursementRequestsModel.ts

@@ -1,5 +1,6 @@
 import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { FinancialRequests } from "./FinancialRequestsModel";
 
 @Entity({ name: 'reimbursement_requests' })
 export class ReimbursementRequests extends BaseModel {
@@ -33,6 +34,9 @@ export class ReimbursementRequests extends BaseModel {
   @Column({ type: 'date', nullable: true })
   payment_date: Date;
 
+  @OneToOne('FinancialRequests', 'reimbursementRequest')
+  financialRequest?: FinancialRequests;
+
   constructor(
     financial_request_id: number,
     amount: number,