@platform-modules/foreign-ministry 1.3.194 → 1.3.196

package/src/models/AppointmentRequestModel.ts

@@ -49,8 +49,9 @@ export class AppointmentRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   user_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  department_id: number | null;
+  /** Array of department IDs (e.g. [1, 2, 5]). Replaces single department_id. */
+  @Column({ type: 'jsonb', nullable: true })
+  departments: number[] | null;
 
   @Column({ type: 'int', nullable: true })
   receiving_department_id: number | null;
@@ -121,5 +122,9 @@ export class AppointmentRequests extends BaseModel {
 
   @Column({ type: 'int', nullable: true })
   follow_up_appointment_id: number | null;
+
+  /** When true, workflow includes Under Secretary Approval step; when false or null, that step is skipped. */
+  @Column({ type: 'boolean', nullable: true })
+  is_under_secretery_approval_required: boolean | null;
 }
 

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/FoodRequestModel.ts

@@ -49,6 +49,10 @@ export class FoodRequests extends BaseModel {
   @Column({ type: 'enum', enum: MeetingRequestStatus, default: MeetingRequestStatus.PENDING, nullable: false })
   status: MeetingRequestStatus;
 
+  /** When true, workflow includes Under Secretary Approval step; when false or null, that step is skipped. */
+  @Column({ type: 'boolean', nullable: true })
+  is_under_secretery_approval_required: boolean | null;
+
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
 }

package/src/models/HallRequestModel.ts

@@ -46,6 +46,10 @@ export class HallRequests extends BaseModel {
   @Column({ type: 'enum', enum: MeetingRequestStatus, default: MeetingRequestStatus.PENDING, nullable: false })
   status: MeetingRequestStatus;
 
+  /** When true, workflow includes Under Secretary Approval step; when false or null, that step is skipped. */
+  @Column({ type: 'boolean', nullable: true })
+  is_under_secretery_approval_required: boolean | null;
+
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
 }

package/src/models/LanguageCourseRequestModel.ts

@@ -1,67 +1,67 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum LanguageCourseStatus {
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  ASSIGNED = "Assigned",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'language_course_requests' })
-export class LanguageCourseRequests 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;
-
-  // Language Course specific columns
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  course_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  course_level: string;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  institution: string;
-
-  @Column({ type: 'text', nullable: false })
-  reason_of_course: string;
-
-  @Column({ type: 'int', nullable: false })
-  estimated_number_of_participants: number;
-
-  // Timeline
-  @Column({ type: 'date', nullable: false })
-  date_from: Date;
-
-  @Column({ type: 'date', nullable: false })
-  date_to: Date;
-
-  @Column({ type: 'time', nullable: false })
-  time_from: string;
-
-  @Column({ type: 'time', nullable: false })
-  time_to: string;
-
-  @Column({ type: 'enum', enum: LanguageCourseStatus, default: LanguageCourseStatus.PENDING, nullable: false })
-  status: LanguageCourseStatus;
-
-  @Column({ type: 'varchar', nullable: true })
-  workflow_execution_id: string | null;
-  
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum LanguageCourseStatus {
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'language_course_requests' })
+export class LanguageCourseRequests 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;
+
+  // Language Course specific columns
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  course_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  course_level: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  institution: string;
+
+  @Column({ type: 'text', nullable: false })
+  reason_of_course: string;
+
+  @Column({ type: 'int', nullable: false })
+  estimated_number_of_participants: number;
+
+  // Timeline
+  @Column({ type: 'date', nullable: false })
+  date_from: Date;
+
+  @Column({ type: 'date', nullable: false })
+  date_to: Date;
+
+  @Column({ type: 'time', nullable: false })
+  time_from: string;
+
+  @Column({ type: 'time', nullable: false })
+  time_to: string;
+
+  @Column({ type: 'enum', enum: LanguageCourseStatus, default: LanguageCourseStatus.PENDING, nullable: false })
+  status: LanguageCourseStatus;
+
+  @Column({ type: 'varchar', nullable: true })
+  workflow_execution_id: string | null;
+  
+}

package/src/models/LeaveConfigModel.ts

