@platform-modules/civil-aviation-authority 2.3.264 → 2.3.266

package/src/models/AirportEntryPermitModel.ts

@@ -1,276 +1,276 @@
-import { Entity, Column } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-export enum AirportEntryPermitCategory {
-  ISSUING_NEW_PERMIT = "Issuing New Permit",
-  RENEWAL_OF_PERMIT = "Renewal of Permit",
-  AMENDING = "Amending",
-  REPLACING_LOST = "Replacing lost",
-  CANCELLING_AIRPORT_SECURITY_PERMITS = "Cancelling airport security permits"
-}
-
-export enum AirportEntryPermitType {
-  PERMANENT = "Permanent",
-  TEMPORARY = "Temporary"
-}
-
-export enum AirportEntryPermitLocation {
-  MUSCAT = "Muscat",
-  SALALAH = "Salalah",
-  MARMUL = "Marmul",
-  DURUM = "Durum",
-  SOHAR = "Sohar",
-  FUHUD = "Fuhud",
-  MUKHAZINA = "Mukhazina"
-}
-
-export enum AirportEntryPermitArea {
-  PURPLE  = "VIP Building",
-  HEAVENLY  = "Cargo Building (Imports & Exports)",
-  ORANGE  = "Arrivals Hall / Arrivals Building",
-  GREEN  = "Departures Hall / Departures Building",
-  YELLOW  = "Information Center / Control Tower",
-  BLUE  = "Aircraft Parking Area, Aircraft Maintenance Building, Vehicle Repair Workshop, Fire Station, and Fueling Stations",
-  PINK  = "Baggage Sorting Area",
-  GRAY  = "Catering Building",
-  BLACK = "Aircraft Maintenance Building",
-  GOLD = "Gold Building",
-  RED = "All Civil Airports"
-}
-
-export enum AirportEntryPermitStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  IN_PROGRESS = "In Progress"
-}
-
-export enum VisitorOption {
-  VISA_TYPE = "Visa Type",
-  VISA_NO = "Visa No",
-  DATE_EXPIRY_VISA = "Date Expiry Visa"
-}
-
-export enum AdditionalServices {
-  LAPTOP_TABLET = "Laptop / Tablet",
-  BOARDING_THE_AIRCRAFT = "Boarding the Aircraft",
-  EMPLOYEE_ASSISTING_PEOPLE_WITH_SPECIAL_NEEDS = "Employee Assisting People with Special Needs"
-}
-
-@Entity({ name: 'airport_entry_permits' })
-export class AirportEntryPermit extends BaseModel {
-  // Workflow fields
-  @Column({ type: 'int', nullable: true })
-  req_user_department_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  req_user_section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'varchar', length: 20, nullable: true })
-  service_type: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-
-  @Column({
-    type: "enum",
-    enum: AirportEntryPermitStatus,
-    default: AirportEntryPermitStatus.PENDING,
-    nullable: false,
-  })
-  status: AirportEntryPermitStatus;
-
-  @Column({ nullable: false })
-  user_id: number;
-
-  // Request ID - Auto generated
-  @Column({ type: 'varchar', length: 50, nullable: true, unique: true })
-  request_id: string | null;
-
-  // User fields from requirements
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  name_full_family_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  nationality: string;
-
-  @Column({ type: 'date', nullable: false })
-  dob: Date;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  place: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: false })
-  passport_id_card_no: string;
-
-  @Column({
-    type: "enum",
-    enum: AirportEntryPermitCategory,
-    nullable: false,
-  })
-  category_of_permit: AirportEntryPermitCategory;
-
-  @Column({ type: 'date', nullable: false })
-  date_of_submission: Date;
-
-  @Column({ type: 'varchar', length: 20, nullable: false })
-  phone_number: string;
-
-  @Column({
-    type: "enum",
-    enum: AirportEntryPermitLocation,
-    nullable: false,
-  })
-  location: AirportEntryPermitLocation;
-
-  @Column({
-    type: "enum",
-    enum: AirportEntryPermitType,
-    nullable: false,
-  })
-  type_of_permit: AirportEntryPermitType;
-
-  @Column({ type: 'date', nullable: true })
-  temporary_start_time: Date | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  temporary_duration: string | null;
-
-  @Column({ type: 'jsonb', nullable: true })
-  permission_to_required_areas: Array<{ permit: string; text: string }>;
-
-  @Column({ type: 'text', nullable: true })
-  attachment_url: string | null;
-
-  @Column({ type: 'text', nullable: false })
-  details: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  occupation_staff: string;
-
-  // Visitor fields (optional)
-  @Column({ type: 'text', array: true, nullable: true })
-  for_visitor: VisitorOption[] | null;
-
-  // Additional Services (optional)
-  @Column({ type: 'text', array: true, nullable: true })
-  additional_services: AdditionalServices[] | null;
-
-  // Acknowledgement fields (from form checkboxes)
-  @Column({ type: 'boolean', default: false })
-  acknowledge_security_policies: boolean;
-
-  @Column({ type: 'boolean', default: false })
-  acknowledge_disciplinary_action: boolean;
-
-  // Consent fields (for approvers - not in create form)
-  @Column({ type: 'boolean', default: false })
-  consent_approve_to_issue_permit: boolean;
-
-  @Column({ type: 'boolean', default: false })
-  consent_do_not_approve_to_issue_permit: boolean;
-
-  @Column({ type: 'text', nullable: true })
-  consent_justification: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  requested_by: string;
-
-  @Column({ type: 'date', nullable: true })
-  expiration_date: Date | null;
-
-  @Column({ type: 'timestamptz', nullable: true })
-  end_date: Date | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  device_serial_number: string | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  new_permit_issuance_file: string | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  forms_attachment_file: string | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  permit_renewal_file: string | null;
-
-  constructor(
-    name_full_family_name: string,
-    nationality: string,
-    dob: Date,
-    place: string,
-    passport_id_card_no: string,
-    category_of_permit: AirportEntryPermitCategory,
-    date_of_submission: Date,
-    phone_number: string,
-    location: AirportEntryPermitLocation,
-    type_of_permit: AirportEntryPermitType,
-    permission_to_required_areas: Array<{ permit: string; text: string }>,
-    details: string,
-    occupation_staff: string,
-    requested_by: string,
-    user_id: number,
-    status: AirportEntryPermitStatus = AirportEntryPermitStatus.PENDING,
-    service_id?: number | null,
-    sub_service_id?: number | null,
-    service_type?: string | null,
-    workflow_execution_id?: string | null,
-    req_user_department_id?: number | null,
-    req_user_section_id?: number | null,
-    attachment_url?: string | null,
-    temporary_start_time?: Date | null,
-    temporary_duration?: string | null,
-    for_visitor?: VisitorOption[] | null,
-    additional_services?: AdditionalServices[] | null,
-    acknowledge_security_policies: boolean = false,
-    acknowledge_disciplinary_action: boolean = false,
-    consent_approve_to_issue_permit: boolean = false,
-    consent_do_not_approve_to_issue_permit: boolean = false,
-    consent_justification?: string | null,
-    request_id?: string | null,
-    expiration_date?: Date | null
-  ) {
-    super();
-    this.name_full_family_name = name_full_family_name;
-    this.nationality = nationality;
-    this.dob = dob;
-    this.place = place;
-    this.passport_id_card_no = passport_id_card_no;
-    this.category_of_permit = category_of_permit;
-    this.date_of_submission = date_of_submission;
-    this.phone_number = phone_number;
-    this.location = location;
-    this.type_of_permit = type_of_permit;
-    this.permission_to_required_areas = permission_to_required_areas;
-    this.details = details;
-    this.occupation_staff = occupation_staff;
-    this.requested_by = requested_by;
-    this.user_id = user_id;
-    this.status = status;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.service_type = service_type ?? null;
-    this.workflow_execution_id = workflow_execution_id ?? null;
-    this.req_user_department_id = req_user_department_id ?? null;
-    this.req_user_section_id = req_user_section_id ?? null;
-    this.attachment_url = attachment_url ?? null;
-    this.temporary_start_time = temporary_start_time ?? null;
-    this.temporary_duration = temporary_duration ?? null;
-    this.for_visitor = for_visitor ?? null;
-    this.additional_services = additional_services ?? null;
-    this.acknowledge_security_policies = acknowledge_security_policies;
-    this.acknowledge_disciplinary_action = acknowledge_disciplinary_action;
-    this.consent_approve_to_issue_permit = consent_approve_to_issue_permit;
-    this.consent_do_not_approve_to_issue_permit = consent_do_not_approve_to_issue_permit;
-    this.consent_justification = consent_justification ?? null;
-    this.request_id = request_id ?? null;
-    this.expiration_date = expiration_date ?? null;
-  }
-}
-
+import { Entity, Column } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+export enum AirportEntryPermitCategory {
+  ISSUING_NEW_PERMIT = "Issuing New Permit",
+  RENEWAL_OF_PERMIT = "Renewal of Permit",
+  AMENDING = "Amending",
+  REPLACING_LOST = "Replacing lost",
+  CANCELLING_AIRPORT_SECURITY_PERMITS = "Cancelling airport security permits"
+}
+
+export enum AirportEntryPermitType {
+  PERMANENT = "Permanent",
+  TEMPORARY = "Temporary"
+}
+
+export enum AirportEntryPermitLocation {
+  MUSCAT = "Muscat",
+  SALALAH = "Salalah",
+  MARMUL = "Marmul",
+  DURUM = "Durum",
+  SOHAR = "Sohar",
+  FUHUD = "Fuhud",
+  MUKHAZINA = "Mukhazina"
+}
+
+export enum AirportEntryPermitArea {
+  PURPLE  = "VIP Building",
+  HEAVENLY  = "Cargo Building (Imports & Exports)",
+  ORANGE  = "Arrivals Hall / Arrivals Building",
+  GREEN  = "Departures Hall / Departures Building",
+  YELLOW  = "Information Center / Control Tower",
+  BLUE  = "Aircraft Parking Area, Aircraft Maintenance Building, Vehicle Repair Workshop, Fire Station, and Fueling Stations",
+  PINK  = "Baggage Sorting Area",
+  GRAY  = "Catering Building",
+  BLACK = "Aircraft Maintenance Building",
+  GOLD = "Gold Building",
+  RED = "All Civil Airports"
+}
+
+export enum AirportEntryPermitStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  IN_PROGRESS = "In Progress"
+}
+
+export enum VisitorOption {
+  VISA_TYPE = "Visa Type",
+  VISA_NO = "Visa No",
+  DATE_EXPIRY_VISA = "Date Expiry Visa"
+}
+
+export enum AdditionalServices {
+  LAPTOP_TABLET = "Laptop / Tablet",
+  BOARDING_THE_AIRCRAFT = "Boarding the Aircraft",
+  EMPLOYEE_ASSISTING_PEOPLE_WITH_SPECIAL_NEEDS = "Employee Assisting People with Special Needs"
+}
+
+@Entity({ name: 'airport_entry_permits' })
+export class AirportEntryPermit extends BaseModel {
+  // Workflow fields
+  @Column({ type: 'int', nullable: true })
+  req_user_department_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  req_user_section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'varchar', length: 20, nullable: true })
+  service_type: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+
+  @Column({
+    type: "enum",
+    enum: AirportEntryPermitStatus,
+    default: AirportEntryPermitStatus.PENDING,
+    nullable: false,
+  })
+  status: AirportEntryPermitStatus;
+
+  @Column({ nullable: false })
+  user_id: number;
+
+  // Request ID - Auto generated
+  @Column({ type: 'varchar', length: 50, nullable: true, unique: true })
+  request_id: string | null;
+
+  // User fields from requirements
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  name_full_family_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  nationality: string;
+
+  @Column({ type: 'date', nullable: false })
+  dob: Date;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  place: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: false })
+  passport_id_card_no: string;
+
+  @Column({
+    type: "enum",
+    enum: AirportEntryPermitCategory,
+    nullable: false,
+  })
+  category_of_permit: AirportEntryPermitCategory;
+
+  @Column({ type: 'date', nullable: false })
+  date_of_submission: Date;
+
+  @Column({ type: 'varchar', length: 20, nullable: false })
+  phone_number: string;
+
+  @Column({
+    type: "enum",
+    enum: AirportEntryPermitLocation,
+    nullable: false,
+  })
+  location: AirportEntryPermitLocation;
+
+  @Column({
+    type: "enum",
+    enum: AirportEntryPermitType,
+    nullable: false,
+  })
+  type_of_permit: AirportEntryPermitType;
+
+  @Column({ type: 'date', nullable: true })
+  temporary_start_time: Date | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  temporary_duration: string | null;
+
+  @Column({ type: 'jsonb', nullable: true })
+  permission_to_required_areas: Array<{ permit: string; text: string }>;
+
+  @Column({ type: 'text', nullable: true })
+  attachment_url: string | null;
+
+  @Column({ type: 'text', nullable: false })
+  details: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  occupation_staff: string;
+
+  // Visitor fields (optional)
+  @Column({ type: 'text', array: true, nullable: true })
+  for_visitor: VisitorOption[] | null;
+
+  // Additional Services (optional)
+  @Column({ type: 'text', array: true, nullable: true })
+  additional_services: AdditionalServices[] | null;
+
+  // Acknowledgement fields (from form checkboxes)
+  @Column({ type: 'boolean', default: false })
+  acknowledge_security_policies: boolean;
+
+  @Column({ type: 'boolean', default: false })
+  acknowledge_disciplinary_action: boolean;
+
+  // Consent fields (for approvers - not in create form)
+  @Column({ type: 'boolean', default: false })
+  consent_approve_to_issue_permit: boolean;
+
+  @Column({ type: 'boolean', default: false })
+  consent_do_not_approve_to_issue_permit: boolean;
+
+  @Column({ type: 'text', nullable: true })
+  consent_justification: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  requested_by: string;
+
+  @Column({ type: 'date', nullable: true })
+  expiration_date: Date | null;
+
+  @Column({ type: 'timestamptz', nullable: true })
+  end_date: Date | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  device_serial_number: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  new_permit_issuance_file: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  forms_attachment_file: string | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  permit_renewal_file: string | null;
+
+  constructor(
+    name_full_family_name: string,
+    nationality: string,
+    dob: Date,
+    place: string,
+    passport_id_card_no: string,
+    category_of_permit: AirportEntryPermitCategory,
+    date_of_submission: Date,
+    phone_number: string,
+    location: AirportEntryPermitLocation,
+    type_of_permit: AirportEntryPermitType,
+    permission_to_required_areas: Array<{ permit: string; text: string }>,
+    details: string,
+    occupation_staff: string,
+    requested_by: string,
+    user_id: number,
+    status: AirportEntryPermitStatus = AirportEntryPermitStatus.PENDING,
+    service_id?: number | null,
+    sub_service_id?: number | null,
+    service_type?: string | null,
+    workflow_execution_id?: string | null,
+    req_user_department_id?: number | null,
+    req_user_section_id?: number | null,
+    attachment_url?: string | null,
+    temporary_start_time?: Date | null,
+    temporary_duration?: string | null,
+    for_visitor?: VisitorOption[] | null,
+    additional_services?: AdditionalServices[] | null,
+    acknowledge_security_policies: boolean = false,
+    acknowledge_disciplinary_action: boolean = false,
+    consent_approve_to_issue_permit: boolean = false,
+    consent_do_not_approve_to_issue_permit: boolean = false,
+    consent_justification?: string | null,
+    request_id?: string | null,
+    expiration_date?: Date | null
+  ) {
+    super();
+    this.name_full_family_name = name_full_family_name;
+    this.nationality = nationality;
+    this.dob = dob;
+    this.place = place;
+    this.passport_id_card_no = passport_id_card_no;
+    this.category_of_permit = category_of_permit;
+    this.date_of_submission = date_of_submission;
+    this.phone_number = phone_number;
+    this.location = location;
+    this.type_of_permit = type_of_permit;
+    this.permission_to_required_areas = permission_to_required_areas;
+    this.details = details;
+    this.occupation_staff = occupation_staff;
+    this.requested_by = requested_by;
+    this.user_id = user_id;
+    this.status = status;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.service_type = service_type ?? null;
+    this.workflow_execution_id = workflow_execution_id ?? null;
+    this.req_user_department_id = req_user_department_id ?? null;
+    this.req_user_section_id = req_user_section_id ?? null;
+    this.attachment_url = attachment_url ?? null;
+    this.temporary_start_time = temporary_start_time ?? null;
+    this.temporary_duration = temporary_duration ?? null;
+    this.for_visitor = for_visitor ?? null;
+    this.additional_services = additional_services ?? null;
+    this.acknowledge_security_policies = acknowledge_security_policies;
+    this.acknowledge_disciplinary_action = acknowledge_disciplinary_action;
+    this.consent_approve_to_issue_permit = consent_approve_to_issue_permit;
+    this.consent_do_not_approve_to_issue_permit = consent_do_not_approve_to_issue_permit;
+    this.consent_justification = consent_justification ?? null;
+    this.request_id = request_id ?? null;
+    this.expiration_date = expiration_date ?? null;
+  }
+}
+

