@platform-modules/civil-aviation-authority 2.3.4 → 2.3.5

package/src/models/DutyMissionEmployeeDetailsModel.ts

@@ -1,72 +0,0 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { DutyMissionRequests } from './DutyMissionRequestModel';
-
-@Entity({ name: 'duty_mission_employee_details' })
-export class DutyMissionEmployeeDetails extends BaseModel {
-
-  @Column({ type: 'int', nullable: false })
-  request_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  employee_id: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  employee_name: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  department: string | null;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  grade: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  position: string | null;
-
-  @Column({ type: 'decimal', precision: 5, scale: 2, nullable: true, default: 100 })
-  percentage: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  allowance_per_day: number | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  total_allowance: number | null;
-
-  @ManyToOne(() => DutyMissionRequests, { onDelete: 'CASCADE' })
-  @JoinColumn({ name: 'request_id', referencedColumnName: 'id' })
-  request: DutyMissionRequests;
-
-  constructor(
-    request_id: number,
-    employee_id: string,
-    employee_name: string,
-    service_id?: number | null,
-    sub_service_id?: number | null,
-    department?: string | null,
-    grade?: string | null,
-    position?: string | null,
-    percentage?: number | null,
-    allowance_per_day?: number | null,
-    total_allowance?: number | null
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.employee_id = employee_id;
-    this.employee_name = employee_name;
-    this.department = department ?? null;
-    this.grade = grade ?? null;
-    this.position = position ?? null;
-    this.percentage = percentage ?? 100;
-    this.allowance_per_day = allowance_per_day ?? null;
-    this.total_allowance = total_allowance ?? null;
-  }
-}
-

package/src/models/DutyMissionRequestModel.ts

