@platform-modules/foreign-ministry 1.1.78 → 1.1.80

package/src/models/DiplomaticAttachmentsModel.ts

@@ -0,0 +1,37 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+
+@Entity({ name: 'diplomatic_attachments' })
+export class DiplomaticAttachments extends BaseModel {
+  @Column({ type: 'int' })
+  diplomatic_request_id: number;
+
+  @Column({ type: 'varchar', length: 500 })
+  file_url: string;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  file_name: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  file_type: string;
+
+  @Column({ type: 'bigint', nullable: true })
+  file_size: number | null;
+
+  @ManyToOne(() => DiplomaticRequests, dr => dr.attachments)
+  @JoinColumn({ name: 'diplomatic_request_id' })
+  diplomaticRequest?: DiplomaticRequests;
+
+  constructor(
+    diplomatic_request_id: number,
+    file_url: string,
+    file_name: string
+  ) {
+    super();
+    this.diplomatic_request_id = diplomatic_request_id;
+    this.file_url = file_url;
+    this.file_name = file_name;
+  }
+}
+

package/src/models/DiplomaticChatsModel.ts

@@ -0,0 +1,53 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+
+export enum DiplomaticMessageType {
+  TEXT = "text",
+  IMAGE = "image",
+  VIDEO = "video",
+  FILE = "file",
+  AUDIO = "audio"
+}
+
+@Entity({ name: 'diplomatic_chats' })
+export class DiplomaticChats extends BaseModel {
+  @Column({ type: 'int' })
+  diplomatic_request_id: number;
+
+  @Column({ type: 'text' })
+  content: string;
+
+  @Column({ type: 'int' })
+  sender_user_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  role_id: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  status: string | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  message_type: DiplomaticMessageType | null;
+
+  @Column({ type: 'int', nullable: true })
+  sender_role_id: number | null;
+
+  @ManyToOne(() => DiplomaticRequests, dr => dr.chats)
+  @JoinColumn({ name: 'diplomatic_request_id' })
+  diplomaticRequest?: DiplomaticRequests;
+
+  constructor(
+    diplomatic_request_id: number,
+    content: string,
+    sender_user_id: number,
+    sender_role_id: number
+  ) {
+    super();
+    this.diplomatic_request_id = diplomatic_request_id;
+    this.content = content;
+    this.sender_user_id = sender_user_id;
+    this.sender_role_id = sender_role_id;
+  }
+}
+

package/src/models/DiplomaticClubCardMembersModel.ts

@@ -0,0 +1,71 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+
+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: 'varchar', length: 500, 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;
+
+  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

@@ -0,0 +1,50 @@
+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 })
+  subscription_type: string; // e.g., "Single", "Family"
+
+  @Column({ type: 'decimal', precision: 10, scale: 2 })
+  subscription_amount: number;
+
+  @Column({ type: 'varchar', length: 10, nullable: true })
+  currency: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  @Column({ type: 'boolean', default: true })
+  is_active: boolean;
+
+  @Column({ type: 'date', nullable: true })
+  effective_from: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  effective_to: Date | null;
+
+  @Column({ type: 'varchar', length: 20, nullable: true })
+  subscription_period: string | null; // e.g., "Monthly", "Yearly"
+
+  constructor(
+    subscription_type: string,
+    subscription_amount: number,
+    currency?: string | null,
+    description?: string | null,
+    effective_from?: Date | null,
+    effective_to?: Date | null,
+    subscription_period?: string | null
+  ) {
+    super();
+    this.subscription_type = subscription_type;
+    this.subscription_amount = subscription_amount;
+    this.currency = currency || null;
+    this.description = description || null;
+    this.is_active = true;
+    this.effective_from = effective_from || null;
+    this.effective_to = effective_to || null;
+    this.subscription_period = subscription_period || null;
+  }
+}
+

package/src/models/DiplomaticRequestsModel.ts

@@ -0,0 +1,154 @@
+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_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;
+
+  @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/DiplomaticTitlesMasterModel.ts

@@ -0,0 +1,39 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum TitleCategory {
+  EMPLOYEE = "Employee",
+  NON_EMPLOYEE = "Non Employee"
+}
+
+@Entity({ name: 'diplomatic_titles_master' })
+export class DiplomaticTitlesMaster extends BaseModel {
+  @Column({ type: 'varchar', length: 255 })
+  title_name: string;
+
+  @Column({ type: 'enum', enum: TitleCategory })
+  category: TitleCategory;
+
+  @Column({ type: 'text', nullable: true })
+  description: string | null;
+
+  @Column({ type: 'boolean', default: true })
+  is_active: boolean;
+
+  @Column({ type: 'int', default: 0 })
+  display_order: number;
+
+  constructor(
+    title_name: string,
+    category: TitleCategory,
+    description?: string | null
+  ) {
+    super();
+    this.title_name = title_name;
+    this.category = category;
+    this.description = description || null;
+    this.is_active = true;
+    this.display_order = 0;
+  }
+}
+