package/src/models/AnnualIncrementRequestEmployeeModel.ts

@@ -34,6 +34,9 @@ export class AnnualIncrementRequestEmployee extends BaseModel {
     @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
     new_basic_salary: number | null;
 
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    annual_periodic_allowance: number | null;
+
     @ManyToOne(() => AnnualIncrementRequest, { onDelete: "CASCADE" })
     @JoinColumn({ name: "request_id", referencedColumnName: "id" })
     request: AnnualIncrementRequest;
@@ -48,7 +51,8 @@ export class AnnualIncrementRequestEmployee extends BaseModel {
         sub_service_id?: number | null,
         current_basic_salary?: number | null,
         increment_percentage?: number | null,
-        new_basic_salary?: number | null
+        new_basic_salary?: number | null,
+        annual_periodic_allowance?: number | null
     ) {
         super();
         this.request_id = request_id;
@@ -61,5 +65,6 @@ export class AnnualIncrementRequestEmployee extends BaseModel {
         this.current_basic_salary = current_basic_salary ?? null;
         this.increment_percentage = increment_percentage ?? null;
         this.new_basic_salary = new_basic_salary ?? null;
+        this.annual_periodic_allowance = annual_periodic_allowance ?? null;
     }
 }

package/src/models/AnnualIncrementRequestModel.ts

@@ -73,6 +73,9 @@ export class AnnualIncrementRequest extends BaseModel {
     @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
     new_basic_salary: number | null;
 
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    annual_periodic_allowance: number | null;
+
     constructor(
         user_id: number,
         status: AnnualIncrementRequestStatus = AnnualIncrementRequestStatus.PENDING,
@@ -92,7 +95,8 @@ export class AnnualIncrementRequest extends BaseModel {
         effective_date?: Date,
         current_basic_salary?: number | null,
         increment_percentage?: number | null,
-        new_basic_salary?: number | null
+        new_basic_salary?: number | null,
+        annual_periodic_allowance?: number | null
     ) {
         super();
         this.user_id = user_id;
@@ -115,5 +119,6 @@ export class AnnualIncrementRequest extends BaseModel {
         this.current_basic_salary = current_basic_salary || null;
         this.increment_percentage = increment_percentage || null;
         this.new_basic_salary = new_basic_salary || null;
+        this.annual_periodic_allowance = annual_periodic_allowance || null;
     }
 }