@platform-modules/foreign-ministry 1.0.9 → 1.0.11

package/dist/data-source.js

@@ -15,6 +15,8 @@ const HajjLeaveDatesModel_1 = require("./models/HajjLeaveDatesModel");
 const StudyLeaveDegreesModel_1 = require("./models/StudyLeaveDegreesModel");
 const UnpaidLeaveCatgoriesModel_1 = require("./models/UnpaidLeaveCatgoriesModel");
 const MounringLeaveRelationModel_1 = require("./models/MounringLeaveRelationModel");
+const LeaveApprovalMatrixModel_1 = require("./models/LeaveApprovalMatrixModel");
+const LeaveApprovalDetailsModel_1 = require("./models/LeaveApprovalDetailsModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -24,5 +26,5 @@ exports.AppDataSource = new typeorm_1.DataSource({
     database: process.env.DB_NAME || 'common_models',
     synchronize: true, // auto-create tables (disable in prod)
     logging: false,
-    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, LeaveRequestModel_1.LeaveRequests, LeaveTypesModel_1.LeaveTypes, FinancialGradeModel_1.FinancialGrade, HajjLeaveDatesModel_1.HajjLeaveDates, StudyLeaveDegreesModel_1.StudyLeaveDegrees, UnpaidLeaveCatgoriesModel_1.UnpaidLeaveCategories, MounringLeaveRelationModel_1.MounringLeaveRelations],
+    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, LeaveRequestModel_1.LeaveRequests, LeaveTypesModel_1.LeaveTypes, FinancialGradeModel_1.FinancialGrade, HajjLeaveDatesModel_1.HajjLeaveDates, StudyLeaveDegreesModel_1.StudyLeaveDegrees, UnpaidLeaveCatgoriesModel_1.UnpaidLeaveCategories, MounringLeaveRelationModel_1.MounringLeaveRelations, LeaveApprovalMatrixModel_1.LeaveApprovalMatrix, LeaveApprovalDetailsModel_1.LeaveApprovalDetails],
 });

package/dist/index.d.ts

@@ -7,3 +7,6 @@ export * from './models/FinancialGradeModel';
 export * from './models/HajjLeaveDatesModel';
 export * from './models/StudyLeaveDegreesModel';
 export * from './models/UnpaidLeaveCatgoriesModel';
+export * from './models/MounringLeaveRelationModel';
+export * from './models/LeaveApprovalMatrixModel';
+export * from './models/LeaveApprovalDetailsModel';

package/dist/index.js

@@ -23,3 +23,6 @@ __exportStar(require("./models/FinancialGradeModel"), exports);
 __exportStar(require("./models/HajjLeaveDatesModel"), exports);
 __exportStar(require("./models/StudyLeaveDegreesModel"), exports);
 __exportStar(require("./models/UnpaidLeaveCatgoriesModel"), exports);
+__exportStar(require("./models/MounringLeaveRelationModel"), exports);
+__exportStar(require("./models/LeaveApprovalMatrixModel"), exports);
+__exportStar(require("./models/LeaveApprovalDetailsModel"), exports);

package/dist/models/FinancialGradeModel.js

@@ -35,6 +35,6 @@ __decorate([
     __metadata("design:type", Number)
 ], FinancialGrade.prototype, "annual_leave", void 0);
 exports.FinancialGrade = FinancialGrade = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Financial_Grade' }),
+    (0, typeorm_1.Entity)({ name: 'financial_grade' }),
     __metadata("design:paramtypes", [String, String, Number])
 ], FinancialGrade);

package/dist/models/HajjLeaveDatesModel.d.ts

@@ -1,5 +1,6 @@
 import { BaseModel } from './BaseModel';
 export declare class HajjLeaveDates extends BaseModel {
-    Hajj_Leave_Start_Date: Date;
-    Hajj_Leave_End_Date: Date;
+    hajj_leave_start_date: Date;
+    hajj_leave_end_date: Date;
+    constructor(hajj_leave_start_date: Date, hajj_leave_end_date: Date);
 }

package/dist/models/HajjLeaveDatesModel.js