@@ -1,72 +1,72 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum enumFrequency {
-    Monthly = 'Monthly',
-    Yearly = 'Yearly',
-}
-
-//This model is used to store the Financial Grade declaration on the Admin Side
-@Entity({ name: 'leave_configuration' })
-export class LeaveConfiguration extends BaseModel {
-
-    @Column({ type: 'varchar', nullable: true })
-    category: string;
-
-    @Column({ type: 'int', nullable: true })
-    MandC_id: number;
-
-    @Column({ type: 'int', nullable: true })
-    leave_type_id: number;
-
-    @Column({ type: 'varchar', nullable: true })
-    frequency: enumFrequency;
-
-    @Column({ type: 'varchar', nullable: true })
-    region: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    country: string;
-
-    @Column({ type: 'varchar', nullable: true })
-    location: string;
-
-    @Column({ nullable: true, default: false })
-    is_carryforward: boolean;
-
-    @Column({ type: 'int', nullable: true, default: 0 })
-    carryforward_limit: number;
-
-    @Column({ type: 'date', nullable: true })
-    from_date: Date;
-
-    @Column({ type: 'date', nullable: true })
-    to_date: Date;
-
-    @Column({ type: 'varchar', nullable: true })
-    reason: string;
-
-    @Column({ type: 'int', nullable: true })
-    emergency_balance_days: number | null;
-
-    @Column({ type: 'date', nullable: true })
-    last_credited: Date | null;
-
-    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
-        super();
-        this.category = category;
-        this.MandC_id = MandC_id;
-        this.leave_type_id = leave_type_id;
-        this.frequency = frequency;
-        this.region = region;
-        this.country = country;
-        this.location = location;
-        this.is_carryforward = is_carryforward;
-        this.carryforward_limit = carryforward_limit;
-        this.from_date = from_date;
-        this.to_date = to_date;
-        this.reason = reason;
-        this.emergency_balance_days = emergency_balance_days ?? null;
-        this.last_credited = last_credited ?? null;
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum enumFrequency {
+    Monthly = 'Monthly',
+    Yearly = 'Yearly',
+}
+
+//This model is used to store the Financial Grade declaration on the Admin Side
+@Entity({ name: 'leave_configuration' })
+export class LeaveConfiguration extends BaseModel {
+
+    @Column({ type: 'varchar', nullable: true })
+    category: string;
+
+    @Column({ type: 'int', nullable: true })
+    MandC_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    leave_type_id: number;
+
+    @Column({ type: 'varchar', nullable: true })
+    frequency: enumFrequency;
+
+    @Column({ type: 'varchar', nullable: true })
+    region: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    country: string;
+
+    @Column({ type: 'varchar', nullable: true })
+    location: string;
+
+    @Column({ nullable: true, default: false })
+    is_carryforward: boolean;
+
+    @Column({ type: 'int', nullable: true, default: 0 })
+    carryforward_limit: number;
+
+    @Column({ type: 'date', nullable: true })
+    from_date: Date;
+
+    @Column({ type: 'date', nullable: true })
+    to_date: Date;
+
+    @Column({ type: 'varchar', nullable: true })
+    reason: string;
+
+    @Column({ type: 'int', nullable: true })
+    emergency_balance_days: number | null;
+
+    @Column({ type: 'date', nullable: true })
+    last_credited: Date | null;
+
+    constructor(category: string, MandC_id: number, leave_type_id: number, frequency: enumFrequency, region: string, country: string, location: string, is_carryforward: boolean, carryforward_limit: number, from_date: Date, to_date: Date, reason: string, emergency_balance_days?: number|null, last_credited?: Date|null) {
+        super();
+        this.category = category;
+        this.MandC_id = MandC_id;
+        this.leave_type_id = leave_type_id;
+        this.frequency = frequency;
+        this.region = region;
+        this.country = country;
+        this.location = location;
+        this.is_carryforward = is_carryforward;
+        this.carryforward_limit = carryforward_limit;
+        this.from_date = from_date;
+        this.to_date = to_date;
+        this.reason = reason;
+        this.emergency_balance_days = emergency_balance_days ?? null;
+        this.last_credited = last_credited ?? null;
+    }
 }

package/src/models/MeetingRequestModel.ts

@@ -65,12 +65,16 @@ export class MeetingRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   user_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  department_id: number | null;
+  /** Array of department IDs (e.g. [1, 2, 5]). Replaces single department_id. */
+  @Column({ type: 'jsonb', nullable: true })
+  departments: number[] | null;
 
   @Column({ type: 'int', nullable: true })
   receiving_department_id: number | null;
 
+  @Column({ type: 'int', nullable: true })
+  project_id: number | null;
+
   @Column({ type: 'enum', enum: RequestResourceSystem, nullable: true })
   request_resource_system: RequestResourceSystem | null;
 
@@ -155,4 +159,8 @@ export class MeetingRequests extends BaseModel {
 
   @Column({ type: 'int', nullable: true })
   follow_up_meeting_id: number | null;
+
+  /** When true, workflow includes Under Secretary Approval step; when false or null, that step is skipped. */
+  @Column({ type: 'boolean', nullable: true })
+  is_under_secretery_approval_required: boolean | null;
 }