@platform-modules/foreign-ministry 1.0.2 → 1.0.4

package/dist/data-source.js

@@ -10,6 +10,7 @@ const user_sessions_1 = require("./models/user-sessions");
 const role_1 = require("./models/role");
 const LeaveRequestModel_1 = require("./models/LeaveRequestModel");
 const LeaveTypesModel_1 = require("./models/LeaveTypesModel");
+const FinancialGradeModel_1 = require("./models/FinancialGradeModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -19,5 +20,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],
+    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, LeaveRequestModel_1.LeaveRequests, LeaveTypesModel_1.LeaveTypes, FinancialGradeModel_1.FinancialGrade],
 });

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export * from './models/role';
 export * from './models/user-sessions';
 export * from './models/LeaveRequestModel';
 export * from './models/LeaveTypesModel';
+export * from './models/FinancialGradeModel';

package/dist/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
 __exportStar(require("./models/LeaveRequestModel"), exports);
 __exportStar(require("./models/LeaveTypesModel"), exports);
+__exportStar(require("./models/FinancialGradeModel"), exports);

package/dist/models/FinancialGradeModel.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class FinancialGrade extends BaseModel {
+    diplomatic_title: string;
+    financial_grade: string;
+    annual_leave: number;
+    constructor(diplomatic_title: string, financial_grade: string, annual_leave: number);
+}

package/dist/models/FinancialGradeModel.js

@@ -0,0 +1,39 @@
+"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.FinancialGrade = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let FinancialGrade = class FinancialGrade extends BaseModel_1.BaseModel {
+    constructor(diplomatic_title, financial_grade, annual_leave) {
+        super();
+        this.diplomatic_title = diplomatic_title;
+        this.financial_grade = financial_grade;
+        this.annual_leave = annual_leave;
+    }
+};
+exports.FinancialGrade = FinancialGrade;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], FinancialGrade.prototype, "diplomatic_title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], FinancialGrade.prototype, "financial_grade", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "int", nullable: false }),
+    __metadata("design:type", Number)
+], FinancialGrade.prototype, "annual_leave", void 0);
+exports.FinancialGrade = FinancialGrade = __decorate([
+    (0, typeorm_1.Entity)({ name: 'Financial_Grade' }),
+    __metadata("design:paramtypes", [String, String, Number])
+], FinancialGrade);

package/dist/models/LeaveRequestModel.d.ts

@@ -1,23 +1,30 @@
 import { BaseModel } from './BaseModel';
-export declare enum ContactFor {
-    SELF = "Self",
-    BEHALFOF = "Behalf of"
-}
 export declare enum status {
     PENDING = "Pending",
     APPROVED = "Approved",
     REJECTED = "Rejected"
 }
 export declare class LeaveRequests extends BaseModel {
-    department: string;
-    leave_type: string;
-    reason: string;
-    request_for: ContactFor;
-    description: string;
-    from_date: Date;
-    to_date: Date;
-    user_id: number;
-    reporting_manager: number;
-    status: status;
-    constructor(department: string, leave_type: string, reason: string, request_for: ContactFor, description: string, from_date: Date, to_date: Date, reporting_manager: number, status: status);
+    User_Id: string;
+    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;
 }

package/dist/models/LeaveRequestModel.js

@@ -9,14 +9,9 @@ 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.ContactFor = void 0;
+exports.LeaveRequests = exports.status = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-var ContactFor;
-(function (ContactFor) {
-    ContactFor["SELF"] = "Self";
-    ContactFor["BEHALFOF"] = "Behalf of";
-})(ContactFor || (exports.ContactFor = ContactFor = {}));
 var status;
 (function (status) {
     status["PENDING"] = "Pending";
@@ -24,72 +19,96 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let LeaveRequests = class LeaveRequests extends BaseModel_1.BaseModel {
-    constructor(department, leave_type, reason, request_for, description, from_date, to_date, reporting_manager, status) {
-        super();
-        this.department = department,
-            this.leave_type = leave_type,
-            this.reason = reason,
-            this.request_for = request_for,
-            this.description = description,
-            this.from_date = from_date,
-            this.to_date = to_date,
-            this.reporting_manager = reporting_manager,
-            this.status = status;
-    }
 };
 exports.LeaveRequests = LeaveRequests;
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "department", void 0);
+], LeaveRequests.prototype, "User_Id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], LeaveRequests.prototype, "leave_type", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], LeaveRequests.prototype, "Leave_Type", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "reason", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: ContactFor,
-        default: ContactFor.SELF,
-        nullable: false,
-    }),
-    __metadata("design:type", String)
-], LeaveRequests.prototype, "request_for", void 0);
+], LeaveRequests.prototype, "Department", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "description", void 0);
+], LeaveRequests.prototype, "Status", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
-], LeaveRequests.prototype, "from_date", void 0);
+], LeaveRequests.prototype, "Leave_Start_Date", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Date)
-], LeaveRequests.prototype, "to_date", void 0);
+], LeaveRequests.prototype, "Leave_End_Date", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
+    (0, typeorm_1.Column)({ type: 'float', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "user_id", void 0);
+], LeaveRequests.prototype, "Leave_Duration", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
+    (0, typeorm_1.Column)({ type: 'float', nullable: true }),
     __metadata("design:type", Number)