@@ -1,239 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum TripType {
-  ANNUAL = "Annual",
-  PLANNED = "Planned",
-  UNPLANNED = "Unplanned"
-}
-
-export enum ChooseType {
-  INSIDE = "Inside",
-  OUTSIDE = "Outside"
-}
-
-export enum MissionSponsoredBy {
-  CAA = "CAA",
-  LISTED = "Listed Companies",
-  NON_LISTED = "Non-listed Companies"
-}
-
-export enum AirTicketRequired {
-  YES = "Yes",
-  NO = "No",
-  CASH_COMPONENT = "Cash Component"
-}
-
-export enum VehicleRequired {
-  YES = "Yes",
-  NO = "No"
-}
-
-export enum DutyMissionStatus {
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'duty_mission_requests' })
-export class DutyMissionRequests extends BaseModel {
-
-  // Common columns from logistics_request table
-  @Column({ type: 'int', nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ nullable: true })
-  service_id: number;
-
-  @Column({ nullable: true })
-  sub_service_id: number;
-
-  @Column({ nullable: false })
-  user_id: number;
-
-  @Column({
-    type: "enum",
-    enum: DutyMissionStatus,
-    default: DutyMissionStatus.PENDING,
-    nullable: false,
-  })
-  status: DutyMissionStatus;
-
-  @Column({ type: "varchar", nullable: true })
-  workflow_execution_id: string | null;
-
-  // New columns
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  request_id: string | null; // Auto generated
-
-  @Column({
-    type: "enum",
-    enum: TripType,
-    nullable: false,
-  })
-  trip_type: TripType;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  mission_id: string | null;
-
-  @Column({
-    type: "enum",
-    enum: ChooseType,
-    nullable: false,
-  })
-  choose_type: ChooseType;
-
-  @Column({
-    type: "enum",
-    enum: MissionSponsoredBy,
-    nullable: false,
-  })
-  mission_sponsored_by: MissionSponsoredBy;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  if_sponsored: string | null; // Company name if sponsored
-
-  @Column({ type: 'text', nullable: false })
-  mission_purpose: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  mission_number: string;
-
-  @Column({ type: "date", nullable: false })
-  mission_start_date: Date;
-
-  @Column({ type: "date", nullable: false })
-  mission_end_date: Date;
-
-  @Column({ type: 'int', nullable: true })
-  mission_days: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  travelling_area_from: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  travelling_area_to: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  distance: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  from_country: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  to_country: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  travel_place: string;
-
-  @Column({ type: "date", nullable: false })
-  travel_start_date: Date;
-
-  @Column({ type: "date", nullable: false })
-  travel_return_date: Date;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  allowance_percentage: string | null; // Inside: 0%, 50%, 100%; Outside: 0%, 75%, 100%
-
-  @Column({
-    type: "enum",
-    enum: AirTicketRequired,
-    nullable: true,
-  })
-  air_ticket_required: AirTicketRequired | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  passport_no: string;
-
-  @Column({ type: "date", nullable: true })
-  passport_issue_date: Date | null;
-
-  @Column({ type: "date", nullable: true })
-  passport_expiry_date: Date | null;
-
-  @Column({
-    type: "enum",
-    enum: VehicleRequired,
-    nullable: true,
-  })
-  vehicle_required: VehicleRequired | null;
-
-  @Column({ type: 'text', nullable: true })
-  remarks: string | null;
-
-  constructor(
-    req_user_department_id: number | null,
-    req_user_section_id: number | null,
-    service_id: number,
-    sub_service_id: number,
-    user_id: number,
-    trip_type: TripType,
-    choose_type: ChooseType,
-    mission_sponsored_by: MissionSponsoredBy,
-    mission_purpose: string,
-    mission_number: string,
-    mission_start_date: Date,
-    mission_end_date: Date,
-    travelling_area_from: string,
-    travelling_area_to: string,
-    from_country: string,
-    to_country: string,
-    travel_place: string,
-    travel_start_date: Date,
-    travel_return_date: Date,
-    passport_no: string,
-    status: DutyMissionStatus,
-    request_id?: string | null,
-    mission_id?: string | null,
-    mission_days?: number | null,
-    distance?: string | null,
-    if_sponsored?: string | null,
-    allowance_percentage?: string | null,
-    air_ticket_required?: AirTicketRequired | null,
-    passport_issue_date?: Date | null,
-    passport_expiry_date?: Date | null,
-    vehicle_required?: VehicleRequired | null,
-    remarks?: string | null,
-    workflow_execution_id?: string | null,
-  ) {
-    super();
-    this.req_user_department_id = req_user_department_id ?? null;
-    this.req_user_section_id = req_user_section_id ?? null;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.user_id = user_id;
-    this.trip_type = trip_type;
-    this.choose_type = choose_type;
-    this.mission_sponsored_by = mission_sponsored_by;
-    this.mission_purpose = mission_purpose;
-    this.mission_number = mission_number;
-    this.mission_start_date = mission_start_date;
-    this.mission_end_date = mission_end_date;
-    this.travelling_area_from = travelling_area_from;
-    this.travelling_area_to = travelling_area_to;
-    this.from_country = from_country;
-    this.to_country = to_country;
-    this.travel_place = travel_place;
-    this.travel_start_date = travel_start_date;
-    this.travel_return_date = travel_return_date;
-    this.passport_no = passport_no;
-    this.status = status;
-    this.request_id = request_id ?? null;
-    this.mission_id = mission_id ?? null;
-    this.mission_days = mission_days ?? null;
-    this.distance = distance ?? null;
-    this.if_sponsored = if_sponsored ?? null;
-    this.allowance_percentage = allowance_percentage ?? null;
-    this.air_ticket_required = air_ticket_required ?? null;
-    this.passport_issue_date = passport_issue_date ?? null;
-    this.passport_expiry_date = passport_expiry_date ?? null;
-    this.vehicle_required = vehicle_required ?? null;
-    this.remarks = remarks ?? null;
-    this.workflow_execution_id = workflow_execution_id ?? null;
-  }
-}

package/src/models/DutyMissionWorkflowModel.ts

@@ -1,62 +0,0 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum DutyMissionWorkFlowStatus {
-    COMPLETED = "Completed",
-    NOT_YET_STARTED = "Not Yet Started",
-    PENDING = "Pending"
-}
-
-//This model is used to store the duty mission workflow status and activity logs
-@Entity({ name: 'duty_mission_workflows' })
-export class DutyMissionWorkFlow 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: 500, nullable: false })
-  content: string;
-
-  @Column({ type: 'enum', enum: DutyMissionWorkFlowStatus, default: DutyMissionWorkFlowStatus.NOT_YET_STARTED, nullable: false })
-  status: DutyMissionWorkFlowStatus;
-
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  constructor(
-    request_id: number, 
-    content: string, 
-    status: DutyMissionWorkFlowStatus,
-    service_id?: number,
-    sub_service_id?: number,
-    user_id?: number,
-    role_id?: number,
-    department_id?: number,
-    section_id?: number
-  ) {
-    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.user_id = user_id || null;
-    this.role_id = role_id || null;
-    this.department_id = department_id || null;
-    this.section_id = section_id || null;
-  }
-}