@platform-modules/civil-aviation-authority 2.3.267 → 2.3.269

package/.env

@@ -1,12 +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=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=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/MultiPurposeHallRequestModel.d.ts

@@ -30,6 +30,8 @@ export declare class MultiPurposeHallRequests extends BaseModel {
     event_type: MultiPurposeHallInternalExternal;
     request_type: MultiPurposeHallInternalExternal;
     event_date: string;
+    /** Last calendar day of the booking when duration spans multiple days; defaults to event_date when omitted. */
+    event_end_date: string | null;
     event_start_time: string;
     event_end_time: string;
     meal_required: boolean;

package/dist/models/MultiPurposeHallRequestModel.js

@@ -89,6 +89,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", String)
 ], MultiPurposeHallRequests.prototype, "event_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], MultiPurposeHallRequests.prototype, "event_end_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "time", nullable: false }),
     __metadata("design:type", String)

package/dist/models/VipHallRequestModel.d.ts

@@ -27,6 +27,8 @@ export declare class VipHallRequests extends BaseModel {
     event_type: VipHallInternalExternal;
     request_type: VipHallInternalExternal;
     event_date: string;
+    /** Last calendar day of the booking when duration spans multiple days; defaults to event_date when omitted. */
+    event_end_date: string | null;
     event_start_time: string;
     event_end_time: string;
     /** Purpose of the meeting (mandatory in API validation). */

package/dist/models/VipHallRequestModel.js

@@ -88,6 +88,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", String)
 ], VipHallRequests.prototype, "event_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: true }),
+    __metadata("design:type", Object)
+], VipHallRequests.prototype, "event_end_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "time", nullable: false }),
     __metadata("design:type", String)

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
- "version": "2.3.267",
+ "version": "2.3.269",
  "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/AppealAgainstAdministrativeDecisionRequestModel.ts

@@ -75,29 +75,29 @@ export class AppealAgainstAdministrativeDecisionRequest extends BaseModel {
     @Column({ type: "text", nullable: false })
     decision_subject: string;
 
-    @Column({ type: "text", nullable: false })
-    grievance_details: string;
-
-    @Column({ type: "jsonb", nullable: true })
-    individuals_involved: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    times: string[] | null;
-
-    @Column({ type: "date", nullable: true })
-    dates: Date | null;
-
-    @Column({ type: "text", nullable: true })
-    location: string | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    requests: string[] | null;
-
-    @Column({ type: "jsonb", nullable: true })
-    events: string[] | null;
-
-    @Column({ type: "varchar", length: 500, nullable: false })
-    grievant_name: string;
+    @Column({ type: "text", nullable: false })
+    grievance_details: string;
+
+    @Column({ type: "jsonb", nullable: true })
+    individuals_involved: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    times: string[] | null;
+
+    @Column({ type: "date", nullable: true })
+    dates: Date | null;
+
+    @Column({ type: "text", nullable: true })
+    location: string | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    requests: string[] | null;
+
+    @Column({ type: "jsonb", nullable: true })
+    events: string[] | null;
+
+    @Column({ type: "varchar", length: 500, nullable: false })
+    grievant_name: string;
 
     @Column({ type: "varchar", length: 100, nullable: false })
     grievant_employee_number: string;

package/src/models/CAAServices.ts

@@ -8,36 +8,36 @@ export class CAAServices extends BaseModel {
     @Column({ type: 'varchar', length: 64, nullable: false, unique: true })
     code: string;
 
-    @Column({ nullable: false })
-    name: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_name: string | null;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_description: string | null;
-
-    @Column({ nullable: true })
-    logo_url: string;
-
-
-    constructor(     
-        name: string,
-        description: string,
-        arabic_name?: string | null,
-        arabic_description?: string | null,
-        code?: string,
-        logo_url?: string
-    ) {
-        super();     
-        this.name = name;
-        this.description = description;
-        this.arabic_name = arabic_name || null;
-        this.arabic_description = arabic_description || null;
-        this.code = code || '';
-        this.logo_url = logo_url || '';
-    }
-}
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_name: string | null;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_description: string | null;
+
+    @Column({ nullable: true })
+    logo_url: string;
+
+
+    constructor(     
+        name: string,
+        description: string,
+        arabic_name?: string | null,
+        arabic_description?: string | null,
+        code?: string,
+        logo_url?: string
+    ) {
+        super();     
+        this.name = name;
+        this.description = description;
+        this.arabic_name = arabic_name || null;
+        this.arabic_description = arabic_description || null;
+        this.code = code || '';
+        this.logo_url = logo_url || '';
+    }
+}

package/src/models/CAASubServices.ts

@@ -9,20 +9,20 @@ export class CAASubServices extends BaseModel {
     @Column({ type: 'varchar', length: 64, nullable: true, unique: true })
     code: string | null;
 
-    @Column({ nullable: false })
-    sub_service_name: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_name: string | null;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ type: "text", nullable: true })
-    arabic_description: string | null;
-
-    @Column({ nullable: true })
-    service_id: number;
+    @Column({ nullable: false })
+    sub_service_name: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_name: string | null;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ type: "text", nullable: true })
+    arabic_description: string | null;
+
+    @Column({ nullable: true })
+    service_id: number;
 
     @ManyToOne(() => CAAServices)
     @JoinColumn({ name: 'service_id' })
