@platform-modules/foreign-ministry 1.2.20 → 1.2.22

package/dist/models/FinancialGradeModel.d.ts

@@ -4,5 +4,7 @@ export declare class FinancialGrade extends BaseModel {
     arabic_title: string;
     financial_grade: number;
     leave_count: number;
-    constructor(diplomatic_title: string, arabic_title: string, financial_grade: number, leave_count: number);
+    daily_allowance: number | null;
+    travel_class: string | null;
+    constructor(diplomatic_title: string, arabic_title: string, financial_grade: number, leave_count: number, daily_allowance?: number, travel_class?: string);
 }

package/dist/models/FinancialGradeModel.js

@@ -14,12 +14,14 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 //This model is used to store the Financial Grade declaration on the Admin Side
 let FinancialGrade = class FinancialGrade extends BaseModel_1.BaseModel {
-    constructor(diplomatic_title, arabic_title, financial_grade, leave_count) {
+    constructor(diplomatic_title, arabic_title, financial_grade, leave_count, daily_allowance, travel_class) {
         super();
         this.diplomatic_title = diplomatic_title;
         this.arabic_title = arabic_title;
         this.financial_grade = financial_grade;
         this.leave_count = leave_count;
+        this.daily_allowance = daily_allowance || null;
+        this.travel_class = travel_class || null;
     }
 };
 exports.FinancialGrade = FinancialGrade;
@@ -39,7 +41,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: true }),
     __metadata("design:type", Number)
 ], FinancialGrade.prototype, "leave_count", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], FinancialGrade.prototype, "daily_allowance", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", Object)
+], FinancialGrade.prototype, "travel_class", void 0);
 exports.FinancialGrade = FinancialGrade = __decorate([
     (0, typeorm_1.Entity)({ name: 'financial_grade' }),
-    __metadata("design:paramtypes", [String, String, Number, Number])
+    __metadata("design:paramtypes", [String, String, Number, Number, Number, String])
 ], FinancialGrade);

package/dist/models/LeaveRequestModel.d.ts

@@ -11,6 +11,10 @@ export declare enum status {
     CANCELLED = "Cancelled",
     RETURNED = "Returned"
 }
+export declare enum location {
+    INSIDE = "Inside",
+    OUTSIDE = "Outside"
+}
 export declare class LeaveRequests extends BaseModel {
     user_id: string;
     leave_for: Leave_For;
@@ -48,5 +52,9 @@ export declare class LeaveRequests extends BaseModel {
     actual_leave_end_date: Date | null;
     actual_leave_duration: string | null;
     no_of_days_delayed: number | null;
-    constructor(user_id: string, leave_for: Leave_For, leave_type: number, study_leave_degree: number, department: string, status: status, leave_start_date: Date, leave_end_date: Date, leave_duration: number, remaining_leave_balance: number, contact_number_during_leave: string, address_during_leave: string, notes: string, delegated_to: string, number_of_escort_instances_per_year: number, accompanying_the_patient: boolean, treatment_place: string, emergency_leaves_available: number, unpaid_leave_type: string, country_or_state_being_visited: string, leave_balance_summary: string, representation: string, activity_title: string, relationship: string, mounring_leave_relation: number, service_id: number, sub_service_id: number, workflow_execution_id: string);
+    type_of_representation: string | null;
+    location: location;
+    exam_start_date: Date;
+    exam_end_date: Date;
+    constructor(user_id: string, location: location, exam_start_date: Date, exam_end_date: Date, leave_for: Leave_For, leave_type: number, study_leave_degree: number, department: string, status: status, leave_start_date: Date, leave_end_date: Date, leave_duration: number, remaining_leave_balance: number, contact_number_during_leave: string, address_during_leave: string, notes: string, delegated_to: string, number_of_escort_instances_per_year: number, accompanying_the_patient: boolean, treatment_place: string, emergency_leaves_available: number, unpaid_leave_type: string, country_or_state_being_visited: string, leave_balance_summary: string, representation: string, activity_title: string, relationship: string, mounring_leave_relation: number, service_id: number, sub_service_id: number, workflow_execution_id: string, type_of_representation: string);
 }

package/dist/models/LeaveRequestModel.js

@@ -9,7 +9,7 @@ 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.LeaveRequests = exports.status = exports.Leave_For = void 0;
+exports.LeaveRequests = exports.location = exports.status = exports.Leave_For = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 //This model is used to store the Leave Request
@@ -27,8 +27,13 @@ var status;
     status["CANCELLED"] = "Cancelled";
     status["RETURNED"] = "Returned";
 })(status || (exports.status = status = {}));
