@platform-modules/foreign-ministry 1.3.116 → 1.3.117

package/src/models/DiplomaticClubCardMembersModel.ts

@@ -1,75 +1,75 @@
-import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { DiplomaticRequests } from "./DiplomaticRequestsModel";
-import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
-
-export enum MembershipType {
-  SINGLE = "Single",
-  FAMILY = "Family"
-}
-
-export enum RequestType {
-  EMPLOYEE_SELF = "Employee Self",
-  NON_EMPLOYEE = "Non Employee"
-}
-
-export enum MemberType {
-  PRIMARY = "Primary",
-  FAMILY_MEMBER = "Family Member"
-}
-
-@Entity({ name: 'diplomatic_club_card_members' })
-export class DiplomaticClubCardMembers extends BaseModel {
-  @Column({ type: 'int' })
-  diplomatic_request_id: number;
-
-  @Column({ type: 'varchar', length: 255 })
-  family_member_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  relation: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  title: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  diplomatic_title_id: number | null;
-
-  @Column({ type: 'date', nullable: true })
-  expiry_date: Date | null;
-
-  @Column({ type: 'text', nullable: true })
-  photo_url: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_id: string | null;
-
-  @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
-  @JoinColumn({ name: 'diplomatic_request_id' })
-  diplomaticRequest?: DiplomaticRequests;
-
-  @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
-  photos?: DiplomaticClubCardPhotos[];
-
-  constructor(
-    diplomatic_request_id: number,
-    family_member_name: string,
-    relation?: string | null,
-    title?: string | null,
-    diplomatic_title_id?: number | null,
-    expiry_date?: Date | null,
-    photo_url?: string | null,
-    membership_id?: string | null
-  ) {
-    super();
-    this.diplomatic_request_id = diplomatic_request_id;
-    this.family_member_name = family_member_name;
-    this.relation = relation || null;
-    this.title = title || null;
-    this.diplomatic_title_id = diplomatic_title_id || null;
-    this.expiry_date = expiry_date || null;
-    this.photo_url = photo_url || null;
-    this.membership_id = membership_id || null;
-  }
-}
-
+import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
+
+export enum MembershipType {
+  SINGLE = "Single",
+  FAMILY = "Family"
+}
+
+export enum RequestType {
+  EMPLOYEE_SELF = "Employee Self",
+  NON_EMPLOYEE = "Non Employee"
+}
+
+export enum MemberType {
+  PRIMARY = "Primary",
+  FAMILY_MEMBER = "Family Member"
+}
+
+@Entity({ name: 'diplomatic_club_card_members' })
+export class DiplomaticClubCardMembers extends BaseModel {
+  @Column({ type: 'int' })
+  diplomatic_request_id: number;
+
+  @Column({ type: 'varchar', length: 255 })
+  family_member_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  relation: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  title: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null;
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'text', nullable: true })
+  photo_url: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_id: string | null;
+
+  @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
+  @JoinColumn({ name: 'diplomatic_request_id' })
+  diplomaticRequest?: DiplomaticRequests;
+
+  @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
+  photos?: DiplomaticClubCardPhotos[];
+
+  constructor(
+    diplomatic_request_id: number,
+    family_member_name: string,
+    relation?: string | null,
+    title?: string | null,
+    diplomatic_title_id?: number | null,
+    expiry_date?: Date | null,
+    photo_url?: string | null,
+    membership_id?: string | null
+  ) {
+    super();
+    this.diplomatic_request_id = diplomatic_request_id;
+    this.family_member_name = family_member_name;
+    this.relation = relation || null;
+    this.title = title || null;
+    this.diplomatic_title_id = diplomatic_title_id || null;
+    this.expiry_date = expiry_date || null;
+    this.photo_url = photo_url || null;
+    this.membership_id = membership_id || null;
+  }
+}
+

package/src/models/DiplomaticClubSubscriptionMasterModel.ts

@@ -1,26 +1,26 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'diplomatic_club_subscription_master' })
-export class DiplomaticClubSubscriptionMaster extends BaseModel {
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  subscription_type: string | null; // Type: Single or Family
-
-  @Column({ type: 'decimal', precision: 10, scale: 2 })
-  subscription_amount: number;
-
-  @Column({ type: 'varchar', length: 10, nullable: true })
-  currency: string | null;
-
-  constructor(
-    subscription_type: string,
-    subscription_amount: number,
-    currency?: string | null,
-  ) {
-    super();
-    this.subscription_type = subscription_type;
-    this.subscription_amount = subscription_amount;
-    this.currency = currency || null;
-  }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'diplomatic_club_subscription_master' })
+export class DiplomaticClubSubscriptionMaster extends BaseModel {
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  subscription_type: string | null; // Type: Single or Family
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  subscription_amount: number;
+
+  @Column({ type: 'varchar', length: 10, nullable: true })
+  currency: string | null;
+
+  constructor(
+    subscription_type: string,
+    subscription_amount: number,
+    currency?: string | null,
+  ) {
+    super();
+    this.subscription_type = subscription_type;
+    this.subscription_amount = subscription_amount;
+    this.currency = currency || null;
+  }
+}
+

