@platform-modules/civil-aviation-authority 2.3.170 → 2.3.172

package/.env

@@ -1,20 +1,12 @@
-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
-
-# DB_HOST=216.48.187.46
+# DB_HOST=164.52.222.169
 # DB_PORT=5432 
-# DB_USER=adminuser
-# DB_PASS=postgres_caa_fm_qa_34567
-# DB_NAME=CAA_QA
-
+# DB_USER=postgres_admin_user
+# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+# DB_NAME=CAA
 
 
-
-# DB_HOST=localhost
-# DB_PORT=5432 
-# DB_USER=postgres
-# DB_PASS=stevejobs
-# DB_NAME=CAA
+DB_HOST=localhost
+DB_PORT=5432 
+DB_USER=postgres
+DB_PASS=stevejobs
+DB_NAME=CAA

package/dist/models/ITApprovalSettings.d.ts

@@ -0,0 +1,7 @@
+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

@@ -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.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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,34 @@
+"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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,34 @@
+"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.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from './BaseModel';
+export declare class Workflows extends BaseModel {
+    name: string;
+    service_id: number;
+    sub_service_id: number;
+    request_for: string;
+    levels: number;
+    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
+}

package/dist/models/Workflows.js

@@ -0,0 +1,31 @@
+"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;
+//     }
+// }

package/dist/models/user.d.ts

@@ -16,12 +16,12 @@ export declare class User extends BaseModel {
     nationality?: string;
     email?: string;
     blood_type?: string;
-    national_id?: number;
+    national_id?: string;
     manpower_id?: number;
     mobile?: string;
     office_number?: string;
     department?: number;
-    category: "CAA" | "Embassy";
+    category: string;
     directorate?: string;
     section?: number;
     position?: number;
@@ -45,5 +45,5 @@ export declare class User extends BaseModel {
     religion?: string;
     current_basic_salary: number;
     previous_basic_salary: number;
-    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, current_basic_salary?: number, previous_basic_salary?: number);
+    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?: string, 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, current_basic_salary?: number, previous_basic_salary?: number);
 }

package/dist/models/user.js

@@ -127,8 +127,8 @@ __decorate([
     __metadata("design:type", String)
 ], User.prototype, "blood_type", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
-    __metadata("design:type", Number)
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
 ], User.prototype, "national_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
@@ -147,7 +147,7 @@ __decorate([
     __metadata("design:type", Number)
 ], User.prototype, "department", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: "enum", enum: ["CAA", "Embassy"], nullable: false, default: "CAA" }),
+    (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "category", void 0);
 __decorate([
@@ -244,5 +244,5 @@ __decorate([
 ], User.prototype, "previous_basic_salary", 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, Number, Number])
+    __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, String, 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, Number, Number])
 ], User);

package/package.json

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

package/src/models/AccommodationApprovalModel.ts