@@ -14,16 +14,22 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 //This model is used to store the Hajj Leave Dates declaration on the Admin Side
 let HajjLeaveDates = class HajjLeaveDates extends BaseModel_1.BaseModel {
+    constructor(hajj_leave_start_date, hajj_leave_end_date) {
+        super();
+        this.hajj_leave_start_date = hajj_leave_start_date;
+        this.hajj_leave_end_date = hajj_leave_end_date;
+    }
 };
 exports.HajjLeaveDates = HajjLeaveDates;
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: false }),
     __metadata("design:type", Date)
-], HajjLeaveDates.prototype, "Hajj_Leave_Start_Date", void 0);
+], HajjLeaveDates.prototype, "hajj_leave_start_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: false }),
     __metadata("design:type", Date)
-], HajjLeaveDates.prototype, "Hajj_Leave_End_Date", void 0);
+], HajjLeaveDates.prototype, "hajj_leave_end_date", void 0);
 exports.HajjLeaveDates = HajjLeaveDates = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Hajj_Leave_Dates' })
+    (0, typeorm_1.Entity)({ name: 'hajj_leave_dates' }),
+    __metadata("design:paramtypes", [Date, Date])
 ], HajjLeaveDates);

package/dist/models/LeaveApprovalDetailsModel.d.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from './BaseModel';
+export declare class LeaveApprovalDetails extends BaseModel {
+    leave_request_id: number;
+    level: number;
+    approver_id: number;
+    approval_status: number;
+    constructor(leave_request_id: number, approver_id: number, approval_status: number, level: number);
+}

package/dist/models/LeaveApprovalDetailsModel.js

@@ -0,0 +1,45 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.LeaveApprovalDetails = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+//This model is used to store the store the leave apporval details of the user for the leave request
+let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseModel {
+    constructor(leave_request_id, approver_id, approval_status, level) {
+        super();
+        this.leave_request_id = leave_request_id;
+        this.approver_id = approver_id;
+        this.approval_status = approval_status;
+        this.level = level;
+    }
+};
+exports.LeaveApprovalDetails = LeaveApprovalDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "leave_request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "approver_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "approval_status", void 0);
+exports.LeaveApprovalDetails = LeaveApprovalDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_details' }),
+    __metadata("design:paramtypes", [Number, Number, Number, Number])
+], LeaveApprovalDetails);

package/dist/models/LeaveApprovalMatrixModel.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class LeaveApprovalMatrix extends BaseModel {
+    leave_type: number;
+    level: number;
+    approval_matrix: number;
+    constructor(leave_type: number, level: number, approval_matrix: number);
+}

package/dist/models/LeaveApprovalMatrixModel.js

@@ -0,0 +1,40 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.LeaveApprovalMatrix = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+//This model is used to store the store the leave apporval matrix based on leave type along with the levels
+let LeaveApprovalMatrix = class LeaveApprovalMatrix extends BaseModel_1.BaseModel {
+    constructor(leave_type, level, approval_matrix) {
+        super();
+        this.leave_type = leave_type;
+        this.level = level;
+        this.approval_matrix = approval_matrix;
+    }
+};
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "leave_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "approval_matrix", void 0);
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_matrix' }),
+    __metadata("design:paramtypes", [Number, Number, Number])
+], LeaveApprovalMatrix);

package/dist/models/LeaveRequestModel.d.ts

@@ -9,28 +9,29 @@ export declare enum status {
     REJECTED = "Rejected"
 }
 export declare class LeaveRequests extends BaseModel {
-    User_Id: string;
-    Leave_For: Leave_For;
-    Leave_Type: 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;
+    user_id: string;
+    leave_for: Leave_For;
+    leave_type: 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;
+    constructor(user_id: string, leave_for: Leave_For, leave_type: 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);
 }

package/dist/models/LeaveRequestModel.js

