@platform-modules/civil-aviation-authority 2.2.207 → 2.2.208

package/.env

@@ -1,5 +1,17 @@
-DB_HOST=localhost
-DB_PORT=5433
-DB_USER=postgres
-DB_PASS=123
-DB_NAME=CAA
+# DB_HOST=localhost
+# DB_PORT=5433
+# DB_USER=postgres
+# DB_PASS=123
+# DB_NAME=CAA
+
+# 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_PORT=5432
+DB_USER=adminuser
+DB_PASS=postgres_caa_fm_qa_34567
+DB_NAME=CAA_QA

package/dist/models/AirportEntryPermitModel.d.ts

@@ -61,7 +61,7 @@ export declare class AirportEntryPermit extends BaseModel {
     phone_number: string;
     location: AirportEntryPermitLocation;
     type_of_permit: AirportEntryPermitType;
-    temporary_start_time: string | null;
+    temporary_start_time: Date | null;
     temporary_duration: string | null;
     permission_to_required_areas: AirportEntryPermitArea[];
     attachment_url: string | null;
@@ -74,5 +74,5 @@ export declare class AirportEntryPermit extends BaseModel {
     consent_do_not_approve_to_issue_permit: boolean;
     consent_justification: string | null;
     requested_by: string;
-    constructor(name_full_family_name: string, nationality: string, dob: Date, place: string, passport_id_card_no: string, category_of_permit: AirportEntryPermitCategory, date_of_submission: Date, phone_number: string, location: AirportEntryPermitLocation, type_of_permit: AirportEntryPermitType, permission_to_required_areas: AirportEntryPermitArea[], details: string, occupation_staff: string, requested_by: string, user_id: number, status?: AirportEntryPermitStatus, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null, workflow_execution_id?: string | null, req_user_department_id?: number | null, req_user_section_id?: number | null, attachment_url?: string | null, temporary_start_time?: string | null, temporary_duration?: string | null, for_visitor?: VisitorOption[] | null, acknowledge_security_policies?: boolean, acknowledge_disciplinary_action?: boolean, consent_approve_to_issue_permit?: boolean, consent_do_not_approve_to_issue_permit?: boolean, consent_justification?: string | null, request_id?: string | null);
+    constructor(name_full_family_name: string, nationality: string, dob: Date, place: string, passport_id_card_no: string, category_of_permit: AirportEntryPermitCategory, date_of_submission: Date, phone_number: string, location: AirportEntryPermitLocation, type_of_permit: AirportEntryPermitType, permission_to_required_areas: AirportEntryPermitArea[], details: string, occupation_staff: string, requested_by: string, user_id: number, status?: AirportEntryPermitStatus, service_id?: number | null, sub_service_id?: number | null, service_type?: string | null, workflow_execution_id?: string | null, req_user_department_id?: number | null, req_user_section_id?: number | null, attachment_url?: string | null, temporary_start_time?: Date | null, temporary_duration?: string | null, for_visitor?: VisitorOption[] | null, acknowledge_security_policies?: boolean, acknowledge_disciplinary_action?: boolean, consent_approve_to_issue_permit?: boolean, consent_do_not_approve_to_issue_permit?: boolean, consent_justification?: string | null, request_id?: string | null);
 }

package/dist/models/AirportEntryPermitModel.js

@@ -192,7 +192,7 @@ __decorate([
     __metadata("design:type", String)
 ], AirportEntryPermit.prototype, "type_of_permit", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'time', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
     __metadata("design:type", Object)
 ], AirportEntryPermit.prototype, "temporary_start_time", void 0);
 __decorate([

package/dist/models/SecurityAwarenessApprovalModel.d.ts

@@ -18,6 +18,7 @@ export declare class SecurityAwarenessApproval extends BaseModel {
     approved_by: number | null;
     comment: string;
     approval_status: SecurityAwarenessApprovalStatus;
+    is_manager: boolean;
     is_allowed: boolean;
-    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: SecurityAwarenessApprovalStatus, level: number, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number, is_allowed?: boolean);
+    constructor(request_id: number, approver_role_id: number, comment: string, approval_status: SecurityAwarenessApprovalStatus, level: number, is_manager?: boolean, department_id?: number | null, section_id?: number | null, approver_user_id?: number | null, delegate_user_id?: number | null, approved_by?: number | null, service_id?: number, sub_service_id?: number, is_allowed?: boolean);
 }

package/dist/models/SecurityAwarenessApprovalModel.js

@@ -20,7 +20,7 @@ var SecurityAwarenessApprovalStatus;
     SecurityAwarenessApprovalStatus["REJECTED"] = "Rejected";
 })(SecurityAwarenessApprovalStatus || (exports.SecurityAwarenessApprovalStatus = SecurityAwarenessApprovalStatus = {}));
 let SecurityAwarenessApproval = class SecurityAwarenessApproval extends BaseModel_1.BaseModel {
-    constructor(request_id, approver_role_id, comment, approval_status, level, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
+    constructor(request_id, approver_role_id, comment, approval_status, level, is_manager = false, department_id, section_id, approver_user_id, delegate_user_id, approved_by, service_id, sub_service_id, is_allowed) {
         super();
         this.request_id = request_id;
         this.service_id = service_id || null;
@@ -29,6 +29,7 @@ let SecurityAwarenessApproval = class SecurityAwarenessApproval extends BaseMode
         this.comment = comment;
         this.approval_status = approval_status;
         this.level = level;
+        this.is_manager = is_manager;
         this.department_id = department_id || null;
         this.section_id = section_id || null;
         this.approver_user_id = approver_user_id || null;
@@ -86,11 +87,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: SecurityAwarenessApprovalStatus, default: SecurityAwarenessApprovalStatus.PENDING, nullable: false }),
     __metadata("design:type", String)
 ], SecurityAwarenessApproval.prototype, "approval_status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: false, nullable: false }),