package/src/models/DiplomaticWorkFlowModel.ts

@@ -0,0 +1,53 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { DiplomaticRequests } from "./DiplomaticRequestsModel";
+
+export enum DiplomaticWorkFlowStatus {
+  COMPLETED = "Completed",
+  NOT_YET_STARTED = "Not Yet Started",
+  PENDING = "Pending"
+}
+
+@Entity({ name: 'diplomatic_workflows' })
+export class DiplomaticWorkFlow extends BaseModel {
+  @Column({ type: 'int' })
+  diplomatic_request_id: number;
+
+  @Column({ type: 'varchar', length: 500 })
+  content: string;
+
+  @Column({ type: 'enum', enum: DiplomaticWorkFlowStatus, default: DiplomaticWorkFlowStatus.NOT_YET_STARTED })
+  status: DiplomaticWorkFlowStatus;
+
+  @Column({ type: 'int', nullable: true })
+  user_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  step_order: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_approval_id: number | null;
+
+  @Column({ type: 'int', nullable: true })
+  approved_by_role_id: number | null;
+
+  @ManyToOne(() => DiplomaticRequests, dr => dr.workflows)
+  @JoinColumn({ name: 'diplomatic_request_id' })
+  diplomaticRequest?: DiplomaticRequests;
+
+  constructor(
+    diplomatic_request_id: number,
+    content: string,
+    status: DiplomaticWorkFlowStatus,
+    user_id: number | null,
+    step_order: number | null
+  ) {
+    super();
+    this.diplomatic_request_id = diplomatic_request_id;
+    this.content = content;
+    this.status = status;
+    this.user_id = user_id;
+    this.step_order = step_order;
+  }
+}
+

package/src/models/FinancialApprovalsModel.ts