-], LeaveRequests.prototype, "reporting_manager", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: "enum",
-        enum: status,
-        default: status.PENDING,
-        nullable: false,
-    }),
+], LeaveRequests.prototype, "Remaining_Leave_Balance", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 20, nullable: false }),
+    __metadata("design:type", String)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", String)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
+    __metadata("design:type", String)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
+    __metadata("design:type", String)
+], 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);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], LeaveRequests.prototype, "Activity_Title", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
-], LeaveRequests.prototype, "status", void 0);
+], LeaveRequests.prototype, "Relationship", void 0);
 exports.LeaveRequests = LeaveRequests = __decorate([
-    (0, typeorm_1.Entity)({ name: 'LeaveRequests' }),
-    __metadata("design:paramtypes", [String, String, String, String, String, Date,
-        Date, Number, String])
+    (0, typeorm_1.Entity)({ name: 'LeaveRequests' })
 ], LeaveRequests);

package/dist/models/LeaveTypesModel.d.ts

@@ -1,7 +1,6 @@
 import { BaseModel } from './BaseModel';
 export declare class LeaveTypes extends BaseModel {
     name: string;
-    nameinEnglish: string;
-    nameinArabic: string;
-    constructor(name: string, nameinEnglish: string, nameinArabic: string);
+    name_in_Arabic: string;
+    constructor(name: string, name_in_Arabic: string);
 }

package/dist/models/LeaveTypesModel.js

@@ -13,11 +13,10 @@ exports.LeaveTypes = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let LeaveTypes = class LeaveTypes extends BaseModel_1.BaseModel {
-    constructor(name, nameinEnglish, nameinArabic) {
+    constructor(name, name_in_Arabic) {
         super();
         this.name = name;
-        this.nameinEnglish = nameinEnglish,
-            this.nameinArabic = nameinArabic;
+        this.name_in_Arabic = name_in_Arabic;
     }
 };
 exports.LeaveTypes = LeaveTypes;
@@ -28,12 +27,8 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
-], LeaveTypes.prototype, "nameinEnglish", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: false }),
-    __metadata("design:type", String)
-], LeaveTypes.prototype, "nameinArabic", void 0);
+], LeaveTypes.prototype, "name_in_Arabic", void 0);
 exports.LeaveTypes = LeaveTypes = __decorate([
     (0, typeorm_1.Entity)({ name: 'Leave_Types' }),
-    __metadata("design:paramtypes", [String, String, String])
+    __metadata("design:paramtypes", [String, String])
 ], LeaveTypes);

package/package.json

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

package/src/data-source.ts

@@ -7,6 +7,7 @@ import { userSessions } from './models/user-sessions';
 import { Role } from './models/role';
 import { LeaveRequests } from './models/LeaveRequestModel';
 import { LeaveTypes } from './models/LeaveTypesModel';
+import { FinancialGrade } from './models/FinancialGradeModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -17,5 +18,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],
+  entities: [User,userSessions,Role,LeaveRequests,LeaveTypes,FinancialGrade],
 });

package/src/index.ts

@@ -2,4 +2,5 @@ export * from './models/user';
 export * from './models/role';
 export * from './models/user-sessions';
 export * from './models/LeaveRequestModel';
-export * from './models/LeaveTypesModel';
+export * from './models/LeaveTypesModel';
+export * from './models/FinancialGradeModel';

package/src/models/FinancialGradeModel.ts