@@ -25,104 +25,132 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let LeaveRequests = class LeaveRequests extends BaseModel_1.BaseModel {
+    constructor(user_id, leave_for, leave_type, 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) {
+        super();
+        this.user_id = user_id;
+        this.leave_for = leave_for;
+        this.leave_type = leave_type;
+        this.department = department;
+        this.status = status;
+        this.leave_start_date = leave_start_date;
+        this.leave_end_date = leave_end_date;
+        this.leave_duration = leave_duration;
+        this.remaining_leave_balance = remaining_leave_balance;
+        this.contact_number_during_leave = contact_number_during_leave;
+        this.address_during_leave = address_during_leave;
+        this.notes = notes;
+        this.delegated_to = delegated_to;
+        this.number_of_escort_instances_per_year = number_of_escort_instances_per_year;
+        this.accompanying_the_patient = accompanying_the_patient;
+        this.treatment_place = treatment_place;
+        this.emergency_leaves_available = emergency_leaves_available;
+        this.unpaid_leave_type = unpaid_leave_type;
+        this.country_or_state_being_visited = country_or_state_being_visited;
+        this.leave_balance_summary = leave_balance_summary;
+        this.representation = representation;
+        this.activity_title = activity_title;
+        this.relationship = relationship;
+        this.mounring_leave_relation = mounring_leave_relation;
+    }
 };
 exports.LeaveRequests = LeaveRequests;
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "User_Id", void 0);
+], LeaveRequests.prototype, "user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "enum", enum: Leave_For, default: Leave_For.SELF, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Leave_For", void 0);
+], LeaveRequests.prototype, "leave_for", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Leave_Type", void 0);
+], LeaveRequests.prototype, "leave_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Department", void 0);
+], LeaveRequests.prototype, "department", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "enum", enum: status, default: status.PENDING, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Status", void 0);
+], LeaveRequests.prototype, "status", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
-], LeaveRequests.prototype, "Leave_Start_Date", void 0);
+], LeaveRequests.prototype, "leave_start_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
-], LeaveRequests.prototype, "Leave_End_Date", void 0);
+], LeaveRequests.prototype, "leave_end_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'float', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Leave_Duration", void 0);
+], LeaveRequests.prototype, "leave_duration", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'float', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Remaining_Leave_Balance", void 0);
+], LeaveRequests.prototype, "remaining_leave_balance", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Contact_Number_During_Leave", void 0);
+], LeaveRequests.prototype, "contact_number_during_leave", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Address_During_Leave", void 0);
+], LeaveRequests.prototype, "address_during_leave", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Notes", void 0);
+], LeaveRequests.prototype, "notes", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Delegated_To", void 0);
+], LeaveRequests.prototype, "delegated_to", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Number_Of_Escort_Instances_Per_Year", void 0);
+], LeaveRequests.prototype, "number_of_escort_instances_per_year", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', nullable: true }),
     __metadata("design:type", Boolean)
-], LeaveRequests.prototype, "Accompanying_The_Patient", void 0);
+], LeaveRequests.prototype, "accompanying_the_patient", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Treatment_Place", void 0);
+], LeaveRequests.prototype, "treatment_place", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Emergency_Leaves_Available", void 0);
+], LeaveRequests.prototype, "emergency_leaves_available", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Unpaid_Leave_Type", void 0);
+], LeaveRequests.prototype, "unpaid_leave_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Country_Or_State_Being_Visited", void 0);
+], LeaveRequests.prototype, "country_or_state_being_visited", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'text', nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Leave_Balance_Summary", void 0);
+], LeaveRequests.prototype, "leave_balance_summary", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Representation", void 0);
+], LeaveRequests.prototype, "representation", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Activity_Title", void 0);
+], LeaveRequests.prototype, "activity_title", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "Relationship", void 0);
+], LeaveRequests.prototype, "relationship", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "Mounring_Leave_Relation", void 0);
+], LeaveRequests.prototype, "mounring_leave_relation", void 0);
 exports.LeaveRequests = LeaveRequests = __decorate([
-    (0, typeorm_1.Entity)({ name: 'LeaveRequests' })
+    (0, typeorm_1.Entity)({ name: 'leave_requests' }),
+    __metadata("design:paramtypes", [String, String, Number, String, String, Date, Date, Number, Number, String, String, String, String, Number, Boolean, String, Number, String, String, String, String, String, String, Number])
 ], LeaveRequests);

package/dist/models/LeaveTypesModel.d.ts

@@ -1,9 +1,9 @@
 import { BaseModel } from './BaseModel';
 export declare class LeaveTypes extends BaseModel {
     name: string;
-    name_in_Arabic: string;
-    Omani_Only?: boolean;
-    Non_Omani_Muslim?: boolean;
-    Non_Omani_Non_Muslim?: boolean;
-    constructor(name: string, name_in_Arabic: string);
+    name_in_arabic: string;
+    omani_only?: boolean;
+    non_omani_muslim?: boolean;
+    non_omani_non_muslim?: boolean;
+    constructor(name: string, name_in_arabic: string);
 }

