@platform-modules/civil-aviation-authority 2.3.329 → 2.3.331

package/src/models/AnnualTrainingPlanDepartmentPlanDecisionModel.ts

@@ -0,0 +1,33 @@
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import {
+  AnnualTrainingPlanDepartmentPlan,
+  AnnualTrainingPlanDepartmentPlanStatus
+} from "./AnnualTrainingPlanDepartmentPlanModel";
+
+@Entity({ name: "annual_training_plan_department_plan_decisions" })
+@Index(["department_plan_id", "approval_level"])
+export class AnnualTrainingPlanDepartmentPlanDecision extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  department_plan_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  approval_level: number;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanDepartmentPlanStatus,
+    nullable: false
+  })
+  status: AnnualTrainingPlanDepartmentPlanStatus;
+
+  @Column({ type: "text", nullable: true })
+  comment: string | null;
+
+  @Column({ type: "integer", nullable: true })
+  decided_by: number | null;
+
+  @ManyToOne(() => AnnualTrainingPlanDepartmentPlan, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "department_plan_id" })
+  department_plan: AnnualTrainingPlanDepartmentPlan;
+}

package/src/models/AnnualTrainingPlanDepartmentPlanModel.ts

@@ -0,0 +1,31 @@
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import { AnnualTrainingPlanRequest } from "./AnnualTrainingPlanRequestModel";
+
+export enum AnnualTrainingPlanDepartmentPlanStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: "annual_training_plan_department_plans" })
+@Index(["request_id"])
+export class AnnualTrainingPlanDepartmentPlan extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanDepartmentPlanStatus,
+    default: AnnualTrainingPlanDepartmentPlanStatus.PENDING,
+    nullable: false
+  })
+  status: AnnualTrainingPlanDepartmentPlanStatus;
+
+  @ManyToOne(() => AnnualTrainingPlanRequest, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "request_id" })
+  request: AnnualTrainingPlanRequest;
+}

package/src/models/AnnualTrainingPlanItemModel.ts

@@ -0,0 +1,71 @@
+import { Column, Entity, Index, JoinColumn, ManyToOne, Unique } from "typeorm";
+import { BaseModel } from "./BaseModel";
+import {
+  AnnualTrainingPlanPlace,
+  AnnualTrainingPlanRequest
+} from "./AnnualTrainingPlanRequestModel";
+
+@Entity({ name: "annual_training_plan_items" })
+@Unique(["request_id", "row_number"])
+@Index(["request_id"])
+@Index(["department_id"])
+export class AnnualTrainingPlanItem extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  request_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  department_plan_id: number | null;
+
+  @Column({ type: "integer", nullable: false })
+  row_number: number;
+
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  section_id: number | null;
+
+  @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: 14, 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: "text", nullable: false })
+  reason: string;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  job_competency: string | null;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanPlace,
+    nullable: true
+  })
+  place: AnnualTrainingPlanPlace | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  location: string | null;
+
+  @Column({ type: "jsonb", nullable: true })
+  name_of_participants: string[] | null;
+
+  @Column({ type: "jsonb", nullable: true })
+  employee_list: any[] | null;
+
+  @ManyToOne(() => AnnualTrainingPlanRequest, { onDelete: "CASCADE" })
+  @JoinColumn({ name: "request_id" })
+  request: AnnualTrainingPlanRequest;
+}

package/src/models/AnnualTrainingPlanRequestModel.ts

@@ -14,6 +14,17 @@ export enum AnnualTrainingPlanPlace {
   OUTSIDE = "Outside"
 }
 
+export enum AnnualTrainingPlanImportStatus {
+  VALIDATED = "Validated",
+  IMPORTED = "Imported",
+  FAILED = "Failed"
+}
+
+export enum AnnualTrainingPlanSubmissionSource {
+  EXCEL = "Excel",
+  DIRECT = "Direct"
+}
+
 @Entity({ name: "annual_training_plan_requests" })
 export class AnnualTrainingPlanRequest extends BaseModel {
   @Column({ type: "integer", nullable: true })
@@ -34,40 +45,9 @@ export class AnnualTrainingPlanRequest extends BaseModel {
   @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 })
+  @Column({ type: "decimal", precision: 14, scale: 2, nullable: false, default: 0 })
   total_cost: number;
 
-  @Column({ type: "varchar", length: 500, nullable: false, default: "" })
-  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,
@@ -89,65 +69,84 @@ export class AnnualTrainingPlanRequest extends BaseModel {
   workflow_execution_id: string | null;
 
   @Column({ type: "varchar", length: 255, nullable: true })
-  job_competency: string | null;
+  directarate: string | null;
 
-  @Column({ type: "jsonb", nullable: true })
-  name_of_participants: string[] | null;
+  @Column({ type: "varchar", length: 255, nullable: true })
+  plan_name: string | null;
+
+  @Column({ type: "varchar", length: 30, nullable: true, unique: true })
+  plan_number: string | null;
+
+  @Column({ type: "integer", nullable: true })
+  plan_year: number | null;
+
+  @Column({ type: "varchar", length: 1000, nullable: true })
+  source_file_url: string | null;
 
   @Column({ type: "varchar", length: 255, nullable: true })
-  directarate: string | null;
+  source_file_name: string | null;
+
+  @Column({ type: "integer", nullable: false, default: 0 })
+  total_departments: number;
+
+  @Column({ type: "integer", nullable: false, default: 0 })
+  total_courses: number;
+
+  @Column({ type: "integer", nullable: false, default: 0 })
+  total_participants: number;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanImportStatus,
+    nullable: true
+  })
+  import_status: AnnualTrainingPlanImportStatus | null;
+
+  @Column({
+    type: "enum",
+    enum: AnnualTrainingPlanSubmissionSource,
+    nullable: true
+  })
+  submission_source: AnnualTrainingPlanSubmissionSource | 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.total_cost = 0;
     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;
