@platform-modules/civil-aviation-authority 2.0.62 → 2.0.80

package/.env

@@ -1,5 +1,5 @@
-DB_HOST=localhost
-DB_PORT=5433
-DB_USER=postgres
-DB_PASS=123
+DB_HOST=164.52.222.169
+DB_PORT=5432
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
 DB_NAME=CAA

package/dist/models/ITHelpDeskModel.d.ts

@@ -21,11 +21,13 @@ export declare class ITHelpDeskRequests extends BaseModel {
     description: string;
     extn_num: string;
     contact_num: string;
+    email: string | null;
+    request_type: string;
     person_name: string | null;
     person_contact_number: string | null;
     request_date: Date;
     user_id: number;
     status: status;
     workflow_execution_id: string | null;
-    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, status: status, workflow_execution_id?: string, req_user_department_id?: number | null, req_user_section_id?: number | null, service_type_id?: number | null, person_name?: string | null, person_contact_number?: string | null);
+    constructor(service_id: number, sub_service_id: number, problem: string, request_for: ContactFor, description: string, extn_num: string, contact_num: string, request_date: Date, status: status, workflow_execution_id?: string, req_user_department_id?: number | null, req_user_section_id?: number | null, service_type_id?: number | null, person_name?: string | null, person_contact_number?: string | null, email?: string | null, request_type?: string);
 }

package/dist/models/ITHelpDeskModel.js

@@ -26,7 +26,7 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel {
-    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id, person_name, person_contact_number) {
+    constructor(service_id, sub_service_id, problem, request_for, description, extn_num, contact_num, request_date, status, workflow_execution_id, req_user_department_id, req_user_section_id, service_type_id, person_name, person_contact_number, email, request_type) {
         super();
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
@@ -35,6 +35,8 @@ let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel
         this.description = description;
         this.extn_num = extn_num;
         this.contact_num = contact_num;
+        this.email = email || null;
+        this.request_type = request_type || 'internal';
         this.person_name = person_name || null;
         this.person_contact_number = person_contact_number || null;
         this.request_date = request_date;
@@ -91,6 +93,14 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
     __metadata("design:type", String)
 ], ITHelpDeskRequests.prototype, "contact_num", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], ITHelpDeskRequests.prototype, "email", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 30, nullable: true }),
+    __metadata("design:type", String)
+], ITHelpDeskRequests.prototype, "request_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
@@ -122,5 +132,5 @@ __decorate([
 ], ITHelpDeskRequests.prototype, "workflow_execution_id", void 0);
 exports.ITHelpDeskRequests = ITHelpDeskRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'it_help_desk_requests' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, String, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, Date, String, String, Object, Object, Object, Object, Object, Object, String])
 ], ITHelpDeskRequests);

package/dist/models/user.d.ts

@@ -42,6 +42,5 @@ export declare class User extends BaseModel {
     children1_name?: string;
     children2_name?: string;
     address?: string;
-    religion?: 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?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: string, religion?: 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?: "CAA" | "Embassy", directorate?: string, section?: number, position?: number, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, avatar?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, address?: 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, passport_number, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address, religion) {
+    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, personal_email, extension_number, fax_number, diplomatic_name, avatar, father_name, spouse_name, children1_name, children2_name, address) {
         super();
         this.employee_id = employee_id;
         this.civil_employee_id = civil_employee_id;
@@ -56,7 +56,6 @@ let User = class User extends BaseModel_1.BaseModel {
         this.children1_name = children1_name;
         this.children2_name = children2_name;
         this.address = address;
-        this.religion = religion;
     }
 };
 exports.User = User;
@@ -228,11 +227,7 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "address", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], User.prototype, "religion", 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, String, String, Number, String, String, String, String, String, String, String, String, 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, String, String, String, String, String, String, String])
 ], User);

package/package.json

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

package/src/models/ITHelpDeskModel.ts

