@platform-modules/foreign-ministry 1.3.265 → 1.3.266

package/src/models/AnnualTravelTicketPriceConfigurationItemModel.ts

@@ -0,0 +1,36 @@
+import { Column, Entity, JoinColumn, ManyToOne, Unique } from 'typeorm';
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfiguration } from './AnnualTravelTicketPriceConfigurationModel';
+
+/**
+ * Individual price slab within an annual travel ticket pricing configuration.
+ * age_from is inclusive and age_to is exclusive to allow adjacent ranges.
+ */
+@Entity({ name: 'annual_travel_ticket_price_configuration_items' })
+@Unique(['configuration_id', 'ticket_class', 'age_from', 'age_to'])
+export class AnnualTravelTicketPriceConfigurationItem extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  configuration_id: number;
+
+  @ManyToOne(() => AnnualTravelTicketPriceConfiguration, (configuration) => configuration.price_slabs, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'configuration_id' })
+  configuration: AnnualTravelTicketPriceConfiguration;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  ticket_class: string | null;
+
+  @Column({ type: 'int', nullable: false })
+  age_from: number;
+
+  @Column({ type: 'int', nullable: false })
+  age_to: number;
+
+  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: false })
+  price: number | string;
+
+  @Column({ type: 'varchar', length: 10, nullable: true, default: 'OMR' })
+  currency_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  notes: string | null;
+}

package/src/models/AnnualTravelTicketPriceConfigurationModel.ts

@@ -0,0 +1,35 @@
+import { Column, Entity, OneToMany, Unique } from 'typeorm';
+import { BaseModel } from './BaseModel';
+import { AnnualTravelTicketPriceConfigurationItem } from './AnnualTravelTicketPriceConfigurationItemModel';
+
+/**
+ * Admin configuration for annual travel ticket pricing.
+ * One record per year (and optional service/sub-service pair), with multiple age slabs.
+ */
+@Entity({ name: 'annual_travel_ticket_price_configurations' })
+@Unique(['service_id', 'sub_service_id', 'ticket_year'])
+export class AnnualTravelTicketPriceConfiguration extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  service_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  sub_service_id: number | null;
+
+  @Column({ type: 'int', nullable: false })
+  ticket_year: number;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  configuration_name: string | null;
+
+  @Column({ type: 'varchar', length: 10, nullable: true, default: 'OMR' })
+  currency_code: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_active: boolean;
+
+  @OneToMany(() => AnnualTravelTicketPriceConfigurationItem, (item) => item.configuration)
+  price_slabs?: AnnualTravelTicketPriceConfigurationItem[];
+}

package/src/models/AnnualTravelTicketRequestModel.ts