package/dist/models/LeaveTypesModel.js

@@ -13,13 +13,13 @@ exports.LeaveTypes = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let LeaveTypes = class LeaveTypes extends BaseModel_1.BaseModel {
-    constructor(name, name_in_Arabic) {
+    constructor(name, name_in_arabic) {
         super();
-        this.Omani_Only = false;
-        this.Non_Omani_Muslim = false;
-        this.Non_Omani_Non_Muslim = false;
+        this.omani_only = false;
+        this.non_omani_muslim = false;
+        this.non_omani_non_muslim = false;
         this.name = name;
-        this.name_in_Arabic = name_in_Arabic;
+        this.name_in_arabic = name_in_arabic;
     }
 };
 exports.LeaveTypes = LeaveTypes;
@@ -30,20 +30,20 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
-], LeaveTypes.prototype, "name_in_Arabic", void 0);
+], LeaveTypes.prototype, "name_in_arabic", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true, default: false }),
     __metadata("design:type", Boolean)
-], LeaveTypes.prototype, "Omani_Only", void 0);
+], LeaveTypes.prototype, "omani_only", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true, default: false }),
     __metadata("design:type", Boolean)
-], LeaveTypes.prototype, "Non_Omani_Muslim", void 0);
+], LeaveTypes.prototype, "non_omani_muslim", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true, default: false }),
     __metadata("design:type", Boolean)
-], LeaveTypes.prototype, "Non_Omani_Non_Muslim", void 0);
+], LeaveTypes.prototype, "non_omani_non_muslim", void 0);
 exports.LeaveTypes = LeaveTypes = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Leave_Types' }),
+    (0, typeorm_1.Entity)({ name: 'leave_types' }),
     __metadata("design:paramtypes", [String, String])
 ], LeaveTypes);

package/dist/models/MounringLeaveRelationModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
 export declare class MounringLeaveRelations extends BaseModel {
-    Mounring_Leave_Relation: string;
+    mounring_leave_relation: string;
+    constructor(mounring_leave_relation: string);
 }

package/dist/models/MounringLeaveRelationModel.js

@@ -13,12 +13,17 @@ exports.MounringLeaveRelations = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let MounringLeaveRelations = class MounringLeaveRelations extends BaseModel_1.BaseModel {
+    constructor(mounring_leave_relation) {
+        super();
+        this.mounring_leave_relation = mounring_leave_relation;
+    }
 };
 exports.MounringLeaveRelations = MounringLeaveRelations;
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
-], MounringLeaveRelations.prototype, "Mounring_Leave_Relation", void 0);
+], MounringLeaveRelations.prototype, "mounring_leave_relation", void 0);
 exports.MounringLeaveRelations = MounringLeaveRelations = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Mounring_Leave_Relations' })
+    (0, typeorm_1.Entity)({ name: 'mounring_leave_relations' }),
+    __metadata("design:paramtypes", [String])
 ], MounringLeaveRelations);

package/dist/models/StudyLeaveDegreesModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
 export declare class StudyLeaveDegrees extends BaseModel {
-    Study_Leave_Degree: string;
+    study_leave_degree: string;
+    constructor(study_leave_degree: string);
 }

package/dist/models/StudyLeaveDegreesModel.js

@@ -14,12 +14,17 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 //This model is used to store the Study Leave Degrees Master Data
 let StudyLeaveDegrees = class StudyLeaveDegrees extends BaseModel_1.BaseModel {
+    constructor(study_leave_degree) {
+        super();
+        this.study_leave_degree = study_leave_degree;
+    }
 };
 exports.StudyLeaveDegrees = StudyLeaveDegrees;
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
-], StudyLeaveDegrees.prototype, "Study_Leave_Degree", void 0);
+], StudyLeaveDegrees.prototype, "study_leave_degree", void 0);
 exports.StudyLeaveDegrees = StudyLeaveDegrees = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Study_Leave_Degrees' })
+    (0, typeorm_1.Entity)({ name: 'study_leave_degrees' }),
+    __metadata("design:paramtypes", [String])
 ], StudyLeaveDegrees);

package/dist/models/UnpaidLeaveCatgoriesModel.d.ts