package/src/models/DiplomaticRequestsModel.ts

@@ -1,157 +1,157 @@
-import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-// Import types only (not for runtime)
-import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
-import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
-import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
-import type { DiplomaticChats } from './DiplomaticChatsModel';
-import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
-
-export enum DiplomaticRequestStatus {
-  DRAFT = "Draft",
-  SUBMITTED = "Submitted",
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  COMPLETED = "Completed",
-  CANCELLED = "Cancelled"
-}
-
-@Entity({ name: 'diplomatic_club_card_requests' })
-export class DiplomaticRequests extends BaseModel {
-  @Column({ type: 'int' })
-  user_id: number;
-
-  @Column({ type: 'varchar', length: 100 })
-  employee_id: string;
-
-  @Column({ type: 'varchar', length: 255 })
-  employee_name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  grade: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  designation_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'varchar', length: 255 })
-  email_address: string;
-
-  @Column({ type: 'varchar', length: 20 })
-  contact_number: string;
-
-  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-  request_date: Date;
-
-  @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
-  request_status: DiplomaticRequestStatus;
-
-  @Column({ type: 'timestamp', nullable: true })
-  request_close_date: Date | null;
-
-  @Column({ type: 'date', nullable: true })
-  end_date: Date | null;
-
-  @Column({ type: 'text', nullable: true })
-  remarks: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  current_approval_level: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  current_approver_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: 255, nullable: true })
-  member_name: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_type: string | null;
-
-  @Column({ type: 'int', nullable: true })
-  diplomatic_title_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  location: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  request_type: string | null;
-
-  @Column({ type: 'date', nullable: true })
-  expiry_date: Date | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true })
-  photo_url: string | null;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  membership_id: string | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  organization: string | null;
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
-  subscription_amount: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  section_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  reporting_manager: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  workflow_execution_id: string | null;
-
-  @Column({ type: 'json', nullable: true })
-  titles: any[] | null;
-
-  @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
-  diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
-
-  @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
-  approvals?: DiplomaticApprovals[];
-
-  @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
-  workflows?: DiplomaticWorkFlow[];
-
-  @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
-  attachments?: DiplomaticAttachments[];
-
-  @OneToMany('DiplomaticChats', 'diplomaticRequest')
-  chats?: DiplomaticChats[];
-
-  constructor(
-    user_id: number,
-    employee_id: string,
-    employee_name: string,
-    email_address: string,
-    contact_number: string,
-    service_id: number | null,
-    sub_service_id: number | null,
-    section_id: number | null,
-    reporting_manager: number | null
-  ) {
-    super();
-    this.user_id = user_id;
-    this.employee_id = employee_id;
-    this.employee_name = employee_name;
-    this.email_address = email_address;
-    this.contact_number = contact_number;
-    this.request_date = new Date();
-    this.request_status = DiplomaticRequestStatus.PENDING;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.section_id = section_id;
-    this.reporting_manager = reporting_manager;
-  }
-}
-
+import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+// Import types only (not for runtime)
+import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
+import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
+import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
+import type { DiplomaticChats } from './DiplomaticChatsModel';
+import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
+
+export enum DiplomaticRequestStatus {
+  DRAFT = "Draft",
+  SUBMITTED = "Submitted",
+  PENDING = "Pending",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  COMPLETED = "Completed",
+  CANCELLED = "Cancelled"
+}
+
+@Entity({ name: 'diplomatic_club_card_requests' })
+export class DiplomaticRequests extends BaseModel {
+  @Column({ type: 'int' })
+  user_id: number;
+
+  @Column({ type: 'varchar', length: 100 })
+  employee_id: string;
+
+  @Column({ type: 'varchar', length: 255 })
+  employee_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  grade: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  designation_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'varchar', length: 255 })
+  email_address: string;
+
+  @Column({ type: 'varchar', length: 20 })
+  contact_number: string;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  request_date: Date;
+
+  @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
+  request_status: DiplomaticRequestStatus;
+
+  @Column({ type: 'timestamp', nullable: true })
+  request_close_date: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  end_date: Date | null;
+
+  @Column({ type: 'text', nullable: true })
+  remarks: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  current_approval_level: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  current_approver_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: 255, nullable: true })
+  member_name: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_type: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  location: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  request_type: string | null;
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  photo_url: string | null;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  membership_id: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  organization: string | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  subscription_amount: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  reporting_manager: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  workflow_execution_id: string | null;
+
+  @Column({ type: 'json', nullable: true })
+  titles: any[] | null;
+
+  @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
+  diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
+
+  @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
+  approvals?: DiplomaticApprovals[];
+
+  @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
+  workflows?: DiplomaticWorkFlow[];
+
+  @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
+  attachments?: DiplomaticAttachments[];
+
+  @OneToMany('DiplomaticChats', 'diplomaticRequest')
+  chats?: DiplomaticChats[];
+
+  constructor(
+    user_id: number,
+    employee_id: string,
+    employee_name: string,
+    email_address: string,
+    contact_number: string,
+    service_id: number | null,
+    sub_service_id: number | null,
+    section_id: number | null,
+    reporting_manager: number | null
+  ) {
+    super();
+    this.user_id = user_id;
+    this.employee_id = employee_id;
+    this.employee_name = employee_name;
+    this.email_address = email_address;
+    this.contact_number = contact_number;
+    this.request_date = new Date();
+    this.request_status = DiplomaticRequestStatus.PENDING;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.section_id = section_id;
+    this.reporting_manager = reporting_manager;
+  }
+}
+