@@ -50,6 +50,12 @@ export class ITHelpDeskRequests extends BaseModel {
     @Column({ nullable: false })
     contact_num: string;
 
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    email: string | null;
+
+    @Column({ type: 'varchar', length: 30, nullable: true })
+    request_type: string;
+
     @Column({ type: 'varchar', length: 255, nullable: true })
     person_name: string | null;
 
@@ -89,7 +95,9 @@ export class ITHelpDeskRequests extends BaseModel {
         req_user_section_id?: number | null,
         service_type_id?: number | null,
         person_name?: string | null,
-        person_contact_number?: string | null
+        person_contact_number?: string | null,
+        email?: string | null,
+        request_type?: string
     ) {
         super();     
         this.service_id = service_id;
@@ -99,6 +107,8 @@ export class ITHelpDeskRequests extends BaseModel {
         this.description = description;
         this.extn_num = extn_num;
         this.contact_num = contact_num;
+        this.email = email || null;
+        this.request_type = request_type || 'internal';
         this.person_name = person_name || null;
         this.person_contact_number = person_contact_number || null;
         this.request_date = request_date;

package/src/models/user.ts

@@ -129,9 +129,6 @@ export class User extends BaseModel {
 
     @Column({ nullable: true })
     address?: string;
-
-    @Column({ nullable: true })
-    religion?: string;
     
     constructor(     
         employee_id?: number,
@@ -174,8 +171,7 @@ export class User extends BaseModel {
         spouse_name?: string,
         children1_name?: string,
         children2_name?: string,
-        address?: string,
-        religion?: string
+        address?: string
     ) {
         super();     
         this.employee_id = employee_id;
@@ -219,6 +215,5 @@ export class User extends BaseModel {
         this.children1_name = children1_name;
         this.children2_name = children2_name;
         this.address = address;
-        this.religion = religion;
     }
 }

package/dist/models/ITApprovalSettings.d.ts

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

package/dist/models/ITApprovalSettings.js

@@ -1,40 +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.ITApprovalSettings = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let ITApprovalSettings = class ITApprovalSettings extends BaseModel_1.BaseModel {
-    constructor(level, approval_role_id, workflow_id) {
-        super();
-        this.level = level;
-        this.approval_role_id = approval_role_id;
-        this.workflow_id = workflow_id;
-    }
-};
-exports.ITApprovalSettings = ITApprovalSettings;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "level", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "approval_role_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], ITApprovalSettings.prototype, "workflow_id", void 0);
-exports.ITApprovalSettings = ITApprovalSettings = __decorate([
-    (0, typeorm_1.Entity)({ name: 'it_approval_settings' }),
-    (0, typeorm_1.Unique)(['workflow_id', 'level']),
-    __metadata("design:paramtypes", [Number, Number, Number])
-], ITApprovalSettings);

package/dist/models/ITServicesTypesMuscatModel.d.ts

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

package/dist/models/ITServicesTypesMuscatModel.js

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

package/dist/models/ITServicesTypesSalalahModel.d.ts

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

package/dist/models/ITServicesTypesSalalahModel.js

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

package/dist/models/Workflows.js

@@ -1,31 +0,0 @@
-"use strict";
-// import { Column, Entity, Unique } from "typeorm";
-// import { BaseModel } from './BaseModel';
-// @Entity({ name: 'workflows' })
-// @Unique(['service_id', 'sub_service_id', 'request_for'])
-// export class Workflows extends BaseModel {
-//     @Column({ type: 'varchar', length: 100, nullable: false })
-//     name: string;
-//     @Column({ type: 'bigint', nullable: false })
-//     service_id: number;
-//     @Column({ type: 'bigint', nullable: false })
-//     sub_service_id: number;
-//     @Column({ type: 'varchar', length: 20, nullable: false })
-//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
-//     @Column({ type: 'int', nullable: false })
-//     levels: number;
-//     constructor(
-//         name: string,
-//         service_id: number,
-//         sub_service_id: number,
-//         request_for: string,
-//         levels: number,
-//     ) {
-//         super();
-//         this.name = name;
-//         this.service_id = service_id;
-//         this.sub_service_id = sub_service_id;
-//         this.request_for = request_for;
-//         this.levels = levels;
-//     }
-// }