+    __metadata("design:type", Boolean)
+], SecurityAwarenessApproval.prototype, "is_manager", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
     __metadata("design:type", Boolean)
 ], SecurityAwarenessApproval.prototype, "is_allowed", void 0);
 exports.SecurityAwarenessApproval = SecurityAwarenessApproval = __decorate([
     (0, typeorm_1.Entity)({ name: 'security_awareness_approvals' }),
-    __metadata("design:paramtypes", [Number, Number, String, String, Number, Object, Object, Object, Object, Object, Number, Number, Boolean])
+    __metadata("design:paramtypes", [Number, Number, String, String, Number, Boolean, Object, Object, Object, Object, Object, Number, Number, Boolean])
 ], SecurityAwarenessApproval);

package/dist/models/ServiceTypeModel.d.ts

@@ -5,7 +5,7 @@ import { Departments } from './DepartmentsModel';
 import { Sections } from './SectionModel';
 export declare class ServiceType extends BaseModel {
     name: string;
-    name_in_arabic: string;
+    name_in_arabic: string | null;
     service_id: number;
     service: CAAServices;
     sub_service_id: number;
@@ -16,5 +16,5 @@ export declare class ServiceType extends BaseModel {
     section: Sections;
     description: string;
     is_active: boolean;
-    constructor(name: string, name_in_arabic: string, service_id: number, sub_service_id: number, description?: string, is_active?: boolean, department_id?: number | null, section_id?: number | null);
+    constructor(name: string, name_in_arabic: string | null, service_id: number, sub_service_id: number, description?: string, is_active?: boolean, department_id?: number | null, section_id?: number | null);
 }

package/dist/models/ServiceTypeModel.js

@@ -20,7 +20,7 @@ let ServiceType = class ServiceType extends BaseModel_1.BaseModel {
     constructor(name, name_in_arabic, service_id, sub_service_id, description, is_active, department_id, section_id) {
         super();
         this.name = name;
-        this.name_in_arabic = name_in_arabic;
+        this.name_in_arabic = name_in_arabic || '';
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
         this.description = description || '';
@@ -36,7 +36,7 @@ __decorate([
 ], ServiceType.prototype, "name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
+    __metadata("design:type", Object)
 ], ServiceType.prototype, "name_in_arabic", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: false }),
@@ -84,5 +84,5 @@ __decorate([
 ], ServiceType.prototype, "is_active", void 0);
 exports.ServiceType = ServiceType = __decorate([
     (0, typeorm_1.Entity)({ name: 'service_types' }),
-    __metadata("design:paramtypes", [String, String, Number, Number, String, Boolean, Object, Object])
+    __metadata("design:paramtypes", [String, Object, Number, Number, String, Boolean, Object, Object])
 ], ServiceType);

package/package.json

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

package/src/models/AirportEntryPermitModel.ts

@@ -128,8 +128,8 @@ export class AirportEntryPermit extends BaseModel {
   })
   type_of_permit: AirportEntryPermitType;
 