@@ -1,15 +1,23 @@
-import { Column, Entity } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-export enum AnnualTravelTicketPermanentResidence {
-  SALALAH = 'Salalah',
-  MUSANDAM = 'Musandam',
-}
-
-/** Aligns with mission bank account request lifecycle for shared workflow UI. */
-export enum AnnualTravelTicketRequestStatus {
-  PENDING = 'Pending',
-  ASSIGNED = 'Assigned',
+import { Column, Entity } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+export enum AnnualTravelTicketPermanentResidence {
+  SALALAH = 'Salalah',
+  MUSANDAM = 'Musandam',
+}
+
+export interface AnnualTravelTicketFamilyDetail {
+  person_name: string;
+  relation: string;
+  age: number;
+  age_category: string;
+  price: number | string;
+}
+
+/** Aligns with mission bank account request lifecycle for shared workflow UI. */
+export enum AnnualTravelTicketRequestStatus {
+  PENDING = 'Pending',
+  ASSIGNED = 'Assigned',
   IN_PROGRESS = 'In Progress',
   APPROVED = 'Approved',
   REJECTED = 'Rejected',
@@ -39,44 +47,28 @@ export class AnnualTravelTicketRequests extends BaseModel {
   @Column({ type: 'varchar', length: 120, nullable: false })
   civil_id_or_passport_number: string;
 
-  @Column({ type: 'enum', enum: AnnualTravelTicketPermanentResidence, nullable: false })
-  permanent_residence: AnnualTravelTicketPermanentResidence;
-
-  /** Free-text family context (dependents covered by the request). */
-  @Column({ type: 'text', nullable: true })
-  family_details: string | null;
-
-  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
-  children_ticket_price: string | number | null;
-
-  @Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
-  employee_spouse_ticket_price: string | number | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  bank_account_number: string;
-
-  @Column({ type: 'text', nullable: false })
-  travel_details: string;
-
-  /** Calendar year this entitlement applies to (one ticket per person per year). */
-  @Column({ type: 'int', nullable: false })
-  ticket_entitlement_year: number;
-
-  /** Optional structured travelers (e.g. children) for age rules; JSON array. */
-  @Column({ type: 'jsonb', nullable: true })
-  children_travelers_json: Record<string, unknown>[] | null;
-
-  /** Client confirms dependents match HR/profile before submit. */
-  @Column({ type: 'boolean', default: false, nullable: false })
-  profile_children_synced_with_profile: boolean;
-
-  /** Notes on unused ticket carry-forward (max 7 years; children until age 21). */
-  @Column({ type: 'text', nullable: true })
-  carry_forward_notes: string | null;
-
-  @Column({
-    type: 'enum',
-    enum: AnnualTravelTicketRequestStatus,
+  @Column({ type: 'enum', enum: AnnualTravelTicketPermanentResidence, nullable: false })
+  permanent_residence: AnnualTravelTicketPermanentResidence;
+
+  /** Traveler list with person name, relation, age, age category, and price. */
+  @Column({ type: 'jsonb', nullable: true })
+  family_details: AnnualTravelTicketFamilyDetail[] | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  bank_account_number: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_from: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_to: string;
+
+  @Column({ type: 'date', nullable: false })
+  date_of_travel: string;
+
+  @Column({
+    type: 'enum',
+    enum: AnnualTravelTicketRequestStatus,
     default: AnnualTravelTicketRequestStatus.PENDING,
     nullable: false,
   })

package/src/models/DiplomaticAcademyRequestModel.ts

@@ -1,80 +1,80 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum DiplomaticAcademyStatus {
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'diplomatic_academy_requests' })
-export class DiplomaticAcademyRequests extends BaseModel {
-
-  // Common columns
-  @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: 'int', nullable: false })
-  user_id: number;
-
-  // Diplomatic Academy specific columns
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  course_name: string;
-
-  @Column({ type: 'jsonb', nullable: true })
-  cost_details: {
-    material_price?: number;
-    transportation?: number;
-    accommodation?: number;
-    allowances?: number;
-    food?: number;
-    present?: number;
-  } | null;
-
-  @Column({ type: 'int', nullable: false })
-  estimated_participants: number;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_from: Date;
-
-  @Column({ type: 'date', nullable: false })
-  timeline_date_to: Date;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_from: string | null;
-
-  @Column({ type: 'time', nullable: true })
-  timeline_time_to: string | null;
-
-  @Column({ type: 'jsonb', nullable: false })
-  participants_details: Array<{
-    full_name: string;
-    passport: string;
-    age: number;
-    qualifications: string;
-    experience: string;
-    institution: string;
-  }>;
-
-  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
-  status: DiplomaticAcademyStatus;
-
-  @Column({ type: 'int', nullable: true })
-  course_id: number | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-  
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DiplomaticAcademyStatus {
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'diplomatic_academy_requests' })
+export class DiplomaticAcademyRequests extends BaseModel {
+
+  // Common columns
+  @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: 'int', nullable: false })
+  user_id: number;
+
+  // Diplomatic Academy specific columns
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  course_name: string;
+
+  @Column({ type: 'jsonb', nullable: true })
+  cost_details: {
+    material_price?: number;
+    transportation?: number;
+    accommodation?: number;
+    allowances?: number;
+    food?: number;
+    present?: number;
+  } | null;
+
+  @Column({ type: 'int', nullable: false })
+  estimated_participants: number;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_from: Date;
+
+  @Column({ type: 'date', nullable: false })
+  timeline_date_to: Date;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_from: string | null;
+
+  @Column({ type: 'time', nullable: true })
+  timeline_time_to: string | null;
+
+  @Column({ type: 'jsonb', nullable: false })
+  participants_details: Array<{
+    full_name: string;
+    passport: string;
+    age: number;
+    qualifications: string;
+    experience: string;
+    institution: string;
+  }>;
+
+  @Column({ type: 'enum', enum: DiplomaticAcademyStatus, default: DiplomaticAcademyStatus.PENDING, nullable: false })
+  status: DiplomaticAcademyStatus;
+
+  @Column({ type: 'int', nullable: true })
+  course_id: number | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+  
+}

package/src/models/DocumentationFileModel.ts