package/src/models/LMSCourseExternalLecturerRequestModel.ts

@@ -27,36 +27,78 @@ export class LMSCourseExternalLecturerRequests extends BaseModel {
   @Column({ type: 'int', nullable: false })
   user_id: number;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  course_name: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: false })
-  course_level: string;
+  // New columns
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  course_name: string | null;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  institution: string;
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  course_level: string | null;
 
-  @Column({ type: 'text', nullable: false })
-  reason_of_course: string;
+  @Column({ type: 'varchar', nullable: true })
+  material_price: string | null;
 
-  @Column({ type: 'int', nullable: false })
-  estimated_number_of_participants: number;
+  @Column({ type: 'varchar', nullable: true })
+  transportation: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  accommodation: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  allowances: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  food: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  present: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  currency_type: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  reason_of_course: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  estimated_number_of_participants: number | null;
+
+  @Column({ type: 'date', nullable: true })
+  date_from: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  date_to: Date | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  time_from: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  time_to: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  lecturer_full_name: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  passport: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  age: number | null;
 
-  @Column({ type: 'date', nullable: false })
-  date_from: Date;
+  @Column({ type: 'text', nullable: true })
+  qualifications: string | null;
 
-  @Column({ type: 'date', nullable: false })
-  date_to: Date;
+  @Column({ type: 'text', nullable: true })
+  experience: string | null;
 
-  @Column({ type: 'time', nullable: false })
-  time_from: string;
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  cv_attachment: string | null;
 
-  @Column({ type: 'time', nullable: false })
-  time_to: string;
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  course_material: string | null;
 
   @Column({ type: 'enum', enum: LMSCourseExternalLecturerStatus, default: LMSCourseExternalLecturerStatus.PENDING, nullable: false })
   status: LMSCourseExternalLecturerStatus;
 
   @Column({ type: 'varchar', nullable: true })
   workflow_execution_id: string | null;
+  
 }

package/src/models/LMSExternalCourseParticipationCandidateModel.ts

@@ -1,13 +1,6 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export enum LMSExternalCourseParticipationCandidateApprovalStatus {
-  PENDING = "Pending",
-  IN_PROGRESS = "In Progress",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
 @Entity({ name: 'lms_external_course_participation_candidates' })
 export class LMSExternalCourseParticipationCandidate extends BaseModel {
   @Column({ type: 'integer', nullable: false })
@@ -21,34 +14,4 @@ export class LMSExternalCourseParticipationCandidate extends BaseModel {
 
   @Column({ type: 'varchar', length: 500, nullable: true })
   candidate_profile_url: string | null;
-
-  @Column({ type: 'integer', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  approver_role_id: number;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  approver_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  delegate_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  approved_by: number | null;
-
-  @Column({ type: 'varchar', length: 500, nullable: true, default: '' })
-  comment: string;
-
-  @Column({ type: 'enum', enum: LMSExternalCourseParticipationCandidateApprovalStatus, enumName: 'lms_external_course_participation_candidate_approval_status_enum', default: LMSExternalCourseParticipationCandidateApprovalStatus.PENDING, nullable: false })
-  approval_status: LMSExternalCourseParticipationCandidateApprovalStatus;
 }