@platform-modules/civil-aviation-authority 2.3.179 → 2.3.182

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/AnnualTrainingPlanRequestModel.ts

@@ -1,153 +1,153 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum AnnualTrainingPlanRequestStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  COMPLETED = "Completed",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-export enum AnnualTrainingPlanPlace {
-  INSIDE = "Inside",
-  OUTSIDE = "Outside"
-}
-
-@Entity({ name: "annual_training_plan_requests" })
-export class AnnualTrainingPlanRequest extends BaseModel {
-  @Column({ type: "integer", nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  req_user_position_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  service_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: "integer", nullable: false })
-  user_id: number;
-
-  @Column({ type: "varchar", length: 255, nullable: false })
-  course_name: string;
-
-  @Column({ type: "integer", nullable: false })
-  no_of_participants: number;
-
-  @Column({ type: "decimal", precision: 10, scale: 2, nullable: false })
-  course_cost: number;
-
-  @Column({ type: "decimal", precision: 10, scale: 2, nullable: false })
-  total_cost: number;
-
-  @Column({ type: "date", nullable: false })
-  proposed_implementation_date: Date;
-
-  @Column({ type: "text", nullable: false })
-  description: string;
-
-  @Column({
-    type: "enum",
-    enum: AnnualTrainingPlanPlace,
-    nullable: false
-  })
-  place: AnnualTrainingPlanPlace;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  location: string | null;
-
-  @Column({ type: "text", nullable: false })
-  reason: string;
-
-  @Column({ type: "jsonb", nullable: true })
-  employee_list: any[] | null; // List of employees for training attendance
-
-  @Column({
-    type: "enum",
-    enum: AnnualTrainingPlanRequestStatus,
-    default: AnnualTrainingPlanRequestStatus.PENDING,
-    nullable: false
-  })
-  status: AnnualTrainingPlanRequestStatus;
-
-  @Column({ type: "integer", nullable: true })
-  reviewer_user_id: number | null;
-
-  @Column({ type: "integer", nullable: true })
-  assigned_to_user_id: number | null;
-
-  @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 })
-  job_competency: string | null;
-
-  @Column({ type: "jsonb", nullable: true })
-  name_of_participants: string[] | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  directarate: string | null;
-
-  constructor(
-    user_id: number,
-    course_name: string,
-    no_of_participants: number,
-    course_cost: number,
-    total_cost: number,
-    proposed_implementation_date: Date,
-    description: string,
-    place: AnnualTrainingPlanPlace,
-    reason: string,
-    status: AnnualTrainingPlanRequestStatus = AnnualTrainingPlanRequestStatus.PENDING,
-    service_id?: number | null,
-    sub_service_id?: number | null,
-    req_user_department_id?: number | null,
-    req_user_section_id?: number | null,
-    req_user_position_id?: number | null,
-    location?: string | null,
-    employee_list?: any[] | null,
-    reviewer_user_id?: number | null,
-    assigned_to_user_id?: number | null,
-    assigned_at?: Date | null,
-    workflow_execution_id?: string | null,
-    job_competency?: string | null,
-    name_of_participants?: string[] | null,
-    directarate?: string | null
-  ) {
-    super();
-    this.user_id = user_id;
-    this.course_name = course_name;
-    this.no_of_participants = no_of_participants;
-    this.course_cost = course_cost;
-    this.total_cost = total_cost;
-    this.proposed_implementation_date = proposed_implementation_date;
-    this.description = description;
-    this.place = place;
-    this.reason = reason;
-    this.status = status;
-    this.service_id = service_id || null;
-    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.req_user_position_id = req_user_position_id || null;
-    this.location = location || null;
-    this.employee_list = employee_list || 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.job_competency = job_competency ?? null;
-    this.name_of_participants = name_of_participants ?? null;
-    this.directarate = directarate ?? null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AnnualTrainingPlanRequestStatus {
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  COMPLETED = "Completed",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+export enum AnnualTrainingPlanPlace {
+  INSIDE = "Inside",
+  OUTSIDE = "Outside"
+}
+
+@Entity({ name: "annual_training_plan_requests" })
+export class AnnualTrainingPlanRequest extends BaseModel {
+  @Column({ type: "integer", nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  req_user_position_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  service_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: "integer", nullable: false })
+  user_id: number;
+
+  @Column({ type: "varchar", length: 255, nullable: false })
+  course_name: string;
+
+  @Column({ type: "integer", nullable: false })
+  no_of_participants: number;
+
+  @Column({ type: "decimal", precision: 10, scale: 2, nullable: false })
+  course_cost: number;
+
+  @Column({ type: "decimal", precision: 10, scale: 2, nullable: false })
+  total_cost: number;
+
+  @Column({ type: "varchar", length: 500, nullable: false })
+  proposed_implementation_date: string;
+
+  @Column({ type: "text", nullable: false })
+  description: string;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanPlace,
+    nullable: true
+  })
+  place: AnnualTrainingPlanPlace | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  location: string | null;
+
+  @Column({ type: "text", nullable: false })
+  reason: string;
+
+  @Column({ type: "jsonb", nullable: true })
+  employee_list: any[] | null; // List of employees for training attendance
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanRequestStatus,
+    default: AnnualTrainingPlanRequestStatus.PENDING,
+    nullable: false
+  })
+  status: AnnualTrainingPlanRequestStatus;
+
+  @Column({ type: "integer", nullable: true })
+  reviewer_user_id: number | null;
+
+  @Column({ type: "integer", nullable: true })
+  assigned_to_user_id: number | null;
+
+  @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 })
+  job_competency: string | null;
+
+  @Column({ type: "jsonb", nullable: true })
+  name_of_participants: string[] | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  directarate: string | null;
+
+  constructor(
+    user_id: number,
+    course_name: string,
+    no_of_participants: number,
+    course_cost: number,
+    total_cost: number,
+    proposed_implementation_date: string,
+    description: string,
+    place: AnnualTrainingPlanPlace | null,
+    reason: string,
+    status: AnnualTrainingPlanRequestStatus = AnnualTrainingPlanRequestStatus.PENDING,
+    service_id?: number | null,
+    sub_service_id?: number | null,
+    req_user_department_id?: number | null,
+    req_user_section_id?: number | null,
+    req_user_position_id?: number | null,
+    location?: string | null,
+    employee_list?: any[] | null,
+    reviewer_user_id?: number | null,
+    assigned_to_user_id?: number | null,
+    assigned_at?: Date | null,
+    workflow_execution_id?: string | null,
+    job_competency?: string | null,
+    name_of_participants?: string[] | null,
+    directarate?: string | null
+  ) {
+    super();
+    this.user_id = user_id;
+    this.course_name = course_name;
+    this.no_of_participants = no_of_participants;
+    this.course_cost = course_cost;
+    this.total_cost = total_cost;
+    this.proposed_implementation_date = proposed_implementation_date;
+    this.description = description;
+    this.place = place;
+    this.reason = reason;
+    this.status = status;
+    this.service_id = service_id || null;
+    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.req_user_position_id = req_user_position_id || null;
+    this.location = location || null;
+    this.employee_list = employee_list || 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.job_competency = job_competency ?? null;
+    this.name_of_participants = name_of_participants ?? null;
+    this.directarate = directarate ?? 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 || '';
+    }
+}