@platform-modules/foreign-ministry 1.1.52 → 1.1.54

package/src/models/EarlyCheckoutChatModel.ts

@@ -1,6 +1,5 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
-import { EarlyCheckoutApprovalStatus } from './EarlyCheckoutApprovalModel';
 
 export enum EarlyCheckoutMessageType {
   TEXT = "text",
@@ -25,43 +24,11 @@ export class EarlyCheckoutRequestChat extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   user_id: number;
 
-  @Column({ type: 'integer', nullable: true })
-  role_id: number;
-
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({
-    type: 'enum',
-    enum: EarlyCheckoutMessageType,
-    default: EarlyCheckoutMessageType.TEXT,
-    nullable: false
-  })
+  @Column({ type: 'enum', enum: EarlyCheckoutMessageType, default: EarlyCheckoutMessageType.TEXT, nullable: false })
   messageType: EarlyCheckoutMessageType;
-
-  @Column({ type: 'text', nullable: true })
-  status: string;
-
-  constructor(
-    request_id: number,
-    user_id: number,
-    role_id: number,
-    message: string,
-    service_id?: number,
-    sub_service_id?: number,
-    messageType?: EarlyCheckoutMessageType,
-    status?: EarlyCheckoutApprovalStatus
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id || null;
-    this.sub_service_id = sub_service_id || null;
-    this.user_id = user_id;
-    this.role_id = role_id;
-    this.message = message;
-    this.messageType = messageType || EarlyCheckoutMessageType.TEXT;
-    this.status = status || EarlyCheckoutApprovalStatus.PENDING;
-  }
 }
 
 

package/src/models/EarlyCheckoutWorkflowModel.ts

