@platform-modules/foreign-ministry 1.3.58 → 1.3.60

package/dist/models/JobsModel.d.ts

@@ -13,5 +13,7 @@ export declare class Jobs extends BaseModel {
     title: string;
     grade: number;
     description: string;
-    constructor(title: string, grade: number, description: string);
+    location: string | null;
+    job_description: string | null;
+    constructor(title: string, grade: number, description: string, location?: string | null, job_description?: string | null);
 }

package/dist/models/JobsModel.js

@@ -23,11 +23,13 @@ exports.Jobs = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let Jobs = class Jobs extends BaseModel_1.BaseModel {
-    constructor(title, grade, description) {
+    constructor(title, grade, description, location, job_description) {
         super();
         this.title = title;
         this.grade = grade;
         this.description = description;
+        this.location = location || null;
+        this.job_description = job_description || null;
     }
 };
 exports.Jobs = Jobs;
@@ -43,7 +45,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: false }),
     __metadata("design:type", String)
 ], Jobs.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", Object)
+], Jobs.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", Object)
+], Jobs.prototype, "job_description", void 0);
 exports.Jobs = Jobs = __decorate([
     (0, typeorm_1.Entity)({ name: 'jobs' }),
-    __metadata("design:paramtypes", [String, Number, String])
+    __metadata("design:paramtypes", [String, Number, String, Object, Object])
 ], Jobs);

package/dist/models/MissionTravelPersonModel.d.ts

@@ -10,7 +10,7 @@ export declare class MissionTravelPersons extends BaseModel {
     sub_service_id: number | null;
     travel_person_name: string;
     user_id: number | null;
-    country_id: number | null;
+    country_name: string | null;
     allowance_ratio: AllowanceRatio | null;
     travel_from_date: Date | null;
     travel_to_date: Date | null;
@@ -22,5 +22,5 @@ export declare class MissionTravelPersons extends BaseModel {
     travel_agent_name: string | null;
     allowance_amount: number | null;
     grade: number | null;
-    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);
+    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,14 +19,14 @@ 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_id, 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) {
+    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;
         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.country_name = country_name;
         this.allowance_ratio = allowance_ratio;
         this.travel_from_date = travel_from_date;
         this.travel_to_date = travel_to_date;
@@ -62,9 +62,9 @@ __decorate([
     __metadata("design:type", Object)
 ], MissionTravelPersons.prototype, "user_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
-], MissionTravelPersons.prototype, "country_id", void 0);
+], MissionTravelPersons.prototype, "country_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 10, nullable: true }),
     __metadata("design:type", Object)

package/dist/models/RegisterVacancyRequestModel.d.ts

@@ -13,7 +13,7 @@ export declare class RegisterVacancyRequests extends BaseModel {
     sub_service_id: number | null;
     user_id: number;
     MandC_id: number;
-    no_of_positions: number;
+    name_of_positions: string;
     description: string | null;
     salary: string;
     currency_type: string | null;

package/dist/models/RegisterVacancyRequestModel.js

@@ -48,9 +48,9 @@ __decorate([
     __metadata("design:type", Number)
 ], RegisterVacancyRequests.prototype, "MandC_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], RegisterVacancyRequests.prototype, "no_of_positions", void 0);
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", String)
+], RegisterVacancyRequests.prototype, "name_of_positions", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", Object)

package/dist/models/TelephoneDirectoryModel.js

@@ -42,7 +42,7 @@ __decorate([
     __metadata("design:type", Number)
 ], TelephoneDirectory.prototype, "id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy"], nullable: false }),
+    (0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy", "M&C"], nullable: false }),
     __metadata("design:type", String)
 ], TelephoneDirectory.prototype, "category", void 0);
 __decorate([

package/package.json

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

package/src/models/JobsModel.ts

@@ -23,15 +23,25 @@ export class Jobs extends BaseModel {
     @Column({ type: 'text', nullable: false })
     description: string;
 
+    @Column({ type: 'varchar', nullable: true })
+    location: string | null;
+
+    @Column({ type: 'text', nullable: true })
+    job_description: string | null;
+
     constructor(
         title: string,
         grade: number,
-        description: string
+        description: string,
+        location?: string | null,
+        job_description?: string | null
     ) {
         super();
         this.title = title;
         this.grade = grade;
         this.description = description;
+        this.location = location || null;
+        this.job_description = job_description || null;
     }
 }
 

package/src/models/MissionTravelPersonModel.ts

@@ -25,8 +25,8 @@ export class MissionTravelPersons extends BaseModel {
   @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: 255, nullable: true })
+  country_name: string | null;
 
   @Column({ type: 'varchar', length: 10, nullable: true })
   allowance_ratio: AllowanceRatio | null; // 100, 75, or 50
@@ -67,7 +67,7 @@ export class MissionTravelPersons extends BaseModel {
     sub_service_id: number | null,
     travel_person_name: string,
     user_id: number | null,
-    country_id: number | null,
+    country_name: string | null,
     allowance_ratio: AllowanceRatio | null,
     travel_from_date: Date | null,
     travel_to_date: Date | null,
@@ -86,7 +86,7 @@ export class MissionTravelPersons extends BaseModel {
     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.country_name = country_name;
     this.allowance_ratio = allowance_ratio;
     this.travel_from_date = travel_from_date;
     this.travel_to_date = travel_to_date;

package/src/models/MissionTravelRequestModel.ts

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

package/src/models/RegisterVacancyRequestModel.ts

@@ -31,8 +31,8 @@ export class RegisterVacancyRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   MandC_id: number;
 
-  @Column({ type: 'int', nullable: false })
-  no_of_positions: number;
+  @Column({ type: 'varchar', nullable: true })
+  name_of_positions: string;
 
   @Column({ type: 'varchar', nullable: true })
   description: string | null;

package/src/models/TelephoneDirectoryModel.ts

@@ -7,7 +7,7 @@ export class TelephoneDirectory extends BaseModel {
   id: number;
 
   // General Information
-  @Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false })
+  @Column({ type: "enum", enum: ["FM", "Embassy","M&C"], nullable: false })
   category: "FM" | "Embassy"; // Mandatory - to differentiate FM and Embassy
 
   @Column({ type: "varchar", length: 255, nullable: false })