@@ -1,4 +1,5 @@
 import { BaseModel } from './BaseModel';
 export declare class UnpaidLeaveCategories extends BaseModel {
-    Unpaid_Leave_Category: string;
+    unpaid_leave_category: string;
+    constructor(unpaid_leave_category: string);
 }

package/dist/models/UnpaidLeaveCatgoriesModel.js

@@ -14,12 +14,17 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 //This model is used to store the Unpaid Leave Categories Master Data
 let UnpaidLeaveCategories = class UnpaidLeaveCategories extends BaseModel_1.BaseModel {
+    constructor(unpaid_leave_category) {
+        super();
+        this.unpaid_leave_category = unpaid_leave_category;
+    }
 };
 exports.UnpaidLeaveCategories = UnpaidLeaveCategories;
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
-], UnpaidLeaveCategories.prototype, "Unpaid_Leave_Category", void 0);
+], UnpaidLeaveCategories.prototype, "unpaid_leave_category", void 0);
 exports.UnpaidLeaveCategories = UnpaidLeaveCategories = __decorate([
-    (0, typeorm_1.Entity)({ name: 'Unpaid_Leave_Categories' })
+    (0, typeorm_1.Entity)({ name: 'unpaid_leave_categories' }),
+    __metadata("design:paramtypes", [String])
 ], UnpaidLeaveCategories);

package/package.json

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

package/src/data-source.ts

@@ -12,6 +12,8 @@ import { HajjLeaveDates } from './models/HajjLeaveDatesModel';
 import { StudyLeaveDegrees } from './models/StudyLeaveDegreesModel';
 import { UnpaidLeaveCategories } from './models/UnpaidLeaveCatgoriesModel';
 import { MounringLeaveRelations } from './models/MounringLeaveRelationModel';
+import { LeaveApprovalMatrix } from './models/LeaveApprovalMatrixModel';
+import { LeaveApprovalDetails } from './models/LeaveApprovalDetailsModel';
 
 
 export const AppDataSource = new DataSource({
@@ -23,5 +25,5 @@ export const AppDataSource = new DataSource({
   database: process.env.DB_NAME || 'common_models',
   synchronize: true, // auto-create tables (disable in prod)
   logging: false,
-  entities: [User,userSessions,Role,LeaveRequests,LeaveTypes,FinancialGrade,HajjLeaveDates,StudyLeaveDegrees,UnpaidLeaveCategories,MounringLeaveRelations],
+  entities: [User,userSessions,Role,LeaveRequests,LeaveTypes,FinancialGrade,HajjLeaveDates,StudyLeaveDegrees,UnpaidLeaveCategories,MounringLeaveRelations,LeaveApprovalMatrix,LeaveApprovalDetails],
 });

package/src/index.ts

@@ -6,4 +6,7 @@ export * from './models/LeaveTypesModel';
 export * from './models/FinancialGradeModel';
 export * from './models/HajjLeaveDatesModel';
 export * from './models/StudyLeaveDegreesModel';
-export * from './models/UnpaidLeaveCatgoriesModel';
+export * from './models/UnpaidLeaveCatgoriesModel';
+export * from './models/MounringLeaveRelationModel';
+export * from './models/LeaveApprovalMatrixModel';
+export * from './models/LeaveApprovalDetailsModel';

package/src/models/FinancialGradeModel.ts

@@ -1,7 +1,7 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 //This model is used to store the Financial Grade declaration on the Admin Side
-@Entity({ name: 'Financial_Grade' })
+@Entity({ name: 'financial_grade' })
 export class FinancialGrade extends BaseModel {
 
     @Column({ nullable: false })

package/src/models/HajjLeaveDatesModel.ts

@@ -1,11 +1,17 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 //This model is used to store the Hajj Leave Dates declaration on the Admin Side
-@Entity({ name: 'Hajj_Leave_Dates' })
+@Entity({ name: 'hajj_leave_dates' })
 export class HajjLeaveDates extends BaseModel {
   @Column({ type: 'date', nullable: false })
-  Hajj_Leave_Start_Date: Date;
+  hajj_leave_start_date: Date;
 
   @Column({ type: 'date', nullable: false })
-  Hajj_Leave_End_Date: Date;
+  hajj_leave_end_date: Date;
+
+  constructor(hajj_leave_start_date: Date, hajj_leave_end_date: Date) {
+    super();
+    this.hajj_leave_start_date = hajj_leave_start_date;
+    this.hajj_leave_end_date = hajj_leave_end_date;
+  }
 }

package/src/models/LeaveApprovalDetailsModel.ts

@@ -0,0 +1,25 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+//This model is used to store the store the leave apporval details of the user for the leave request
+@Entity({ name: 'leave_approval_details' })
+export class LeaveApprovalDetails extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  leave_request_id: number;
+
+  @Column({ type: 'int', nullable: false })
+  level: number;
+
+  @Column({ type: 'int', nullable: false })
+  approver_id: number;
+
+  @Column({ type: 'int', nullable: false })
+  approval_status: number;
+
+  constructor(leave_request_id: number, approver_id: number, approval_status: number, level: number) {
+    super();
+    this.leave_request_id = leave_request_id;
+    this.approver_id = approver_id;
+    this.approval_status = approval_status;
+    this.level = level;
+  }
+}

package/src/models/LeaveApprovalMatrixModel.ts

@@ -0,0 +1,21 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+//This model is used to store the store the leave apporval matrix based on leave type along with the levels
+@Entity({ name: 'leave_approval_matrix' })
+export class LeaveApprovalMatrix extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  leave_type: number;
+
+  @Column({ type: 'int', nullable: false })
+  level: number;
+
+  @Column({ type: 'int', nullable: false })
+  approval_matrix: number;
+
+  constructor(leave_type: number, level: number, approval_matrix: number) {
+    super();
+    this.leave_type = leave_type;
+    this.level = level;
+    this.approval_matrix = approval_matrix;
+  }
+}

package/src/models/LeaveRequestModel.ts

@@ -11,77 +11,106 @@ export enum status {
   APPROVED = "Approved",
   REJECTED = "Rejected"
 }
-@Entity({ name: 'LeaveRequests' })
+@Entity({ name: 'leave_requests' })
 export class LeaveRequests extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: true })
