@platform-modules/civil-aviation-authority 1.0.44 → 1.0.46

package/.env

@@ -1,5 +1,5 @@
 DB_HOST=localhost
-DB_PORT=5433
-DB_USER=netflix_user
-DB_PASS=netflix_user
+DB_PORT=5432
+DB_USER=postgres
+DB_PASS=Fa@123
 DB_NAME=CAA

package/dist/models/ITHelpDeskModel.d.ts

@@ -22,5 +22,6 @@ export declare class ITHelpDeskRequests extends BaseModel {
     reporting_manager: number;
     assigned_to: number;
     status: status;
-    constructor(department: string, service_type: string, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, attachment_url: string, reporting_manager: number, assigned_to: number, status: status);
+    workflow_execution_id: string | null;
+    constructor(department: string, service_type: string, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, attachment_url: string, reporting_manager: number, assigned_to: number, status: status, workflow_execution_id?: string);
 }

package/dist/models/ITHelpDeskModel.js

@@ -24,7 +24,7 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel {
-    constructor(department, service_type, problem, request_for, description, extn_num, contact_num, request_date, attachment_url, reporting_manager, assigned_to, status) {
+    constructor(department, service_type, problem, request_for, description, extn_num, contact_num, request_date, attachment_url, reporting_manager, assigned_to, status, workflow_execution_id) {
         super();
         this.department = department,
             this.service_type = service_type,
@@ -37,7 +37,8 @@ let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel
             this.attachment_url = attachment_url,
             this.reporting_manager = reporting_manager,
             this.assigned_to = assigned_to,
-            this.status = status;
+            this.status = status,
+            this.workflow_execution_id = workflow_execution_id || null;
     }
 };
 exports.ITHelpDeskRequests = ITHelpDeskRequests;
@@ -103,7 +104,11 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], ITHelpDeskRequests.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
+    __metadata("design:type", Object)
+], ITHelpDeskRequests.prototype, "workflow_execution_id", void 0);
 exports.ITHelpDeskRequests = ITHelpDeskRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'IT_Help_Desk_Requests' }),
-    __metadata("design:paramtypes", [String, String, String, String, String, String, String, Date, String, Number, Number, String])
+    __metadata("design:paramtypes", [String, String, String, String, String, String, String, Date, String, Number, Number, String, String])
 ], ITHelpDeskRequests);

package/dist/models/ItApprovalsModel.js

@@ -18,7 +18,6 @@ var ApprovalStatus;
     ApprovalStatus["APPROVED"] = "Approved";
     ApprovalStatus["REJECTED"] = "Rejected";
 })(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
-//This model is used to store the store the leave apporval details of the user for the leave request
 let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.BaseModel {
     constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level) {
         super();

package/dist/models/WorkflowHierarchy.d.ts

@@ -3,9 +3,10 @@ import { WorkflowDefinitions } from './WorkflowDefinitions';
 export declare class WorkflowHierarchy extends BaseModel {
     workflow_definition_id: number;
     department_id: number;
-    approval_level_id: number;
+    section_id: number;
+    approval_id: number;
     step_order: number;
     is_required: boolean;
     workflow_definition: WorkflowDefinitions;
-    constructor(workflow_definition_id: number, department_id: number, approval_level_id: number, step_order: number, is_required?: boolean);
+    constructor(workflow_definition_id: number, department_id: number, section_id: number, approval_id: number, step_order: number, is_required?: boolean);
 }

package/dist/models/WorkflowHierarchy.js

@@ -14,11 +14,12 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const WorkflowDefinitions_1 = require("./WorkflowDefinitions");
 let WorkflowHierarchy = class WorkflowHierarchy extends BaseModel_1.BaseModel {
-    constructor(workflow_definition_id, department_id, approval_level_id, step_order, is_required) {
+    constructor(workflow_definition_id, department_id, section_id, approval_id, step_order, is_required) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.approval_level_id = approval_level_id;
+        this.section_id = section_id;
+        this.approval_id = approval_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }
@@ -29,13 +30,17 @@ __decorate([
     __metadata("design:type", Number)
 ], WorkflowHierarchy.prototype, "workflow_definition_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
     __metadata("design:type", Number)
 ], WorkflowHierarchy.prototype, "department_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Number)
+], WorkflowHierarchy.prototype, "section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
     __metadata("design:type", Number)
-], WorkflowHierarchy.prototype, "approval_level_id", void 0);
+], WorkflowHierarchy.prototype, "approval_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -52,5 +57,5 @@ __decorate([
 exports.WorkflowHierarchy = WorkflowHierarchy = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_hierarchy' }),
     (0, typeorm_1.Unique)(['workflow_definition_id', 'step_order']),
-    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Number, Boolean])
 ], WorkflowHierarchy);

package/dist/models/user.d.ts