-  @Column({ type: 'time', nullable: true })
-  temporary_start_time: string | null;
+  @Column({ type: 'date', nullable: true })
+  temporary_start_time: Date | null;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   temporary_duration: string | null;
@@ -194,7 +194,7 @@ export class AirportEntryPermit extends BaseModel {
     req_user_department_id?: number | null,
     req_user_section_id?: number | null,
     attachment_url?: string | null,
-    temporary_start_time?: string | null,
+    temporary_start_time?: Date | null,
     temporary_duration?: string | null,
     for_visitor?: VisitorOption[] | null,
     acknowledge_security_policies: boolean = false,

package/src/models/SecurityAwarenessApprovalModel.ts

@@ -47,6 +47,9 @@ export class SecurityAwarenessApproval extends BaseModel {
   @Column({ type: 'enum', enum: SecurityAwarenessApprovalStatus, default: SecurityAwarenessApprovalStatus.PENDING, nullable: false })
   approval_status: SecurityAwarenessApprovalStatus;
 
+  @Column({ type: 'boolean', default: false, nullable: false })
+  is_manager: boolean;
+
   @Column({ type: 'boolean', default: true, nullable: false })
   is_allowed: boolean;
 
@@ -56,6 +59,7 @@ export class SecurityAwarenessApproval extends BaseModel {
     comment: string, 
     approval_status: SecurityAwarenessApprovalStatus, 
     level: number,
+    is_manager: boolean = false,
     department_id?: number | null,
     section_id?: number | null,
     approver_user_id?: number | null,
@@ -73,6 +77,7 @@ export class SecurityAwarenessApproval extends BaseModel {
     this.comment = comment;
     this.approval_status = approval_status;
     this.level = level;
+    this.is_manager = is_manager;
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approver_user_id = approver_user_id || null;

package/src/models/ServiceTypeModel.ts

@@ -12,7 +12,7 @@ export class ServiceType extends BaseModel {
     name: string;
 
     @Column({ nullable: true })
-    name_in_arabic: string;
+    name_in_arabic: string | null;
 
     @Column({ nullable: false })
     service_id: number;
@@ -50,7 +50,7 @@ export class ServiceType extends BaseModel {
 
     constructor(
         name: string,
-        name_in_arabic: string,
+        name_in_arabic: string | null,
         service_id: number,
         sub_service_id: number,
         description?: string,
@@ -60,7 +60,7 @@ export class ServiceType extends BaseModel {
     ) {
         super();
         this.name = name;
-        this.name_in_arabic = name_in_arabic;
+        this.name_in_arabic = name_in_arabic || '';
         this.service_id = service_id;
         this.sub_service_id = sub_service_id;
         this.description = description || '';

package/dist/models/HotelreservationModal.d.ts

@@ -1,30 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare enum MealType {
-    BREAKFAST = "Breakfast",
-    LUNCH = "Lunch",
-    DINNER = "Dinner"
-}
-export declare enum ServiceTypes {
-    LAUNDRY = "Laundry",
-    TELEPHONE = "Telephone Service"
-}
-export declare class HotelReservation extends BaseModel {
-    type_of_accommodation: string;
-    price: number;
-    meal: MealType;
-    service: ServiceTypes;
-    date_of_request: Date;
-    hotel_name: string;
-    check_in_date: Date;
-    check_in_time: string;
-    check_out_date: Date;
-    check_out_time: string;
-    number_of_guests: number;
-    description: string;
-    attachment_url: string;
-    requested_by: string;
-    visitor_name: string;
-    hr_approval: boolean;
-    pr_approval: boolean;
-    constructor(type_of_accommodation: string, price: number, meal: MealType, service: ServiceTypes, date_of_request: Date, hotel_name: string, check_in_date: Date, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string, hr_approval: boolean, pr_approval: boolean);
-}

package/dist/models/HotelreservationModal.js

@@ -1,119 +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.HotelReservation = exports.ServiceTypes = exports.MealType = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var MealType;
-(function (MealType) {
-    MealType["BREAKFAST"] = "Breakfast";
-    MealType["LUNCH"] = "Lunch";
-    MealType["DINNER"] = "Dinner";
-})(MealType || (exports.MealType = MealType = {}));
-var ServiceTypes;
-(function (ServiceTypes) {
-    ServiceTypes["LAUNDRY"] = "Laundry";
-    ServiceTypes["TELEPHONE"] = "Telephone Service";
-})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
-let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
-    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, hr_approval, pr_approval) {
-        super();
-        this.type_of_accommodation = type_of_accommodation;
-        this.price = price;
-        this.meal = meal;
-        this.service = service;
-        this.date_of_request = date_of_request;
-        this.hotel_name = hotel_name;
-        this.check_in_date = check_in_date;
-        this.check_in_time = check_in_time;
-        this.check_out_date = check_out_date;
-        this.check_out_time = check_out_time;
-        this.number_of_guests = number_of_guests;
-        this.description = description;
-        this.requested_by = requested_by;
-        this.visitor_name = visitor_name;
-        this.hr_approval = hr_approval;
-        this.pr_approval = pr_approval;
-    }
-};
-exports.HotelReservation = HotelReservation;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "type_of_accommodation", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
-    __metadata("design:type", Number)
-], HotelReservation.prototype, "price", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "meal", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "service", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "date_of_request", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "hotel_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "check_in_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "check_in_time", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "check_out_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "check_out_time", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], HotelReservation.prototype, "number_of_guests", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "attachment_url", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "requested_by", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "visitor_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], HotelReservation.prototype, "hr_approval", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], HotelReservation.prototype, "pr_approval", void 0);
-exports.HotelReservation = HotelReservation = __decorate([
-    (0, typeorm_1.Entity)({ name: 'hotel_reservations' }),
-    __metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Boolean, Boolean])
-], HotelReservation);