@platform-modules/foreign-ministry 1.1.2 → 1.1.4

package/dist/models/BankNamesModel.d.ts

@@ -4,6 +4,7 @@ export declare class BankNames extends BaseModel {
     bank_code: string;
     bank_description: string;
     country: string;
+    bank_type: string;
     is_active: boolean;
-    constructor(bank_name: string, bank_code: string, bank_description?: string, country?: string);
+    constructor(bank_name: string, bank_code: string, bank_description?: string, country?: string, bank_type?: string);
 }

package/dist/models/BankNamesModel.js

@@ -13,13 +13,14 @@ exports.BankNames = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let BankNames = class BankNames extends BaseModel_1.BaseModel {
-    constructor(bank_name, bank_code, bank_description, country) {
+    constructor(bank_name, bank_code, bank_description, country, bank_type) {
         super();
         this.bank_name = bank_name;
         this.bank_code = bank_code;
         this.bank_description = bank_description || '';
         this.country = country || '';
         this.is_active = true;
+        this.bank_type = bank_type || '';
     }
 };
 exports.BankNames = BankNames;
@@ -39,11 +40,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], BankNames.prototype, "country", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], BankNames.prototype, "bank_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true }),
     __metadata("design:type", Boolean)
 ], BankNames.prototype, "is_active", void 0);
 exports.BankNames = BankNames = __decorate([
     (0, typeorm_1.Entity)({ name: 'bank_names' }),
-    __metadata("design:paramtypes", [String, String, String, String])
+    __metadata("design:paramtypes", [String, String, String, String, String])
 ], BankNames);

package/dist/models/FinancialApprovalsModel.d.ts

@@ -4,7 +4,8 @@ export declare enum FinancialApprovalStatus {
     PENDING = "Pending",
     APPROVED = "Approved",
     REJECTED = "Rejected",
-    SKIPPED = "Skipped"
+    SKIPPED = "Skipped",
+    IN_PROGRESS = "In Progress"
 }
 export declare class FinancialApprovals extends BaseModel {
     financial_request_id: number;

package/dist/models/FinancialApprovalsModel.js

@@ -19,6 +19,7 @@ var FinancialApprovalStatus;
     FinancialApprovalStatus["APPROVED"] = "Approved";
     FinancialApprovalStatus["REJECTED"] = "Rejected";
     FinancialApprovalStatus["SKIPPED"] = "Skipped";
+    FinancialApprovalStatus["IN_PROGRESS"] = "In Progress";
 })(FinancialApprovalStatus || (exports.FinancialApprovalStatus = FinancialApprovalStatus = {}));
 let FinancialApprovals = class FinancialApprovals extends BaseModel_1.BaseModel {
     constructor(financial_request_id, level, approver_role_id, approval_status, department_id, section_id, approved_by) {

package/dist/models/user.d.ts

@@ -31,6 +31,7 @@ export declare class User extends BaseModel {
     passport_number?: string;
     personal_email?: string;
     extension_number?: number;
+    fax_number?: string;
     diplomatic_name?: string;
     civil_employee_id?: number;
     qualification?: string;
@@ -39,5 +40,6 @@ export declare class User extends BaseModel {
     children1_name?: string;
     children2_name?: string;
     language_preferences?: string;
-    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, 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, 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";
+    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, 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");
 }

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, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences) {
+    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, 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) {
         super();
         this.employee_id = employee_id;
         this.employee_name = employee_name;
@@ -46,6 +46,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.passport_number = passport_number;
         this.personal_email = personal_email;
         this.extension_number = extension_number;
+        this.fax_number = fax_number;
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
@@ -54,6 +55,7 @@ let User = class User extends BaseModel_1.BaseModel {
         this.children1_name = children1_name;
         this.children2_name = children2_name;
         this.language_preferences = language_preferences;
+        this.category = category || "FM";
     }
 };
 exports.User = User;
@@ -181,6 +183,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", Number)
 ], User.prototype, "extension_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 20, nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "fax_number", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -213,7 +219,11 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "language_preferences", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" }),
+    __metadata("design:type", String)
+], User.prototype, "category", 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, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, Number, String, String, String, String, String, String])
+    __metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, 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])
 ], User);

package/package.json

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

package/src/models/BankNamesModel.ts

@@ -15,6 +15,9 @@ export class BankNames extends BaseModel {
 
     @Column({ type: 'varchar', length: 100, nullable: true })
     country: string;
+     
+    @Column({ type: 'varchar', length: 100, nullable: true })
+    bank_type: string;
 
     @Column({ type: 'boolean', default: true })
     is_active: boolean;
@@ -23,7 +26,8 @@ export class BankNames extends BaseModel {
         bank_name: string,
         bank_code: string,
         bank_description?: string,
-        country?: string
+        country?: string,
+        bank_type? : string
     ) {
         super();     
         this.bank_name = bank_name;
@@ -31,6 +35,7 @@ export class BankNames extends BaseModel {
         this.bank_description = bank_description || '';
         this.country = country || '';
         this.is_active = true;
+        this.bank_type = bank_type || ''
     }
 }
 

package/src/models/FinancialApprovalsModel.ts

@@ -6,7 +6,8 @@ export enum FinancialApprovalStatus {
   PENDING = "Pending",
   APPROVED = "Approved",
   REJECTED = "Rejected",
-  SKIPPED = "Skipped"
+  SKIPPED = "Skipped",
+  IN_PROGRESS = "In Progress"
 }
 
 @Entity({ name: 'financial_approvals' })

package/src/models/user.ts

@@ -97,6 +97,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     extension_number?: number;
 
+    @Column({ type: "varchar", length: 20, nullable: true })
+    fax_number?: string; // Optional
+
     @Column({ nullable: true })
     diplomatic_name?: string;
 
@@ -123,6 +126,9 @@ export class User extends BaseModel {
     @Column({ nullable: true })
     language_preferences?: string;
 
+    @Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" })
+    category: "FM" | "Embassy"; // Mandatory
+
     constructor(     
         employee_id?: number,
         employee_name?: string,
@@ -155,6 +161,7 @@ export class User extends BaseModel {
         passport_number?: string,
         personal_email?: string,
         extension_number?: number,
+        fax_number?: string,
         diplomatic_name?: string,
         civil_employee_id?: number,
         qualification?: string,
@@ -163,6 +170,7 @@ export class User extends BaseModel {
         children1_name?: string,
         children2_name?: string,
         language_preferences?: string,
+        category?: "FM" | "Embassy",
     ) {
         super();     
         this.employee_id = employee_id;
@@ -196,6 +204,7 @@ export class User extends BaseModel {
         this.passport_number = passport_number;
         this.personal_email = personal_email;
         this.extension_number = extension_number;
+        this.fax_number = fax_number;
         this.diplomatic_name = diplomatic_name;
         this.civil_employee_id = civil_employee_id;
         this.qualification = qualification;
@@ -204,5 +213,6 @@ export class User extends BaseModel {
         this.children1_name = children1_name;
         this.children2_name = children2_name;
         this.language_preferences = language_preferences;
+        this.category = category || "FM";
     }
 }