@platform-modules/civil-aviation-authority 2.3.152 → 2.3.156

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/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
- "version": "2.3.152",
+ "version": "2.3.156",
  "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

@@ -18,11 +18,12 @@ export enum OfficialPurposeOfTravel {
     Other = 'Other'
 }
 
-export enum AccommodationType {
-    Apartment = 'Apartment',
-    Villa = 'Villa',
-    SharedUnit = 'Shared Unit'
-}
+export enum AccommodationType {
+    Studio = 'Studio',
+    OneRoom = '1 Room',
+    TwoRooms = '2 Rooms',
+    ThreeRooms = '3 Rooms'
+}
 
 @Entity({ name: 'accommodation_requests' })
 export class AccommodationRequest extends BaseModel {
@@ -64,50 +65,58 @@ export class AccommodationRequest extends BaseModel {
     @Column({ type: 'varchar', length: 255, nullable: true })
     other_purpose_specification: string | null; // If Other is selected
 
-    // 3. Accommodation Type Requested (Apartment / Villa / Shared Unit)
-    @Column({ 
-        type: 'enum', 
-        enum: AccommodationType, 
-        nullable: false 
-    })
-    accommodation_type_requested: AccommodationType;
-
-    // 4. Start Date of Stay (M)
-    @Column({ type: 'date', nullable: false })
-    start_date_of_stay: Date;
-
-    // 5. Duration of Days (M)
-    @Column({ type: 'int', nullable: false })
-    duration_of_days: number;
-
-    // 6. Travel Details (From – To)
-    @Column({ type: 'varchar', length: 255, nullable: false })
-    travel_from: string;
+    // 3. Accommodation Type Requested (Studio / 1 Room / 2 Rooms / 3 Rooms)
+    @Column({ 
+        type: 'enum', 
+        enum: AccommodationType, 
+        nullable: false 
+    })
+    accommodation_type_requested: AccommodationType;
+
+    // 4. Start Date of Stay (M)
+    @Column({ type: 'date', nullable: false })
+    start_date_of_stay: Date;
+
+    // 5. End Date of Stay (M)
+    @Column({ type: 'date', nullable: false })
+    end_date_of_stay: Date;
+
+    // 6. Departure Time (M)
+    @Column({ type: 'time', nullable: false })
+    departure_time: string;
+
+    // 7. Duration of Days (M)
+    @Column({ type: 'int', nullable: false })
+    duration_of_days: number;
+
+    // 8. Travel Details (From – To)
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    travel_from: string;
 
     @Column({ type: 'varchar', length: 255, nullable: false })
     travel_to: string;
 
-    // 7. Time of arrival (M)
-    @Column({ type: 'time', nullable: false })
-    time_of_arrival: string; // Format: HH:MM
-
-    // 8. Travelling from which region (M)
-    @Column({ type: 'varchar', length: 255, nullable: false })
-    travelling_from_region: string;
-
-    // 9. No. of employees travelling (M)
-    @Column({ type: 'int', nullable: false })
-    number_of_employees_travelling: number;
-
-    // 10. Details of employee Emp id / Name / Designation/ Grade/ Contact Number
-    @Column({ type: 'json', nullable: false })
-    employee_details: Array<{
-        employee_id: string;
-        employee_name: string;
-        designation: string;
-        grade: string;
-        contact_number: string;
-    }>;
+    // 9. Time of arrival (M)
+    @Column({ type: 'time', nullable: false })
+    time_of_arrival: string; // Format: HH:MM
+
+    // 10. Travelling from which region (M)
+    @Column({ type: 'varchar', length: 255, nullable: false })
+    travelling_from_region: string;
+
+    // 11. No. of employees travelling (M)
+    @Column({ type: 'int', nullable: false })
+    number_of_employees_travelling: number;
+
+    // 12. Details of employee Emp id / Name / Designation / Grade / Contact Number
+    @Column({ type: 'json', nullable: false })
+    employee_details: Array<{
+        employee_id: string;
+        employee_name: string;
+        designation: string;
+        grade?: string | null;
+        contact_number: string;
+    }>;
 
     // Status
     @Column({ 

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;

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;
+    }
+}