-  User_Id: string;
+  user_id: string;
 
   @Column({ type: "enum", enum: Leave_For, default: Leave_For.SELF, nullable: true })
-  Leave_For: Leave_For;
+  leave_for: Leave_For;
 
   @Column({ type: 'int', nullable: true })
-  Leave_Type: number;
+  leave_type: number;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  Department: string;
+  department: string;
 
   @Column({ type: "enum", enum: status, default: status.PENDING, nullable: true })
-  Status: status;
+  status: status;
 
   @Column({ type: 'date', nullable: true })
-  Leave_Start_Date: Date;
+  leave_start_date: Date;
 
   @Column({ type: 'date', nullable: true })
-  Leave_End_Date: Date;
+  leave_end_date: Date;
 
   @Column({ type: 'float', nullable: true })
-  Leave_Duration: number;
+  leave_duration: number;
 
   @Column({ type: 'float', nullable: true })
-  Remaining_Leave_Balance: number;
+  remaining_leave_balance: number;
 
   @Column({ type: 'varchar', length: 20, nullable: true })
-  Contact_Number_During_Leave: string;
+  contact_number_during_leave: string;
 
   @Column({ type: 'varchar', length: 255, nullable: true })
-  Address_During_Leave: string;
+  address_during_leave: string;
 
   @Column({ type: 'text', nullable: true })
-  Notes: string;
+  notes: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  Delegated_To: string;
+  delegated_to: string;
 
   @Column({ type: 'int', nullable: true })
-  Number_Of_Escort_Instances_Per_Year: number;
+  number_of_escort_instances_per_year: number;
 
   @Column({ type: 'boolean', nullable: true })
-  Accompanying_The_Patient: boolean;
+  accompanying_the_patient: boolean;
 
   @Column({ type: 'varchar', length: 255, nullable: true })
-  Treatment_Place: string;
+  treatment_place: string;
 
   @Column({ type: 'int', nullable: true })
-  Emergency_Leaves_Available: number;
+  emergency_leaves_available: number;
 
   @Column({ type: 'varchar', length: 50, nullable: true })
-  Unpaid_Leave_Type: string;
+  unpaid_leave_type: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  Country_Or_State_Being_Visited: string;
+  country_or_state_being_visited: string;
 
   @Column({ type: 'text', nullable: true })