@@ -0,0 +1,26 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'Financial_Grade' })
+export class FinancialGrade extends BaseModel {
+
+    @Column({ nullable: false })
+    diplomatic_title: string;
+
+    @Column({ nullable: false })
+    financial_grade: string;
+
+    @Column({ type: "int", nullable: false })
+    annual_leave: number;
+
+    constructor(
+        diplomatic_title: string,
+        financial_grade: string,
+        annual_leave: number
+    ) {
+        super();
+        this.diplomatic_title = diplomatic_title;
+        this.financial_grade = financial_grade;
+        this.annual_leave = annual_leave;
+    }
+}

package/src/models/LeaveRequestModel.ts

@@ -1,9 +1,6 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
-export enum ContactFor {
-  SELF = "Self",
-  BEHALFOF = "Behalf of"
-}
+
 export enum status {
   PENDING = "Pending",
   APPROVED = "Approved",
@@ -11,67 +8,69 @@ export enum status {
 }
 @Entity({ name: 'LeaveRequests' })
 export class LeaveRequests extends BaseModel {
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  User_Id: string;
+
+  @Column({ type: 'int', nullable: true })
+  Leave_Type: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  Department: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  Status: status;
+
+  @Column({ type: 'date', nullable: true })
+  Leave_Start_Date: Date;
+
+  @Column({ type: 'date', nullable: true })
+  Leave_End_Date: Date;
+
+  @Column({ type: 'float', nullable: true })
+  Leave_Duration: number;
+
+  @Column({ type: 'float', nullable: true })
+  Remaining_Leave_Balance: number;
+
+  @Column({ type: 'varchar', length: 20, nullable: false })
+  Contact_Number_During_Leave: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  Address_During_Leave: string;
+
+  @Column({ type: 'text', nullable: true })
+  Notes: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  Delegated_To: string;
+
+  @Column({ type: 'int', nullable: true })
+  Number_Of_Escort_Instances_Per_Year: number;
+
+  @Column({ type: 'boolean', nullable: true })
+  Accompanying_The_Patient: boolean;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  Treatment_Place: string;
+
+  @Column({ type: 'int', nullable: true })
+  Emergency_Leaves_Available: number;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  Unpaid_Leave_Type: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  Country_Or_State_Being_Visited: string;
+
+  @Column({ type: 'text', nullable: true })
+  Leave_Balance_Summary: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  Representation: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  Activity_Title: string;
 
-    @Column({ nullable: false })
-    department: string;
-
-    @Column({ nullable: false })
-    leave_type: string;
-
-    @Column({ nullable: false })
-    reason: string;
-
-    @Column({
-        type: "enum",
-        enum: ContactFor,
-        default: ContactFor.SELF,
-        nullable: false,
-    })
-    request_for: ContactFor;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ type: "date", nullable: false })
-    from_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    to_date: Date;
-
-    @Column({ nullable: false })
-    user_id: number;
-
-    @Column({ nullable: true })
-    reporting_manager: number;
-
-    @Column({
-        type: "enum",
-        enum: status,
-        default: status.PENDING,
-        nullable: false,
-    })
-    status: status;
-
-    constructor(     
-        department: string,
-        leave_type: string, 
-        reason: string,       
-        request_for: ContactFor,       
-        description: string,
-        from_date: Date,
-        to_date: Date,
-        reporting_manager: number,
-        status: status,     
-    ) {
-        super();     
-        this.department = department,
-        this.leave_type = leave_type,
-        this.reason = reason,
-        this.request_for = request_for,
-        this.description = description,
-        this.from_date = from_date,
-        this.to_date = to_date,
-        this.reporting_manager = reporting_manager,
-        this.status = status
-    }
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  Relationship: string;
 }

package/src/models/LeaveTypesModel.ts

@@ -8,19 +8,14 @@ export class LeaveTypes extends BaseModel {
     name: string;
 
     @Column({ nullable: false })
-    nameinEnglish: string;
-
-    @Column({ nullable: false })
-    nameinArabic: string;
+    name_in_Arabic: string;
 
     constructor(     
         name: string,
-        nameinEnglish: string,
-        nameinArabic: string,
+        name_in_Arabic: string,
     ) {
         super();     
         this.name = name
-        this.nameinEnglish = nameinEnglish,
-        this.nameinArabic = nameinArabic    
+        this.name_in_Arabic = name_in_Arabic    
     }
 }