@@ -31,5 +31,9 @@ export declare class User extends BaseModel {
     supervisor_emp_id?: number;
     supervisor_emp_name?: string;
     is_admin?: boolean;
-    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string);
+    passport_number?: string;
+    company_email?: string;
+    extension_number?: number;
+    diplomatic_name?: string;
+    constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: number, category?: string, directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, company_email?: string, extension_number?: number, diplomatic_name?: string);
 }

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, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name) {
+    constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name, passport_number, company_email, extension_number, diplomatic_name) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -45,6 +45,10 @@ let User = class User extends BaseModel_1.BaseModel {
         this.location = location;
         this.supervisor_emp_id = supervisor_emp_id;
         this.supervisor_emp_name = supervisor_emp_name;
+        this.passport_number = passport_number;
+        this.company_email = company_email;
+        this.extension_number = extension_number;
+        this.diplomatic_name = diplomatic_name;
     }
 };
 exports.User = User;
@@ -172,7 +176,23 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true, default: false }),
     __metadata("design:type", Boolean)
 ], User.prototype, "is_admin", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "passport_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "company_email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "extension_number", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], User.prototype, "diplomatic_name", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)({ name: 'users' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, Number, String, String, Number, Number, String, Number, String, Number, String, String, String, Number, String])
 ], User);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/models/ITHelpDeskModel.ts

@@ -62,6 +62,9 @@ export class ITHelpDeskRequests extends BaseModel {
     })
     status: status;
 
+    @Column({ type: "varchar", nullable: true })
+    workflow_execution_id: string | null;
+
     constructor(     
         department: string,
         service_type: string, 
@@ -75,6 +78,7 @@ export class ITHelpDeskRequests extends BaseModel {
         reporting_manager: number,
         assigned_to: number,
         status: status,     
+        workflow_execution_id?: string,
     ) {
         super();     
         this.department = department,
@@ -88,6 +92,7 @@ export class ITHelpDeskRequests extends BaseModel {
         this.attachment_url = attachment_url,
         this.reporting_manager = reporting_manager,
         this.assigned_to = assigned_to,
-        this.status = status
+        this.status = status,
+        this.workflow_execution_id = workflow_execution_id || null
     }
 }

package/src/models/ItApprovalsModel.ts

@@ -8,7 +8,6 @@ export enum ApprovalStatus {
   REJECTED = "Rejected"
 }
 
-//This model is used to store the store the leave apporval details of the user for the leave request
 @Entity({ name: 'it_approvals' })
 export class ItApprovalDetails extends BaseModel {
   @Column({ type: 'int', nullable: false })

package/src/models/WorkflowHierarchy.ts

@@ -9,11 +9,14 @@ export class WorkflowHierarchy extends BaseModel {
     @Column({ type: 'integer', nullable: false })
     workflow_definition_id: number;
 
-    @Column({ type: 'integer', nullable: false })
+    @Column({ type: 'integer', nullable: true })
     department_id: number;
 
-    @Column({ type: 'integer', nullable: false })
-    approval_level_id: number;
+    @Column({ type: 'integer', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    approval_id: number;
 
     @Column({ type: 'integer', nullable: false })
     step_order: number;
@@ -28,14 +31,16 @@ export class WorkflowHierarchy extends BaseModel {
     constructor(
         workflow_definition_id: number,
         department_id: number,
-        approval_level_id: number,
+        section_id: number,
+        approval_id: number,
         step_order: number,
         is_required?: boolean
     ) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.approval_level_id = approval_level_id;
+        this.section_id = section_id;
+        this.approval_id = approval_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }

package/src/models/user.ts

@@ -97,6 +97,18 @@ export class User extends BaseModel {
     @Column({ nullable: true , default: false})
     is_admin?: boolean;
 
+    @Column({ nullable: true })
+    passport_number?: string;
+
+    @Column({ nullable: true })
+    company_email?: string;
+
+    @Column({ nullable: true })
+    extension_number?: number;
+
+    @Column({ nullable: true })
+    diplomatic_name?: string;
+
     constructor(     
         employee_id?: number,
         civil_employee_id?: number,
@@ -127,7 +139,11 @@ export class User extends BaseModel {
         grade?: number,
         location?: string,
         supervisor_emp_id?: number,
-        supervisor_emp_name?: string
+        supervisor_emp_name?: string,
+        passport_number?: string,
+        company_email?: string,
+        extension_number?: number,
+        diplomatic_name?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -160,5 +176,9 @@ export class User extends BaseModel {
         this.location = location;
         this.supervisor_emp_id = supervisor_emp_id;
         this.supervisor_emp_name = supervisor_emp_name;
+        this.passport_number = passport_number;
+        this.company_email = company_email;
+        this.extension_number = extension_number;
+        this.diplomatic_name = diplomatic_name;
     }
 }

package/dist/models/ITServicesTypesModel.d.ts

@@ -1,5 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class ITServicesTypes extends BaseModel {
-    name: string;
-    constructor(name: string);
-}

package/dist/models/ITServicesTypesModel.js

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