@@ -35,14 +35,14 @@ export class AccommodationApproval extends BaseModel {
     @Column({ type: 'int', nullable: true })
     department_id: number;
 
-    @Column({ type: 'int', nullable: true })
-    section_id: number;
-
-    @Column({ type: 'boolean', nullable: false, default: true })
-    is_allowed: boolean;
-
-    @Column({ type: 'int', nullable: false })
-    level: number;
+    @Column({ type: 'int', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'boolean', nullable: false, default: true })
+    is_allowed: boolean;
+
+    @Column({ type: 'int', nullable: false })
+    level: number;
 
     @Column({ 
         type: 'enum', 

package/src/models/AccommodationRequestModel.ts

@@ -134,14 +134,14 @@ export class AccommodationRequest extends BaseModel {
     @Column({ type: 'int', nullable: true })
     assigned_to_user_id: number | null;
 
-    @Column({ type: 'text', nullable: true })
-    approver_comment: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    accommodation_allocated: string | null;
-
-    @Column({ type: 'int', nullable: true })
-    approved_by: number | null;
+    @Column({ type: 'text', nullable: true })
+    approver_comment: string | null;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    accommodation_allocated: string | null;
+
+    @Column({ type: 'int', nullable: true })
+    approved_by: number | null;
 
     @Column({ type: 'date', nullable: true })
     approved_at: Date | null;

package/src/models/AnnualIncrementRequestEmployeeModel.ts

@@ -1,65 +1,65 @@
-import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
-import { BaseModel } from "./BaseModel";
-import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
-
-@Entity({ name: "annual_increment_request_employees" })
-export class AnnualIncrementRequestEmployee extends BaseModel {
-    @Column({ type: "integer", nullable: false })
-    request_id: number;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    employee_name: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "integer", nullable: false })
-    allowance_year: number;
-
-    @Column({ type: "date", nullable: false })
-    effective_date: Date;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    current_basic_salary: number | null;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    increment_percentage: number | null;
-
-    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
-    new_basic_salary: number | null;
-
-    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
-    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
-    request: AnnualIncrementRequest;
-
-    constructor(
-        request_id: number,
-        employee_name: string,
-        employee_id: string,
-        allowance_year: number,
-        effective_date: Date,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        current_basic_salary?: number | null,
-        increment_percentage?: number | null,
-        new_basic_salary?: number | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
-        this.employee_name = employee_name;
-        this.employee_id = employee_id;
-        this.allowance_year = allowance_year;
-        this.effective_date = effective_date;
-        this.current_basic_salary = current_basic_salary ?? null;
-        this.increment_percentage = increment_percentage ?? null;
-        this.new_basic_salary = new_basic_salary ?? null;
-    }
-}
+import { Column, Entity, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualIncrementRequest } from "./AnnualIncrementRequestModel";
+
+@Entity({ name: "annual_increment_request_employees" })
+export class AnnualIncrementRequestEmployee extends BaseModel {
+    @Column({ type: "integer", nullable: false })
+    request_id: number;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "integer", nullable: false })
+    allowance_year: number;
+
+    @Column({ type: "date", nullable: false })
+    effective_date: Date;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    increment_percentage: number | null;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    new_basic_salary: number | null;
+
+    @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
+    @JoinColumn({ name: "request_id", referencedColumnName: "id" })
+    request: AnnualIncrementRequest;
+
+    constructor(
+        request_id: number,
+        employee_name: string,
+        employee_id: string,
+        allowance_year: number,
+        effective_date: Date,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        current_basic_salary?: number | null,
+        increment_percentage?: number | null,
+        new_basic_salary?: number | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id ?? null;
+        this.sub_service_id = sub_service_id ?? null;
+        this.employee_name = employee_name;
+        this.employee_id = employee_id;
+        this.allowance_year = allowance_year;
+        this.effective_date = effective_date;
+        this.current_basic_salary = current_basic_salary ?? null;
+        this.increment_percentage = increment_percentage ?? null;
+        this.new_basic_salary = new_basic_salary ?? null;
+    }
+}

package/src/models/AnnualIncrementRequestModel.ts

@@ -45,24 +45,24 @@ export class AnnualIncrementRequest extends BaseModel {
     @Column({ type: "timestamp", nullable: true })
     assigned_at: Date | null;
 
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    reference_number: string | null;
-
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    reference_number: string | null;
+
     // Annual Increment specific fields
-    @Column({ type: "varchar", length: 255, nullable: true })
-    employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    employee_id: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    allowance_year: number | null;
-
-    @Column({ type: "date", nullable: true })
-    effective_date: Date | null;
+    @Column({ type: "varchar", length: 255, nullable: true })
+    employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    employee_id: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    allowance_year: number | null;
+
+    @Column({ type: "date", nullable: true })
+    effective_date: Date | null;
 
     @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
     current_basic_salary: number | null;
@@ -104,14 +104,14 @@ export class AnnualIncrementRequest extends BaseModel {
         this.req_user_position_id = req_user_position_id || null;
         this.description = description || null;
         this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.reference_number = null;
-        this.employee_name = employee_name || null;
-        this.employee_id = employee_id || null;
-        this.allowance_year = allowance_year || null;
-        this.effective_date = effective_date || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.reference_number = null;
+        this.employee_name = employee_name || null;
+        this.employee_id = employee_id || null;
+        this.allowance_year = allowance_year || null;
+        this.effective_date = effective_date || null;
         this.current_basic_salary = current_basic_salary || null;
         this.increment_percentage = increment_percentage || null;
         this.new_basic_salary = new_basic_salary || null;