@@ -45,10 +45,6 @@ export class FinancialApprovals extends BaseModel {
   @Column({ type: 'int', nullable: true })
   delegate_user_id: number | null;
 
-  // is_allowed flag: true if logged-in user is the request creator, false otherwise (for chat permissions)
-  @Column({ type: 'boolean', default: true, nullable: true })
-  is_allowed: boolean | null;
-
   @ManyToOne(() => FinancialRequests, fr => fr.approvals)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;

package/src/models/FinancialGradeModel.ts

@@ -4,28 +4,23 @@ import { BaseModel } from './BaseModel';
 @Entity({ name: 'financial_grade' })
 export class FinancialGrade extends BaseModel {
 
-    @Column({ type: 'varchar', nullable: false })
+    @Column({ nullable: false })
     diplomatic_title: string;
 
-    @Column({ type: 'varchar', nullable: true })
-    arabic_title: string;
+    @Column({ nullable: false })
+    financial_grade: string;
 
-    @Column({ type: "integer", nullable: true })
-    financial_grade: number;
-
-    @Column({ type: "integer", nullable: true })
-    leave_count: number;
+    @Column({ type: "int", nullable: false })
+    annual_leave: number;
 
     constructor(
         diplomatic_title: string,
-        arabic_title: string,
-        financial_grade: number,
-        leave_count: number
+        financial_grade: string,
+        annual_leave: number
     ) {
         super();
         this.diplomatic_title = diplomatic_title;
-        this.arabic_title = arabic_title;
         this.financial_grade = financial_grade;
-        this.leave_count = leave_count;
+        this.annual_leave = annual_leave;
     }
 }

package/src/models/GeneralServiceApprovalsModel.ts

@@ -6,8 +6,7 @@ export enum GeneralServiceApprovalStatus {
   APPROVED = "Approved",
   REJECTED = "Rejected",
   SKIPPED = "Skipped",
-  IN_PROGRESS = "In Progress",
-  ASSIGNED = "Assigned"
+  IN_PROGRESS = "In Progress"
 }
 
 @Entity({ name: 'general_service_approvals' })
@@ -61,14 +60,6 @@ export class GeneralServiceApprovals extends BaseModel {
   @Column({ type: 'int', nullable: true })
   delegate_user_id: number | null;  // Group who transferred from
 
-  // Stationery-specific: Action type to indicate what action is needed (for FE button handling)
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  action_type: string | null;  // Values: 'approve' (L1), 'store' (Stores Office), 'finance' (Finance), 'finance_purchase', 'complete'
-
-  // is_allowed flag: true if logged-in user is the request creator, false otherwise (for chat permissions)
-  @Column({ type: 'boolean', nullable: true })
-  is_allowed: boolean | null;
-
   // @Column({ type: 'timestamp', nullable: true })
   // sla_start_time: Date | null;  // SLA tracking start time for this assignment
 

package/src/models/LeaveApprovalsModel.ts

@@ -42,10 +42,7 @@ export class LeaveApprovalDetails extends BaseModel {
   @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
   approval_status: ApprovalStatus;
 
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
-
-  constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number, is_allowed: boolean) {
+  constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number) {
     super();
     this.leave_request_id = leave_request_id;
     this.approver_user_id = approver_user_id;
@@ -55,6 +52,5 @@ export class LeaveApprovalDetails extends BaseModel {
     this.comment = comment;
     this.approval_status = approval_status;
     this.level = level;
-    this.is_allowed = is_allowed;
   }
 }

package/src/models/LeaveTypesModel.ts

@@ -1,47 +1,31 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export enum genderType {
-    Male = 'Male',
-    Female = 'Female',
-    All = 'All',
-}
-
 @Entity({ name: 'leave_types' })
 export class LeaveTypes extends BaseModel {
 
-    @Column({type: 'varchar', nullable: true })
+    @Column({ nullable: true })
     name: string;
 
-    @Column({type: 'varchar', nullable: true })
+    @Column({ nullable: true })
     name_in_arabic: string;
 
-    @Column({ nullable: true, default: false })
-    omani_only?: boolean = false;
+    @Column({ nullable: true, default: false })  
+    omani_only?: boolean = false; 
 
-    @Column({ nullable: true, default: false })
-    non_omani_muslim?: boolean = false;
+    @Column({ nullable: true, default: false })  
+    non_omani_muslim?: boolean = false; 
 
-    @Column({ nullable: true, default: false })
-    non_omani_non_muslim?: boolean = false;
+    @Column({ nullable: true, default: false })  
+    non_omani_non_muslim?: boolean = false; 
 
-    @Column({ nullable: true, default: genderType.All })
-    gender: genderType = genderType.All;
 
-    constructor(
+    constructor(     
         name: string,
         name_in_arabic: string,
-        omani_only: boolean,
-        non_omani_muslim: boolean,
-        non_omani_non_muslim: boolean,
-        gender: genderType
     ) {
-        super();
+        super();     
         this.name = name
-        this.name_in_arabic = name_in_arabic
-        this.omani_only = omani_only
-        this.non_omani_muslim = non_omani_muslim
-        this.non_omani_non_muslim = non_omani_non_muslim
-        this.gender = gender
+        this.name_in_arabic = name_in_arabic    
     }
 }

package/src/models/UpdateAttendanceApprovalModel.ts

@@ -45,9 +45,6 @@ export class UpdateAttendanceApprovalDetails extends BaseModel {
 
   @Column({ type: 'enum', enum: UpdateAttendanceApprovalStatus, default: UpdateAttendanceApprovalStatus.PENDING, nullable: false })
   approval_status: UpdateAttendanceApprovalStatus;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
 }
 
 

package/src/models/user.ts

@@ -132,9 +132,6 @@ export class User extends BaseModel {
     @Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" })
     category: "FM" | "Embassy"; // Mandatory
 
-    @Column({ type: "int", nullable: true , default: 0})
-    mandc_number: number;
-
     constructor(     
         employee_id?: number,
         employee_name?: string,
@@ -178,7 +175,6 @@ export class User extends BaseModel {
         children2_name?: string,
         language_preferences?: string,
         category?: "FM" | "Embassy",
-        mandc_number?: number,
     ) {
         super();     
         this.employee_id = employee_id;
@@ -223,6 +219,5 @@ export class User extends BaseModel {
         this.children2_name = children2_name;
         this.language_preferences = language_preferences;
         this.category = category || "FM";
-        this.mandc_number = mandc_number || 0;
     }
 }

package/dist/models/EarlyCheckoutBalanceModel.d.ts

@@ -1,7 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class EarlyCheckoutBalance extends BaseModel {
-    user_id: string;
-    balance: number;
-    total_balance: number;
-    constructor(user_id: string, balance: number, total_balance: number);
-}