@platform-modules/civil-aviation-authority 2.3.130 → 2.3.132

package/src/models/AccommodationApprovalModel.ts

@@ -38,6 +38,9 @@ export class AccommodationApproval extends BaseModel {
     @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;
 

package/src/models/AssetApartmentTypeModel.ts

@@ -1,29 +1,29 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "asset_apartment_types" })
-export class AssetApartmentType extends BaseModel {
-  @Column({ type: "varchar", length: 100, nullable: false })
-  apartment_type_name: string;
-
-  @Column({ type: "float", nullable: false, default: 0 })
-  cost_per_type: number;
-
-  @Column({ type: "text", nullable: true })
-  description: string | null;
-
-  @Column({ type: "boolean", default: true })
-  is_active: boolean;
-
-  @Column({ type: "int", default: 0 })
-  display_order: number;
-
-  constructor(apartmentTypeName: string) {
-    super();
-    this.apartment_type_name = apartmentTypeName;
-    this.cost_per_type = 0;
-    this.description = null;
-    this.is_active = true;
-    this.display_order = 0;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "asset_apartment_types" })
+export class AssetApartmentType extends BaseModel {
+  @Column({ type: "varchar", length: 100, nullable: false })
+  apartment_type_name: string;
+
+  @Column({ type: "float", nullable: false, default: 0 })
+  cost_per_type: number;
+
+  @Column({ type: "text", nullable: true })
+  description: string | null;
+
+  @Column({ type: "boolean", default: true })
+  is_active: boolean;
+
+  @Column({ type: "int", default: 0 })
+  display_order: number;
+
+  constructor(apartmentTypeName: string) {
+    super();
+    this.apartment_type_name = apartmentTypeName;
+    this.cost_per_type = 0;
+    this.description = null;
+    this.is_active = true;
+    this.display_order = 0;
+  }
+}

package/src/models/AssetUnitLocationModel.ts

@@ -1,25 +1,25 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-@Entity({ name: "asset_unit_locations" })
-export class AssetUnitLocation extends BaseModel {
-  @Column({ type: "varchar", length: 255, nullable: false })
-  location_name: string;
-
-  @Column({ type: "text", nullable: true })
-  description: string | null;
-
-  @Column({ type: "boolean", default: true })
-  is_active: boolean;
-
-  @Column({ type: "int", default: 0 })
-  display_order: number;
-
-  constructor(locationName: string) {
-    super();
-    this.location_name = locationName;
-    this.description = null;
-    this.is_active = true;
-    this.display_order = 0;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "asset_unit_locations" })
+export class AssetUnitLocation extends BaseModel {
+  @Column({ type: "varchar", length: 255, nullable: false })
+  location_name: string;
+
+  @Column({ type: "text", nullable: true })
+  description: string | null;
+
+  @Column({ type: "boolean", default: true })
+  is_active: boolean;
+
+  @Column({ type: "int", default: 0 })
+  display_order: number;
+
+  constructor(locationName: string) {
+    super();
+    this.location_name = locationName;
+    this.description = null;
+    this.is_active = true;
+    this.display_order = 0;
+  }
+}

package/src/models/CyberSecurityAuditRequestModel.ts

