@platform-modules/foreign-ministry 1.3.265 → 1.3.270

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

@@ -6,6 +6,14 @@ export enum AnnualTravelTicketPermanentResidence {
   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',
@@ -42,37 +50,21 @@ export class AnnualTravelTicketRequests extends BaseModel {
   @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;
+  /** 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: '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;
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_from: string;
 
-  /** Client confirms dependents match HR/profile before submit. */
-  @Column({ type: 'boolean', default: false, nullable: false })
-  profile_children_synced_with_profile: boolean;
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  travel_to: string;
 
-  /** 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: 'date', nullable: false })
+  date_of_travel: string;
 
   @Column({
     type: 'enum',

package/src/models/EvaluationEligibilitySettingModel.ts

@@ -0,0 +1,45 @@
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { BaseModel } from './BaseModel';
+
+/**
+ * Department/section/month evaluation window: which employees are excluded or re-included
+ * for that cycle (e.g. excluded in January, eligible again in May via a different month row).
+ */
+@Entity({ name: 'evaluation_eligibility_settings' })
+export class EvaluationEligibilitySetting extends BaseModel {
+  @Column({ name: 'department_id', type: 'int' })
+  departmentId: number;
+
+  @Column({ name: 'section_id', type: 'int' })
+  sectionId: number;
+
+  /** Calendar month 1–12 */
+  @Column({ type: 'int' })
+  month: number;
+
+  @Column({ name: 'evaluation_end_date', type: 'date' })
+  evaluationEndDate: Date;
+
+  @Column({ name: 'is_active', type: 'boolean', default: true })
+  isActive: boolean;
+
+  @OneToMany(() => EvaluationEligibilitySettingEmployee, (e) => e.setting)
+  employees?: EvaluationEligibilitySettingEmployee[];
+}
+
+@Entity({ name: 'evaluation_eligibility_setting_employees' })
+export class EvaluationEligibilitySettingEmployee extends BaseModel {
+  @Column({ name: 'setting_id', type: 'int' })
+  settingId: number;
+
+  @ManyToOne(() => EvaluationEligibilitySetting, (s) => s.employees, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'setting_id' })
+  setting: EvaluationEligibilitySetting;
+
+  @Column({ name: 'employee_id', type: 'int' })
+  employeeId: number;
+
+  /** When true, employee is excluded from evaluation for this setting’s month/department/section. */
+  @Column({ name: 'is_excluded_from_evaluation', type: 'boolean', default: true })
+  isExcludedFromEvaluation: boolean;
+}

package/src/models/IneligibleForEvaluationModel.ts

@@ -1,25 +0,0 @@
-import { Column, Entity } from 'typeorm';
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'ineligible_for_evaluation' })
-export class IneligibleForEvaluation extends BaseModel {
-  @Column({ name: 'employee_id', type: 'int' })
-  employeeId: number;
-
-  @Column({ type: 'varchar', length: 255 })
-  leave_type: string;
-
-  @Column({ type: 'boolean', default: true })
-  is_active: boolean;
-
-  @Column({ type: 'int' })
-  year: number;
-
-  constructor(employeeId: number, leave_type: string, is_active: boolean, year: number) {
-    super();
-    this.employeeId = employeeId;
-    this.leave_type = leave_type;
-    this.is_active = is_active;
-    this.year = year;
-  }
-}