-  Leave_Balance_Summary: string;
+  leave_balance_summary: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  Representation: string;
+  representation: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  Activity_Title: string;
+  activity_title: string;
 
   @Column({ type: 'varchar', length: 50, nullable: true })
-  Relationship: string;
+  relationship: string;
 
   @Column({ type: 'int', nullable: true })
-  Mounring_Leave_Relation: number;
+  mounring_leave_relation: number;
+
+
+  constructor(user_id: string, leave_for: Leave_For, leave_type: 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) {
+    super();
+    this.user_id = user_id;
+    this.leave_for = leave_for;
+    this.leave_type = leave_type;
+    this.department = department;
+    this.status = status;
+    this.leave_start_date = leave_start_date;
+    this.leave_end_date = leave_end_date;
+    this.leave_duration = leave_duration;
+    this.remaining_leave_balance = remaining_leave_balance;
+    this.contact_number_during_leave = contact_number_during_leave;
+    this.address_during_leave = address_during_leave;
+    this.notes = notes;
+    this.delegated_to = delegated_to;
+    this.number_of_escort_instances_per_year = number_of_escort_instances_per_year;
+    this.accompanying_the_patient = accompanying_the_patient;
+    this.treatment_place = treatment_place;
+    this.emergency_leaves_available = emergency_leaves_available;
+    this.unpaid_leave_type = unpaid_leave_type;
+    this.country_or_state_being_visited = country_or_state_being_visited;
+    this.leave_balance_summary = leave_balance_summary;
+    this.representation = representation;
+    this.activity_title = activity_title;
+    this.relationship = relationship;
+    this.mounring_leave_relation = mounring_leave_relation;
+  }
 }

package/src/models/LeaveTypesModel.ts

@@ -1,31 +1,31 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-@Entity({ name: 'Leave_Types' })
+@Entity({ name: 'leave_types' })
 export class LeaveTypes extends BaseModel {
 
     @Column({ nullable: true })
     name: string;
 
     @Column({ nullable: true })
-    name_in_Arabic: string;
+    name_in_arabic: string;
 
     @Column({ nullable: true, default: false })  
-    Omani_Only?: boolean = false; 
+    omani_only?: boolean = false; 
 
     @Column({ nullable: true, default: false })  
-    Non_Omani_Muslim?: boolean = false; 
+    non_omani_muslim?: boolean = false; 
 
     @Column({ nullable: true, default: false })  
-    Non_Omani_Non_Muslim?: boolean = false; 
+    non_omani_non_muslim?: boolean = false; 
 
 
     constructor(     
         name: string,
-        name_in_Arabic: string,
+        name_in_arabic: string,
     ) {
         super();     
         this.name = name
-        this.name_in_Arabic = name_in_Arabic    
+        this.name_in_arabic = name_in_arabic    
     }
 }

package/src/models/MounringLeaveRelationModel.ts

@@ -1,9 +1,14 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-@Entity({ name: 'Mounring_Leave_Relations' })
+@Entity({ name: 'mounring_leave_relations' })
 
 export class MounringLeaveRelations extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: false })
-  Mounring_Leave_Relation: string;
+  mounring_leave_relation: string;
+
+  constructor(mounring_leave_relation: string) {
+    super();
+    this.mounring_leave_relation = mounring_leave_relation;
+  }
 }

package/src/models/StudyLeaveDegreesModel.ts

@@ -1,8 +1,13 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 //This model is used to store the Study Leave Degrees Master Data
-@Entity({ name: 'Study_Leave_Degrees' })
+@Entity({ name: 'study_leave_degrees' })
 export class StudyLeaveDegrees extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: false })
-  Study_Leave_Degree: string;
+  study_leave_degree: string;
+
+  constructor(study_leave_degree: string) {
+    super();
+    this.study_leave_degree = study_leave_degree;
+  }
 }

package/src/models/UnpaidLeaveCatgoriesModel.ts

@@ -1,8 +1,13 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 //This model is used to store the Unpaid Leave Categories Master Data
-@Entity({ name: 'Unpaid_Leave_Categories' })
+@Entity({ name: 'unpaid_leave_categories' })
 export class UnpaidLeaveCategories extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: false })
-  Unpaid_Leave_Category: string;
+  unpaid_leave_category: string;
+
+  constructor(unpaid_leave_category: string) {
+    super();
+    this.unpaid_leave_category = unpaid_leave_category;
+  }
 }