+var location;
+(function (location) {
+    location["INSIDE"] = "Inside";
+    location["OUTSIDE"] = "Outside";
+})(location || (exports.location = location = {}));
 let LeaveRequests = class LeaveRequests extends BaseModel_1.BaseModel {
-    constructor(user_id, leave_for, leave_type, study_leave_degree, department, status, leave_start_date, leave_end_date, leave_duration, remaining_leave_balance, contact_number_during_leave, address_during_leave, notes, delegated_to, number_of_escort_instances_per_year, accompanying_the_patient, treatment_place, emergency_leaves_available, unpaid_leave_type, country_or_state_being_visited, leave_balance_summary, representation, activity_title, relationship, mounring_leave_relation, service_id, sub_service_id, workflow_execution_id) {
+    constructor(user_id, location, exam_start_date, exam_end_date, leave_for, leave_type, study_leave_degree, department, status, leave_start_date, leave_end_date, leave_duration, remaining_leave_balance, contact_number_during_leave, address_during_leave, notes, delegated_to, number_of_escort_instances_per_year, accompanying_the_patient, treatment_place, emergency_leaves_available, unpaid_leave_type, country_or_state_being_visited, leave_balance_summary, representation, activity_title, relationship, mounring_leave_relation, service_id, sub_service_id, workflow_execution_id, type_of_representation) {
         super();
         this.user_id = user_id;
         this.leave_for = leave_for;
@@ -58,6 +63,10 @@ let LeaveRequests = class LeaveRequests extends BaseModel_1.BaseModel {
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
         this.workflow_execution_id = workflow_execution_id;
+        this.type_of_representation = type_of_representation;
+        this.location = location;
+        this.exam_start_date = exam_start_date;
+        this.exam_end_date = exam_end_date;
     }
 };
 exports.LeaveRequests = LeaveRequests;
@@ -205,7 +214,23 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true, default: null }),
     __metadata("design:type", Object)
 ], LeaveRequests.prototype, "no_of_days_delayed", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true, default: null }),
+    __metadata("design:type", Object)
+], LeaveRequests.prototype, "type_of_representation", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: location, default: location.INSIDE, nullable: true }),
+    __metadata("design:type", String)
+], LeaveRequests.prototype, "location", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Date)
+], LeaveRequests.prototype, "exam_start_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Date)
+], LeaveRequests.prototype, "exam_end_date", void 0);
 exports.LeaveRequests = LeaveRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'leave_requests' }),
-    __metadata("design:paramtypes", [String, String, Number, Number, String, String, Date, Date, Number, Number, String, String, String, String, Number, Boolean, String, Number, String, String, String, String, String, String, Number, Number, Number, String])
+    __metadata("design:paramtypes", [String, String, Date, Date, String, Number, Number, String, String, Date, Date, Number, Number, String, String, String, String, Number, Boolean, String, Number, String, String, String, String, String, String, Number, Number, Number, String, String])
 ], LeaveRequests);

package/dist/models/user.d.ts

@@ -43,5 +43,6 @@ export declare class User extends BaseModel {
     language_preferences?: string;
     category: "FM" | "Embassy";
     mandc_number: number;
-    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number);
+    is_services_blocked?: boolean;
+    constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number, is_services_blocked?: boolean);
 }

package/dist/models/user.js

@@ -13,7 +13,7 @@ exports.User = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let User = class User extends BaseModel_1.BaseModel {
-    constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category, mandc_number) {
+    constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category, mandc_number, is_services_blocked) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -58,6 +58,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.language_preferences = language_preferences;
         this.category = category || "FM";
         this.mandc_number = mandc_number || 0;
+        this.is_services_blocked = is_services_blocked;
     }
 };
 exports.User = User;
@@ -233,7 +234,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: "int", nullable: true, default: 0 }),
     __metadata("design:type", Number)
 ], User.prototype, "mandc_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true, default: false }),
+    __metadata("design:type", Boolean)
+], User.prototype, "is_services_blocked", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String, Number])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String, Number, Boolean])
 ], User);

package/package.json

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

package/src/models/FinancialGradeModel.ts