+    this.plan_name = null;
+    this.plan_number = null;
+    this.plan_year = null;
+    this.source_file_url = null;
+    this.source_file_name = null;
+    this.total_departments = 0;
+    this.total_courses = 0;
+    this.total_participants = 0;
+    this.import_status = null;
+    this.submission_source = null;
   }
 }
 

package/src/models/TrainingRoomBookingRequestModel.ts

@@ -120,6 +120,9 @@ export class TrainingRoomBookingRequest extends BaseModel {
   @Column({ type: "varchar", length: 255, nullable: true })
   workflow_execution_id: string | null;
 
+  @Column({ type: "varchar", length: 20, nullable: true })
+  reference_number: string | null;
+
   constructor(
     user_id: number,
     purpose_of_training: string,
@@ -169,6 +172,7 @@ export class TrainingRoomBookingRequest extends BaseModel {
     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;
   }
 }
 

package/src/models/TrainingRoomBookingWorkflowModel.ts

@@ -1,74 +1,81 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum TrainingRoomBookingWorkFlowStatus {
-    COMPLETED = "Completed",
-    NOT_YET_STARTED = "Not Yet Started",
-    PENDING = "Pending",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "training_room_booking_workflows" })
-export class TrainingRoomBookingWorkFlow extends BaseModel {
-    @Column({ type: "int", 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: "int", nullable: true })
-    order: number | null;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    content: string;
-  @Column({ type: "varchar", length: 500, nullable: true })
-  content_ar: string | null;
-
-
-    @Column({ type: "integer", nullable: true })
-    approver_role_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    approver_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    approved_by: number | null;
-
-    @Column({
-        type: "enum",
-        enum: TrainingRoomBookingWorkFlowStatus,
-        default: TrainingRoomBookingWorkFlowStatus.PENDING,
-        nullable: false
-    })
-    status: TrainingRoomBookingWorkFlowStatus;
-  @Column({ type: "varchar", length: 100, nullable: true })
-  status_ar: string | null;
-
-
-    constructor(
-        request_id: number,
-        content: string,
-        status: TrainingRoomBookingWorkFlowStatus,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        order?: number,
-        approver_role_id?: number | null,
-        approver_user_id?: number | null,
-        approved_by?: number | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.content = content;
-        this.status = status;
-        this.order = order || null;
-        this.approver_role_id = approver_role_id || null;
-        this.approver_user_id = approver_user_id || null;
-        this.approved_by = approved_by || null;
-    }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum TrainingRoomBookingWorkFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending",
+    IN_PROGRESS = "In Progress",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "training_room_booking_workflows" })
+export class TrainingRoomBookingWorkFlow extends BaseModel {
+    @Column({ type: "int", 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: "int", nullable: true })
+    order: number | null;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    content: string;
+  @Column({ type: "varchar", length: 500, nullable: true })
+  content_ar: string | null;
+
+
+    @Column({ type: "integer", nullable: true })
+    approver_role_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    approver_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    approved_by: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    section_id: number | null;
+
+    @Column({
+        type: "enum",
+        enum: TrainingRoomBookingWorkFlowStatus,
+        default: TrainingRoomBookingWorkFlowStatus.PENDING,
+        nullable: false
+    })
+    status: TrainingRoomBookingWorkFlowStatus;
+  @Column({ type: "varchar", length: 100, nullable: true })
+  status_ar: string | null;
+
+
+    constructor(
+        request_id: number,
+        content: string,
+        status: TrainingRoomBookingWorkFlowStatus,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        order?: number,
+        approver_role_id?: number | null,
+        approver_user_id?: number | null,
+        approved_by?: number | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.content = content;
+        this.status = status;
+        this.order = order || null;
+        this.approver_role_id = approver_role_id || null;
+        this.approver_user_id = approver_user_id || null;
+        this.approved_by = approved_by || null;
+    }
+}
+

package/src/scripts.ts

@@ -1,10 +1,20 @@
-import { AppDataSource } from './data-source';
-
-AppDataSource.initialize()
-  .then(() => {
-    console.log('✅ Database schema synchronized successfully.');
-  })
-  .catch((error: any) => {
-    console.error('❌ Error during schema synchronization:', error);
-    process.exit(1);
-  });
+import { AppDataSource } from './data-source';
+
+
+
+AppDataSource.initialize()
+
+  .then(() => {
+
+    console.log('✅ Database schema synchronized successfully.');
+
+  })
+
+  .catch((error: any) => {
+
+    console.error('❌ Error during schema synchronization:', error);
+
+    process.exit(1);
+
+  });
+