@@ -23,18 +23,6 @@ export class EarlyCheckoutWorkFlow extends BaseModel {
 
   @Column({ type: 'enum', enum: EarlyCheckoutWorkFlowStatus, default: EarlyCheckoutWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: EarlyCheckoutWorkFlowStatus;
-
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
 }
 
 

package/src/models/FinancialChatsModel.ts

@@ -2,19 +2,6 @@ import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
 import { FinancialRequests } from './FinancialRequestsModel';
 
-export enum statusEnum {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-export enum messageTypeEnum {
-  TEXT = "text",
-  IMAGE = "image",
-  AUDIO = "audio",
-  VIDEO = "video"
-}
-
 @Entity({ name: 'financial_chats' })
 export class FinancialChats extends BaseModel {
   @Column({ type: 'int' })
@@ -26,28 +13,15 @@ export class FinancialChats extends BaseModel {
   @Column({ type: 'int' })
   sender_user_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  status: statusEnum | null;
-
-  @Column({ type: 'varchar',length: 255, nullable: true })
-  message_type: messageTypeEnum | null;
-
-  @Column({ type: 'int', nullable: true })
-  sender_role_id: number | null;
-
   @ManyToOne(() => FinancialRequests, fr => fr.chats)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;
 
-  constructor(financial_request_id: number, content: string, sender_user_id: number, sender_role_id: number) {
+  constructor(financial_request_id: number, content: string, sender_user_id: number) {
     super();
     this.financial_request_id = financial_request_id;
     this.content = content;
     this.sender_user_id = sender_user_id;
-    this.sender_role_id = sender_role_id;
   }
 }
 

package/src/models/FinancialRequestsModel.ts

@@ -91,8 +91,8 @@ export class FinancialRequests extends BaseModel {
   @OneToOne('AllowanceRequests', 'financialRequest', { nullable: true })
   allowanceRequest?: AllowanceRequests;
 
-  @OneToMany('ReimbursementRequests', 'financialRequest', { nullable: true })
-  reimbursementRequests?: ReimbursementRequests[];
+  @OneToOne('ReimbursementRequests', 'financialRequest', { nullable: true })
+  reimbursementRequest?: ReimbursementRequests;
 
   @OneToOne('BankAccountChangeRequests', 'financialRequest', { nullable: true })
   bankAccountChangeRequest?: BankAccountChangeRequests;

package/src/models/FinancialWorkFlowModel.ts

@@ -30,12 +30,6 @@ export class FinancialWorkFlow extends BaseModel {
   @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
   activity_date: Date;
 
-  @Column({ type: 'int', nullable: true })
-  approved_by_role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  step_order: number;
-
   @ManyToOne(() => FinancialRequests, fr => fr.workflows)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;
@@ -44,8 +38,7 @@ export class FinancialWorkFlow extends BaseModel {
     financial_request_id: number,
     status: FinancialWorkFlowStatus,
     approved_by_user_id: number,
-    content: string,
-    step_order:number
+    content: string
   ) {
     super();
     this.financial_request_id = financial_request_id;
@@ -54,7 +47,6 @@ export class FinancialWorkFlow extends BaseModel {
     this.content = content;
     this.financial_approval_id = 0;
     this.activity_date = new Date();
-    this.step_order = step_order
   }
 }
 

package/src/models/LeaveApprovalsModel.ts

@@ -5,8 +5,7 @@ import { BaseModel } from './BaseModel';
 export enum ApprovalStatus {
   PENDING = "Pending",
   APPROVED = "Approved",
-  REJECTED = "Rejected",
-  IN_PROGRESS = "In Progress"
+  REJECTED = "Rejected"
 }
 
 //This model is used to store the store the leave apporval details of the user for the leave request
@@ -24,12 +23,6 @@ export class LeaveApprovalDetails extends BaseModel {
   @Column({ type: 'int', nullable: true })
   approver_role_id: number;
 
-  @Column({ type: 'integer', nullable: true })
-  delegate_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  approved_by: number | null;
-
   @Column({ type: 'int', nullable: true })
   department_id: number;
 

package/src/models/LeaveAttachmentsModel.ts

@@ -5,33 +5,17 @@ import { BaseModel } from './BaseModel';
 export class LeaveAttachments extends BaseModel {
   @Column({ type: 'int', nullable: false })
   leave_request_id: number;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  files: string; 
   
   @Column({ type: 'int', nullable: false })
   attached_by_user_id: number;
 
-  @Column({ type: 'varchar', length: 500, nullable: false })
-  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;
-
-  @Column({ type: 'integer', nullable: true })
-  chat_id: number | null;
-
-  constructor(leave_request_id: number, file_url: string, file_name: string, file_type: string, file_size: number | null, chat_id: number | null, attached_by_user_id: number) {
+  constructor(leave_request_id: number, files: string, attached_by_user_id: number) {
     super();
     this.leave_request_id = leave_request_id;
-    this.file_url = file_url;
-    this.file_name = file_name;
-    this.file_type = file_type;
-    this.file_size = file_size;
-    this.chat_id = chat_id;
+    this.files = files;
     this.attached_by_user_id = attached_by_user_id;
   }
 }

package/src/models/LeaveChatModel.ts

@@ -12,26 +12,10 @@ export class LeaveChat extends BaseModel {
   @Column({ type: 'int', nullable: false })
   sender_user_id: number;
 
-  @Column({ type: 'integer', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  sub_service_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'varchar', length: 255, nullable: true })
-  status: string;
-
-  constructor(leave_request_id: number, content: string, sender_user_id: number, service_id: number | null, sub_service_id: number | null, role_id: number, status: string) {
+  constructor(leave_request_id: number, content: string, sender_user_id: number) {
     super();
     this.leave_request_id = leave_request_id;
     this.content = content;
     this.sender_user_id = sender_user_id;
-    this.status = status;
-    this.service_id = service_id;
-    this.sub_service_id = sub_service_id;
-    this.role_id = role_id;
   }
 }

package/src/models/LeaveRequestModel.ts

@@ -9,10 +9,7 @@ export enum Leave_For {
 export enum status {
   PENDING = "Pending",
   APPROVED = "Approved",
-  REJECTED = "Rejected",
-  EXTENDED = "Extended",
-  CANCELLED = "Cancelled",
-  RETURNED = "Returned"
+  REJECTED = "Rejected"
 }
 @Entity({ name: 'leave_requests' })
 export class LeaveRequests extends BaseModel {
@@ -100,31 +97,6 @@ export class LeaveRequests extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   workflow_execution_id: string | null;
 
-  //new column for extension leave,cancel leave, return notification
-  @Column({ type: 'int', nullable: true, default: null })
-  reference_leave_request_id: number | null;
-
-  @Column({ type: 'date', nullable: true ,default: null})
-  leave_extension_date: Date | null;
-
-  @Column({ type: 'date', nullable: true ,default: null})
-  cancel_leave_date: Date | null;
-
-  @Column({ type: 'date', nullable: true ,default: null})
-  return_notification_date: Date | null;
-
-  @Column({ type: 'date', nullable: true ,default: null})
-  actual_leave_start_date: Date | null;
-
-  @Column({ type: 'date', nullable: true ,default: null})
-  actual_leave_end_date: Date | null;
-
-  @Column({ type: 'varchar', length: 255, nullable: true, default: null})
-  actual_leave_duration: string | null;
-
-  @Column({ type: 'int', nullable: true ,default: null})
-  no_of_days_delayed: number | null;
-
 
   constructor(user_id: string, leave_for: Leave_For, leave_type: number, study_leave_degree: number, department: string, status: status, leave_start_date: Date, leave_end_date: Date, leave_duration: number, remaining_leave_balance: number, contact_number_during_leave: string, address_during_leave: string, notes: string, delegated_to: string, number_of_escort_instances_per_year: number, accompanying_the_patient: boolean, treatment_place: string, emergency_leaves_available: number, unpaid_leave_type: string, country_or_state_being_visited: string, leave_balance_summary: string, representation: string, activity_title: string, relationship: string, mounring_leave_relation: number, service_id: number, sub_service_id: number, workflow_execution_id: string) {
     super();

package/src/models/LeaveWorkFlowModel.ts

@@ -22,27 +22,11 @@ export class LeaveWorkFlow extends BaseModel {
   @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
   status: workFlowStatus;
 
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  constructor(leave_request_id: number, leave_approval_details_id: number, content: string, status: workFlowStatus, user_id: number, role_id: number, department_id: number, section_id: number) {
+  constructor(leave_request_id: number, leave_approval_details_id: number, content: string, status: workFlowStatus) {
     super();
     this.leave_request_id = leave_request_id;
     this.leave_approval_details_id = leave_approval_details_id;
     this.content = content;
     this.status = status;
-    this.user_id = user_id;
-    this.role_id = role_id;
-    this.department_id = department_id;
-    this.section_id = section_id;
   }
 }

package/src/models/MounringLeaveRelationModel.ts

@@ -7,12 +7,8 @@ export class MounringLeaveRelations extends BaseModel {
   @Column({ type: 'varchar', length: 100, nullable: false })
   mounring_leave_relation: string;
 
-  @Column({ type: 'int', nullable: true })
-  days_allowed: number;
-  
-  constructor(mounring_leave_relation: string, days_allowed: number) {
+  constructor(mounring_leave_relation: string) {
     super();
     this.mounring_leave_relation = mounring_leave_relation;
-    this.days_allowed = days_allowed;
   }
 }

package/src/models/ReimbursementRequestsModel.ts

@@ -1,10 +1,10 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { Column, Entity, OneToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
 import { FinancialRequests } from "./FinancialRequestsModel";
 
 @Entity({ name: 'reimbursement_requests' })
 export class ReimbursementRequests extends BaseModel {
-  @Column({ type: 'int' })
+  @Column({ type: 'int', unique: true })
   financial_request_id: number;
 
   @Column({ type: 'text' })
@@ -34,10 +34,10 @@ export class ReimbursementRequests extends BaseModel {
   @Column({ type: 'date', nullable: true })
   payment_date: Date;
 
-  @Column({ type: 'varchar', nullable: true })
-  currency : string; 
+  // @OneToOne('FinancialRequests', 'reimbursementRequest')
+  // financialRequest?: FinancialRequests;
 
-  @ManyToOne(() => FinancialRequests, fr => fr.reimbursementRequests)
+  @OneToOne(() => FinancialRequests, fr => fr.reimbursementRequest)
   @JoinColumn({ name: 'financial_request_id' })
   financialRequest?: FinancialRequests;
 
@@ -49,8 +49,7 @@ export class ReimbursementRequests extends BaseModel {
     approved_amount: number,
     payment_mode: string,
     payment_date: Date,
-    expense_description: string,
-    currency :string
+    expense_description: string
   ) {
     super();
     this.financial_request_id = financial_request_id;
@@ -62,7 +61,6 @@ export class ReimbursementRequests extends BaseModel {
     this.payment_date = payment_date;
     this.expense_description = expense_description;
     this.payment_processed = false;
-    this.currency = currency
   }
 }
 

package/src/models/StayAfterHoursApprovalModel.ts

@@ -45,8 +45,5 @@ export class StayAfterHoursApprovalDetails extends BaseModel {
 
   @Column({ type: 'enum', enum: StayAfterHoursApprovalStatus, default: StayAfterHoursApprovalStatus.PENDING, nullable: false })
   approval_status: StayAfterHoursApprovalStatus;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
 }
 

package/src/models/StayAfterHoursChatModel.ts

@@ -1,6 +1,5 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
-import { StayAfterHoursApprovalStatus } from './StayAfterHoursApprovalModel';
 
 export enum StayAfterHoursMessageType {
   TEXT = "text",
@@ -25,42 +24,10 @@ export class StayAfterHoursRequestChat extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   user_id: number;
 
-  @Column({ type: 'integer', nullable: true })
-  role_id: number;
-
   @Column({ type: 'text', nullable: false })
   message: string;
 
-  @Column({
-    type: 'enum',
-    enum: StayAfterHoursMessageType,
-    default: StayAfterHoursMessageType.TEXT,
-    nullable: false
-  })
+  @Column({ type: 'enum', enum: StayAfterHoursMessageType, default: StayAfterHoursMessageType.TEXT, nullable: false })
   messageType: StayAfterHoursMessageType;
-
-  @Column({ type: 'text', nullable: true })
-  status: string;
-
-  constructor(
-    request_id: number,
-    user_id: number,
-    role_id: number,
-    message: string,
-    service_id?: number,
-    sub_service_id?: number,
-    messageType?: StayAfterHoursMessageType,
-    status?: StayAfterHoursApprovalStatus
-  ) {
-    super();
-    this.request_id = request_id;
-    this.service_id = service_id || null;
-    this.sub_service_id = sub_service_id || null;
-    this.user_id = user_id;
-    this.role_id = role_id;
-    this.message = message;
-    this.messageType = messageType || StayAfterHoursMessageType.TEXT;
-    this.status = status || StayAfterHoursApprovalStatus.PENDING;
-  }
 }
 

package/src/models/StayAfterHoursWorkflowModel.ts

@@ -23,17 +23,5 @@ export class StayAfterHoursWorkFlow extends BaseModel {
 
   @Column({ type: 'enum', enum: StayAfterHoursWorkFlowStatus, default: StayAfterHoursWorkFlowStatus.NOT_YET_STARTED, nullable: false })
   status: StayAfterHoursWorkFlowStatus;
-
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
 }
 

package/src/models/SubscriptionAmountModel.ts

@@ -0,0 +1,30 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum MembershipType {
+  SINGLE = "Single",
+  FAMILY = "Family"
+}
+
+@Entity({ name: 'subscription_amounts' })
+export class SubscriptionAmounts extends BaseModel {
+  
+  @Column({ type: 'enum', enum: MembershipType, nullable: false })
+  membership_type: MembershipType; // Single or Family
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: false })
+  amount: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  description: string | null;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_active: boolean;
+
+  @Column({ type: 'date', nullable: true })
+  effective_from: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  effective_to: Date | null;
+}
+

package/src/models/WorkflowTask.ts

@@ -1,19 +1,5 @@
 import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
-import { TaskType } from "./WorkflowTaskNames";
-import { CategoryType } from "./WorkflowTaskNames";
-
-
-// export enum TaskNameType {
-//     SIMPLE = 'SIMPLE',
-//     HUMAN = 'HUMAN'
-// }
-
-// export enum CategoryNameType {
-//     CREATE = 'CREATE',
-//     APPROVAL = 'APPROVAL',
-//     NOTIFICATION = 'NOTIFICATION'
-// }
 
 @Entity({ name: 'workflow_tasks' })
 export class WorkflowTask extends BaseModel {
@@ -24,30 +10,17 @@ export class WorkflowTask extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
-    @Column({
-        type: 'enum',
-        enum: TaskType,
-        nullable: true
-    })
-    task_type: TaskType;
-
-    @Column({
-        type: 'enum',
-        enum: CategoryType,
-        nullable: true
-    })
-    category: CategoryType;
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
 
     constructor(
         name: string,
         task_id?: number,
-        task_type?: TaskType,
-        category?: CategoryType
+        task_type?: string
     ) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
-        this.task_type = task_type || TaskType.SIMPLE;
-        this.category = category || CategoryType.CREATE;
+        this.task_type = task_type || '';
     }
 }

package/src/models/WorkflowTaskNames.ts

@@ -1,50 +1,31 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 
-export enum TaskType {
-    SIMPLE = 'SIMPLE',
-    HUMAN = 'HUMAN'
-}
-
-export enum CategoryType {
-    CREATE = 'CREATE',
-    APPROVAL = 'APPROVAL',
-    NOTIFICATION = 'NOTIFICATION'
-}
-
 @Entity({ name: 'workflow_task_names' })
 export class WorkflowTaskNames extends BaseModel {
 
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
+
+    @Column({ type: 'integer', nullable: false })
+    task_id: number;
      
     @Column({ type: 'varchar', length: 200, nullable: true })
     description: string;
 
-    @Column({
-        type: 'enum',
-        enum: TaskType,
-        nullable: true
-    })
-    task_type: TaskType;
-
-    @Column({
-        type: 'enum',
-        enum: CategoryType,
-        nullable: true
-    })
-    category: CategoryType;
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
 
     constructor(
         name: string,
+        task_id: number,
         description: string,
-        task_type: TaskType,
-        category: CategoryType
+        task_type: string
     ) {
         super();
         this.name = name;
+        this.task_id = task_id;
         this.description = description;
         this.task_type = task_type;
-        this.category = category;
     }
 }

package/dist/models/CurrencyModel.d.ts

@@ -1,10 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Currency extends BaseModel {
-    id: number;
-    code: string;
-    name: string;
-    symbol: string;
-    countries: string;
-    is_active: boolean;
-    constructor(code: string, name: string, symbol?: string, countries?: string);
-}