@@ -30,6 +30,12 @@ export class CyberSecurityAuditRequest extends BaseModel {
     @Column({ type: "integer", nullable: true })
     req_user_section_id: number | null;
 
+    @Column({ type: "integer", nullable: true })
+    requesting_to_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    requesting_to_section_id: number | null;
+
     @Column({ type: "integer", nullable: true })
     req_user_position_id: number | null;
 
@@ -85,6 +91,8 @@ export class CyberSecurityAuditRequest extends BaseModel {
         sub_service_id?: number | null,
         req_user_department_id?: number | null,
         req_user_section_id?: number | null,
+        requesting_to_department_id?: number | null,
+        requesting_to_section_id?: number | null,
         req_user_position_id?: number | null,
         description?: string | null,
         reviewer_user_id?: number | null,
@@ -104,6 +112,8 @@ export class CyberSecurityAuditRequest extends BaseModel {
         this.sub_service_id = sub_service_id || null;
         this.req_user_department_id = req_user_department_id || null;
         this.req_user_section_id = req_user_section_id || null;
+        this.requesting_to_department_id = requesting_to_department_id || null;
+        this.requesting_to_section_id = requesting_to_section_id || null;
         this.req_user_position_id = req_user_position_id || null;
         this.description = description || null;
         this.reviewer_user_id = reviewer_user_id || null;

package/src/models/ResidentialUnitRentalRequestModel.ts

@@ -1,229 +1,219 @@
-import { Column, Entity } from "typeorm"; 
-
-import { BaseModel } from "./BaseModel"; 
-
- 
- 
-
-export enum ResidentialUnitRentalRequestStatus { 
-
-    Pending = 'Pending', 
-
-    Approved = 'Approved', 
-
-    Rejected = 'Rejected', 
-
-    RFC = 'RFC' 
-
-} 
-
- 
- 
-
-@Entity({ name: 'residential_unit_rental_requests' }) 
-
-export class ResidentialUnitRentalRequest extends BaseModel { 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: false }) 
-
-    request_id: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    service_id: number; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    sub_service_id: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 50, nullable: false }) 
-
-    requested_unit_type: string; // Apartment, Villa 
-
- 
- 
-
-    /** BRD: Apartment options with OMR rates - Studio 100, 1BHK 150, 2BHK 200, 3BHK 250 */ 
-
-    @Column({ type: 'json', nullable: true }) 
-
-    apartment_type: { 
-
-        studio?: boolean; 
-
-        one_bhk?: boolean; 
-
-        two_bhk?: boolean; 
-
-        three_bhk?: boolean; 
-
-    }; 
-
- 
- 
-
-    /** BRD: Villa options with OMR rates - 1 ROOM 201, 2 ROOM 350, 3 ROOM 400 */ 
-
-    @Column({ type: 'json', nullable: true }) 
-
-    villa_type: { 
-
-        one_room?: boolean; 
-
-        two_room?: boolean; 
-
-        three_room?: boolean; 
-
-    }; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: true }) 
-
-    extension_number: string; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: false }) 
-
-    preferred_start_date: Date; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    family_size: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 50, nullable: false }) 
-
-    duration_of_stay: string; // Months/Years 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 255, nullable: true }) 
-
-    location_of_unit: string; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    comment: string; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 20, nullable: false, default: 'Pending' }) 
-
-    status: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: true }) 
-
-    user_id: number; 
-
- 
- 
-
-    @Column({ type: 'varchar', length: 255, nullable: true }) 
-
-    workflow_execution_id: string; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: false }) 
-
-    created_by: number; 
-
- 
- 
-
-    @Column({ type: 'int', nullable: true }) 
-
-    approved_by: number; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    approved_at: Date; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    approver_comment: string; 
-
- 
- 
-
-    @Column({ type: 'json', nullable: true }) 
-
-    unit_details: { 
-
-        type: string; 
-
-        specifications: any; 
-
-        rate: number; 
-
-    }; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    rental_start_date: Date; 
-
- 
- 
-
-    @Column({ type: 'date', nullable: true }) 
-
-    rental_end_date: Date; 
-
- 
- 
-
-    @Column({ type: 'text', nullable: true }) 
-
-    rental_agreement_url: string; 
-
- 
- 
-
-    constructor() { 
-
-        super(); 
-
-    } 
-
-} 
-
+import { Column, Entity } from "typeorm"; 
+
+import { BaseModel } from "./BaseModel"; 
+
+ 
+ 
+
+export enum ResidentialUnitRentalRequestStatus { 
+
+    Pending = 'Pending', 
+
+    Approved = 'Approved', 
+
+    Rejected = 'Rejected', 
+
+    RFC = 'RFC' 
+
+} 
+
+ 
+ 
+
+@Entity({ name: 'residential_unit_rental_requests' }) 
+
+export class ResidentialUnitRentalRequest extends BaseModel { 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: false }) 
+
+    request_id: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    service_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    sub_service_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 50, nullable: false }) 
+
+    requested_unit_type: string; // Apartment, Villa 
+
+ 
+ 
+
+    /** UI sends apartment type as a plain string value */ 
+ 
+    @Column({ type: 'json', nullable: true }) 
+ 
+    apartment_type: string | null; 
+
+ 
+ 
+
+    /** BRD: Villa options with OMR rates - 1 ROOM 201, 2 ROOM 350, 3 ROOM 400 */ 
+
+    @Column({ type: 'json', nullable: true }) 
+
+    villa_type: { 
+
+        one_room?: boolean; 
+
+        two_room?: boolean; 
+
+        three_room?: boolean; 
+
+    }; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: true }) 
+
+    extension_number: string; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: false }) 
+
+    preferred_start_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    family_size: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 50, nullable: false }) 
+
+    duration_of_stay: string; // Months/Years 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 255, nullable: true }) 
+
+    location_of_unit: string; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    comment: string; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 20, nullable: false, default: 'Pending' }) 
+
+    status: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: true }) 
+
+    user_id: number; 
+
+ 
+ 
+
+    @Column({ type: 'varchar', length: 255, nullable: true }) 
+
+    workflow_execution_id: string; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: false }) 
+
+    created_by: number; 
+
+ 
+ 
+
+    @Column({ type: 'int', nullable: true }) 
+
+    approved_by: number; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    approved_at: Date; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    approver_comment: string; 
+
+ 
+ 
+
+    @Column({ type: 'json', nullable: true }) 
+
+    unit_details: { 
+
+        type: string; 
+
+        specifications: any; 
+
+        rate: number; 
+
+    }; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    rental_start_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'date', nullable: true }) 
+
+    rental_end_date: Date; 
+
+ 
+ 
+
+    @Column({ type: 'text', nullable: true }) 
+
+    rental_agreement_url: string; 
+
+ 
+ 
+
+    constructor() { 
+
+        super(); 
+
+    } 
+
+} 
+