@@ -31,22 +31,22 @@ export class CAASubServices extends BaseModel {
     @Column({ nullable: true })
     logo_url: string;
 
-    constructor(     
-        sub_service_name: string,
-        description: string,
-        arabic_name: string | null,
-        arabic_description: string | null,
-        service_id: number,
-        logo_url: string,
-        code: string | null = null
-    ) {
-        super();     
-        this.sub_service_name = sub_service_name
-        this.arabic_name = arabic_name || null;
-        this.description = description
-        this.arabic_description = arabic_description || null;
-        this.service_id = service_id
-        this.logo_url = logo_url
-        this.code = code
-    }
-}
+    constructor(     
+        sub_service_name: string,
+        description: string,
+        arabic_name: string | null,
+        arabic_description: string | null,
+        service_id: number,
+        logo_url: string,
+        code: string | null = null
+    ) {
+        super();     
+        this.sub_service_name = sub_service_name
+        this.arabic_name = arabic_name || null;
+        this.description = description
+        this.arabic_description = arabic_description || null;
+        this.service_id = service_id
+        this.logo_url = logo_url
+        this.code = code
+    }
+}

package/src/models/CAIRatingMasterModel.ts

@@ -1,39 +1,39 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "cai_rating_master" })
-export class CAIRatingMaster extends BaseModel {
-    @Column({ type: "text", nullable: false })
-    confidentiality: string;
-
-    @Column({ type: "text", nullable: false })
-    integrity: string;
-
-    @Column({ type: "text", nullable: false })
-    availability: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    rating: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    value: string;
-
-    @Column({ type: "boolean", default: true })
-    is_active: boolean;
-
-    constructor(
-        confidentiality: string,
-        integrity: string,
-        availability: string,
-        rating: string,
-        value: string
-    ) {
-        super();
-        this.confidentiality = confidentiality;
-        this.integrity = integrity;
-        this.availability = availability;
-        this.rating = rating;
-        this.value = value;
-        this.is_active = true;
-    }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "cai_rating_master" })
+export class CAIRatingMaster extends BaseModel {
+    @Column({ type: "text", nullable: false })
+    confidentiality: string;
+
+    @Column({ type: "text", nullable: false })
+    integrity: string;
+
+    @Column({ type: "text", nullable: false })
+    availability: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    rating: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    value: string;
+
+    @Column({ type: "boolean", default: true })
+    is_active: boolean;
+
+    constructor(
+        confidentiality: string,
+        integrity: string,
+        availability: string,
+        rating: string,
+        value: string
+    ) {
+        super();
+        this.confidentiality = confidentiality;
+        this.integrity = integrity;
+        this.availability = availability;
+        this.rating = rating;
+        this.value = value;
+        this.is_active = true;
+    }
+}

package/src/models/CSRMBusinessImpactRatingMasterModel.ts

@@ -1,25 +1,25 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "csrm_business_impact_rating_master" })
-export class CSRMBusinessImpactRatingMaster extends BaseModel {
-    @Column({ type: "text", nullable: false })
-    guidelines: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    rating: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    value: string;
-
-    @Column({ type: "boolean", default: true })
-    is_active: boolean;
-
-    constructor(guidelines: string, rating: string, value: string) {
-        super();
-        this.guidelines = guidelines;
-        this.rating = rating;
-        this.value = value;
-        this.is_active = true;
-    }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "csrm_business_impact_rating_master" })
+export class CSRMBusinessImpactRatingMaster extends BaseModel {
+    @Column({ type: "text", nullable: false })
+    guidelines: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    rating: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    value: string;
+
+    @Column({ type: "boolean", default: true })
+    is_active: boolean;
+
+    constructor(guidelines: string, rating: string, value: string) {
+        super();
+        this.guidelines = guidelines;
+        this.rating = rating;
+        this.value = value;
+        this.is_active = true;
+    }
+}

package/src/models/CSRMLikelihoodMasterModel.ts

@@ -1,25 +1,25 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "csrm_likelihood_master" })
-export class CSRMLikelihoodMaster extends BaseModel {
-    @Column({ type: "text", nullable: false })
-    guidelines: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    rating: string;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    value: string;
-
-    @Column({ type: "boolean", default: true })
-    is_active: boolean;
-
-    constructor(guidelines: string, rating: string, value: string) {
-        super();
-        this.guidelines = guidelines;
-        this.rating = rating;
-        this.value = value;
-        this.is_active = true;
-    }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "csrm_likelihood_master" })
+export class CSRMLikelihoodMaster extends BaseModel {
+    @Column({ type: "text", nullable: false })
+    guidelines: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    rating: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    value: string;
+
+    @Column({ type: "boolean", default: true })
+    is_active: boolean;
+
+    constructor(guidelines: string, rating: string, value: string) {
+        super();
+        this.guidelines = guidelines;
+        this.rating = rating;
+        this.value = value;
+        this.is_active = true;
+    }
+}

package/src/models/CashAllowanceLeaveRequestModel.ts

@@ -45,12 +45,12 @@ export class CashAllowanceLeaveRequest 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;
+
     // Cash Allowance for Leave specific fields
     @Column({ type: "varchar", length: 255, nullable: false })
     employee_name: string;
@@ -112,11 +112,11 @@ export class CashAllowanceLeaveRequest 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 || "";
+        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 || "";
         this.employee_id = employee_id || "";
         this.job_title = job_title || "";
         this.salary_grade = salary_grade || "";