@@ -16,16 +16,26 @@ export class FinancialGrade extends BaseModel {
     @Column({ type: "integer", nullable: true })
     leave_count: number;
 
+    @Column({ type: "decimal", precision: 10, scale: 2, nullable: true })
+    daily_allowance: number | null;
+
+    @Column({ type: 'varchar', nullable: true })
+    travel_class: string | null;
+
     constructor(
         diplomatic_title: string,
         arabic_title: string,
         financial_grade: number,
-        leave_count: number
+        leave_count: number,
+        daily_allowance?: number,
+        travel_class?: string
     ) {
         super();
         this.diplomatic_title = diplomatic_title;
         this.arabic_title = arabic_title;
         this.financial_grade = financial_grade;
         this.leave_count = leave_count;
+        this.daily_allowance = daily_allowance || null;
+        this.travel_class = travel_class || null;
     }
 }

package/src/models/LeaveRequestModel.ts

@@ -14,6 +14,11 @@ export enum status {
   CANCELLED = "Cancelled",
   RETURNED = "Returned"
 }
+export enum location {
+  INSIDE = "Inside",
+  OUTSIDE = "Outside",
+}
+
 @Entity({ name: 'leave_requests' })
 export class LeaveRequests extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: true })
@@ -125,8 +130,19 @@ export class LeaveRequests extends BaseModel {
   @Column({ type: 'int', nullable: true ,default: null})
   no_of_days_delayed: number | null;
 
+  @Column({ type: 'varchar', length: 255, nullable: true, default: null})
+  type_of_representation: string | null;
+
+  @Column({ type: "enum", enum: location, default: location.INSIDE, nullable: true })
+  location: location;
+
+  @Column({ type: 'date', nullable: true })
+  exam_start_date: Date;
+
+  @Column({ type: 'date', nullable: true })
+  exam_end_date: Date;
 
-  constructor(user_id: string, leave_for: Leave_For, leave_type: number, study_leave_degree: number, department: string, status: status, leave_start_date: Date, leave_end_date: Date, leave_duration: number, remaining_leave_balance: number, contact_number_during_leave: string, address_during_leave: string, notes: string, delegated_to: string, number_of_escort_instances_per_year: number, accompanying_the_patient: boolean, treatment_place: string, emergency_leaves_available: number, unpaid_leave_type: string, country_or_state_being_visited: string, leave_balance_summary: string, representation: string, activity_title: string, relationship: string, mounring_leave_relation: number, service_id: number, sub_service_id: number, workflow_execution_id: string) {
+  constructor(user_id: string, location: location, exam_start_date: Date, exam_end_date: Date, leave_for: Leave_For, leave_type: number, study_leave_degree: number, department: string, status: status, leave_start_date: Date, leave_end_date: Date, leave_duration: number, remaining_leave_balance: number, contact_number_during_leave: string, address_during_leave: string, notes: string, delegated_to: string, number_of_escort_instances_per_year: number, accompanying_the_patient: boolean, treatment_place: string, emergency_leaves_available: number, unpaid_leave_type: string, country_or_state_being_visited: string, leave_balance_summary: string, representation: string, activity_title: string, relationship: string, mounring_leave_relation: number, service_id: number, sub_service_id: number, workflow_execution_id: string, type_of_representation: string) {
     super();
     this.user_id = user_id;
     this.leave_for = leave_for;
@@ -156,5 +172,9 @@ export class LeaveRequests extends BaseModel {
     this.service_id = service_id;
     this.sub_service_id = sub_service_id;
     this.workflow_execution_id = workflow_execution_id;
+    this.type_of_representation = type_of_representation;
+    this.location = location;
+    this.exam_start_date = exam_start_date;
+    this.exam_end_date = exam_end_date;
   }
 }

package/src/models/user.ts

@@ -135,6 +135,9 @@ export class User extends BaseModel {
     @Column({ type: "int", nullable: true , default: 0})
     mandc_number: number;
 
+    @Column({ nullable: true , default: false})
+    is_services_blocked?: boolean;
+
     constructor(     
         employee_id?: number,
         employee_name?: string,
@@ -179,6 +182,7 @@ export class User extends BaseModel {
         language_preferences?: string,
         category?: "FM" | "Embassy",
         mandc_number?: number,
+        is_services_blocked?: boolean,
     ) {
         super();     
         this.employee_id = employee_id;
@@ -224,5 +228,6 @@ export class User extends BaseModel {
         this.language_preferences = language_preferences;
         this.category = category || "FM";
         this.mandc_number = mandc_number || 0;
+        this.is_services_blocked = is_services_blocked;
     }
 }