@@ -1,40 +1,40 @@
-import { Column, Entity } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'documentation_files' })
-export class DocumentationFile extends BaseModel {
-  @Column({ type: 'int', nullable: true })
-  project_id: number | null;
-
-  @Column({ type: 'int' })
-  folder_id: number;
-
-  @Column({ type: 'text', nullable: true })
-  file_path: string;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  filename: string;
-
-  @Column({ type: 'bigint', nullable: true })
-  filesize: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  filetype: string;
-
-  constructor(
-    project_id?: number | null,
-    folder_id?: number,
-    file_path?: string,
-    filename?: string,
-    filesize?: number,
-    filetype?: string
-  ) {
-    super();
-    this.project_id = project_id ?? null;
-    this.folder_id = folder_id ?? 0;
-    this.file_path = file_path ?? '';
-    this.filename = filename ?? '';
-    this.filesize = filesize ?? 0;
-    this.filetype = filetype ?? '';
-  }
-}
+import { Column, Entity } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'documentation_files' })
+export class DocumentationFile extends BaseModel {
+  @Column({ type: 'int', nullable: true })
+  project_id: number | null;
+
+  @Column({ type: 'int' })
+  folder_id: number;
+
+  @Column({ type: 'text', nullable: true })
+  file_path: string;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  filename: string;
+
+  @Column({ type: 'bigint', nullable: true })
+  filesize: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  filetype: string;
+
+  constructor(
+    project_id?: number | null,
+    folder_id?: number,
+    file_path?: string,
+    filename?: string,
+    filesize?: number,
+    filetype?: string
+  ) {
+    super();
+    this.project_id = project_id ?? null;
+    this.folder_id = folder_id ?? 0;
+    this.file_path = file_path ?? '';
+    this.filename = filename ?? '';
+    this.filesize = filesize ?? 0;
+    this.filetype = filetype ?? '';
+  }
+}

package/src/models/FinancialWorkFlowModel.ts

@@ -33,15 +33,15 @@ export class FinancialWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: true })
   approved_by_role_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  step_order: number;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  action: string | null;
-
-  @ManyToOne(() => FinancialRequests, fr => fr.workflows)
-  @JoinColumn({ name: 'financial_request_id' })
-  financialRequest?: FinancialRequests;
+  @Column({ type: 'int', nullable: true })
+  step_order: number;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  action: string | null;
+
+  @ManyToOne(() => FinancialRequests, fr => fr.workflows)
+  @JoinColumn({ name: 'financial_request_id' })
+  financialRequest?: FinancialRequests;
 
   constructor(
     financial_request_id: number,
@@ -55,10 +55,10 @@ export class FinancialWorkFlow extends BaseModel {
     this.status = status;
     this.approved_by_user_id = approved_by_user_id;
     this.content = content;
-    this.financial_approval_id = 0;
-    this.activity_date = new Date();
-    this.step_order = step_order;
-    this.action = null;
-  }
-}
+    this.financial_approval_id = 0;
+    this.activity_date = new Date();
+    this.step_order = step_order;
+    this.action = null;
+  }
+}
 

package/src/models/GatePassVisitorsModel.ts

@@ -85,10 +85,10 @@ export class GatePassVisitors extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   visiting_person_in_department: string | null; // زائر في القسم (Visiting Person in Department)
 
-  @Column({ type: 'int', nullable: true, unique: true })
-  serial_number: number | null;
-
-  // QR Code for Gate Pass
+  @Column({ type: 'int', nullable: true, unique: true })
+  serial_number: number | null;
+
+  // QR Code for Gate Pass
   @Column({ type: 'text', nullable: true })
   qr_code_url: string | null; // QR code URL for this visitor (data URL can be 6000+ characters)
 
@@ -134,9 +134,9 @@ export class GatePassVisitors extends BaseModel {
     this.visitor_email_address = visitor_email_address;
     this.visitor_mobile_number = visitor_mobile_number;
     this.visitor_photo_url = visitor_photo_url;
-    this.visitor_photo_file_name = visitor_photo_file_name;
-    this.serial_number = null;
-    this.gate_pass_generated = false;
+    this.visitor_photo_file_name = visitor_photo_file_name;
+    this.serial_number = null;
+    this.gate_pass_generated = false;
     this.email_sent = false;
   }
 }

package/src/models/LMSExternalEntityTrainedPersonModel.ts

@@ -1,45 +1,45 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-/**
- * One person/trainee per row; multiple rows per request (Request for Individual Training).
- */
-@Entity({ name: 'lms_external_entity_trained_people' })
-export class LMSExternalEntityTrainedPerson 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: 255, nullable: true })
-  full_name: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  employee_id: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  age: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  university: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  qualification: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  learning_curriculum: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  training_period: string | null;
-
-  @Column({ type: 'boolean', default: false })
-  is_selected: boolean;
-
-  @Column({ type: 'int', default: 0 })
-  display_order: number;
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+/**
+ * One person/trainee per row; multiple rows per request (Request for Individual Training).
+ */
+@Entity({ name: 'lms_external_entity_trained_people' })
+export class LMSExternalEntityTrainedPerson 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: 255, nullable: true })
+  full_name: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  employee_id: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  age: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  university: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  qualification: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  learning_curriculum: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  training_period: string | null;
+
+  @Column({ type: 'boolean', default: false })
+  is_selected: boolean;
+
+  @Column({ type: 'int', default: 0 })
+  display_order: number;
+}