@platform-modules/foreign-ministry 1.1.20 → 1.1.21

package/dist/models/LeaveApprovalsModel.js

@@ -17,7 +17,6 @@ var ApprovalStatus;
     ApprovalStatus["PENDING"] = "Pending";
     ApprovalStatus["APPROVED"] = "Approved";
     ApprovalStatus["REJECTED"] = "Rejected";
-    ApprovalStatus["IN_PROGRESS"] = "In Progress";
 })(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
 //This model is used to store the store the leave apporval details of the user for the leave request
 let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseModel {
@@ -50,14 +49,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], LeaveApprovalDetails.prototype, "approver_role_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], LeaveApprovalDetails.prototype, "delegate_user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Object)
-], LeaveApprovalDetails.prototype, "approved_by", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)

package/dist/models/SubscriptionAmountModel.d.ts

@@ -0,0 +1,10 @@
+import { BaseModel } from './BaseModel';
+import { MembershipType } from './DiplomaticClubCardRequestModel';
+export declare class SubscriptionAmounts extends BaseModel {
+    membership_type: MembershipType;
+    amount: number;
+    description: string | null;
+    is_active: boolean;
+    effective_from: Date | null;
+    effective_to: Date | null;
+}

package/dist/models/SubscriptionAmountModel.js

@@ -0,0 +1,45 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscriptionAmounts = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const DiplomaticClubCardRequestModel_1 = require("./DiplomaticClubCardRequestModel");
+let SubscriptionAmounts = class SubscriptionAmounts extends BaseModel_1.BaseModel {
+};
+exports.SubscriptionAmounts = SubscriptionAmounts;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: DiplomaticClubCardRequestModel_1.MembershipType, nullable: false }),
+    __metadata("design:type", String)
+], SubscriptionAmounts.prototype, "membership_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
+    __metadata("design:type", Number)
+], SubscriptionAmounts.prototype, "amount", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", Object)
+], SubscriptionAmounts.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
+    __metadata("design:type", Boolean)
+], SubscriptionAmounts.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], SubscriptionAmounts.prototype, "effective_from", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], SubscriptionAmounts.prototype, "effective_to", void 0);
+exports.SubscriptionAmounts = SubscriptionAmounts = __decorate([
+    (0, typeorm_1.Entity)({ name: 'subscription_amounts' })
+], SubscriptionAmounts);

package/dist/models/WorkflowTask.d.ts

@@ -1,10 +1,7 @@
 import { BaseModel } from './BaseModel';
-import { TaskType } from "./WorkflowTaskNames";
-import { CategoryType } from "./WorkflowTaskNames";
 export declare class WorkflowTask extends BaseModel {
     task_id: number;
     name: string;
-    task_type: TaskType;
-    category: CategoryType;
-    constructor(name: string, task_id?: number, task_type?: TaskType, category?: CategoryType);
+    task_type: string;
+    constructor(name: string, task_id?: number, task_type?: string);
 }

package/dist/models/WorkflowTask.js

@@ -12,24 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowTask = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-const WorkflowTaskNames_1 = require("./WorkflowTaskNames");
-const WorkflowTaskNames_2 = require("./WorkflowTaskNames");
-// export enum TaskNameType {
-//     SIMPLE = 'SIMPLE',
-//     HUMAN = 'HUMAN'
-// }
-// export enum CategoryNameType {
-//     CREATE = 'CREATE',
-//     APPROVAL = 'APPROVAL',
-//     NOTIFICATION = 'NOTIFICATION'
-// }
 let WorkflowTask = class WorkflowTask extends BaseModel_1.BaseModel {
-    constructor(name, task_id, task_type, category) {
+    constructor(name, task_id, task_type) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
-        this.task_type = task_type || WorkflowTaskNames_1.TaskType.SIMPLE;
-        this.category = category || WorkflowTaskNames_2.CategoryType.CREATE;
+        this.task_type = task_type || '';
     }
 };
 exports.WorkflowTask = WorkflowTask;
@@ -42,22 +30,10 @@ __decorate([
     __metadata("design:type", String)
 ], WorkflowTask.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: WorkflowTaskNames_1.TaskType,
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
     __metadata("design:type", String)
 ], WorkflowTask.prototype, "task_type", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: WorkflowTaskNames_2.CategoryType,
-        nullable: true
-    }),
-    __metadata("design:type", String)
-], WorkflowTask.prototype, "category", void 0);
 exports.WorkflowTask = WorkflowTask = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_tasks' }),
-    __metadata("design:paramtypes", [String, Number, String, String])
+    __metadata("design:paramtypes", [String, Number, String])
 ], WorkflowTask);

package/dist/models/WorkflowTaskNames.d.ts

@@ -1,17 +1,8 @@
 import { BaseModel } from './BaseModel';
-export declare enum TaskType {
-    SIMPLE = "SIMPLE",
-    HUMAN = "HUMAN"
-}
-export declare enum CategoryType {
-    CREATE = "CREATE",
-    APPROVAL = "APPROVAL",
-    NOTIFICATION = "NOTIFICATION"
-}
 export declare class WorkflowTaskNames extends BaseModel {
     name: string;
+    task_id: number;
     description: string;
-    task_type: TaskType;
-    category: CategoryType;
-    constructor(name: string, description: string, task_type: TaskType, category: CategoryType);
+    task_type: string;
+    constructor(name: string, task_id: number, description: string, task_type: string);
 }

package/dist/models/WorkflowTaskNames.js

@@ -9,27 +9,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkflowTaskNames = exports.CategoryType = exports.TaskType = void 0;
+exports.WorkflowTaskNames = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
-var TaskType;
-(function (TaskType) {
-    TaskType["SIMPLE"] = "SIMPLE";
-    TaskType["HUMAN"] = "HUMAN";
-})(TaskType || (exports.TaskType = TaskType = {}));
-var CategoryType;
-(function (CategoryType) {
-    CategoryType["CREATE"] = "CREATE";
-    CategoryType["APPROVAL"] = "APPROVAL";
-    CategoryType["NOTIFICATION"] = "NOTIFICATION";
-})(CategoryType || (exports.CategoryType = CategoryType = {}));
 let WorkflowTaskNames = class WorkflowTaskNames extends BaseModel_1.BaseModel {
-    constructor(name, description, task_type, category) {
+    constructor(name, task_id, description, task_type) {
         super();
         this.name = name;
+        this.task_id = task_id;
         this.description = description;
         this.task_type = task_type;
-        this.category = category;
     }
 };
 exports.WorkflowTaskNames = WorkflowTaskNames;
@@ -37,27 +26,19 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
     __metadata("design:type", String)
 ], WorkflowTaskNames.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
+    __metadata("design:type", Number)
+], WorkflowTaskNames.prototype, "task_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
     __metadata("design:type", String)
 ], WorkflowTaskNames.prototype, "description", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: TaskType,
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ type: 'varchar', length: 200, nullable: true }),
     __metadata("design:type", String)
 ], WorkflowTaskNames.prototype, "task_type", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: CategoryType,
-        nullable: true
-    }),
-    __metadata("design:type", String)
-], WorkflowTaskNames.prototype, "category", void 0);
 exports.WorkflowTaskNames = WorkflowTaskNames = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_task_names' }),
-    __metadata("design:paramtypes", [String, String, String, String])
+    __metadata("design:paramtypes", [String, Number, String, String])
 ], WorkflowTaskNames);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -80,6 +80,14 @@ import { StayAfterHoursApprovalDetails } from './models/StayAfterHoursApprovalMo
 import { StayAfterHoursRequestAttachment } from './models/StayAfterHoursAttachmentModel';
 import { StayAfterHoursRequestChat } from './models/StayAfterHoursChatModel';
 import { StayAfterHoursWorkFlow } from './models/StayAfterHoursWorkflowModel';
+import { DiplomaticClubCardRequests } from './models/DiplomaticClubCardRequestModel';
+import { DiplomaticClubCardMembers } from './models/DiplomaticClubCardMemberModel';
+import { DiplomaticClubCardApprovals } from './models/DiplomaticClubCardApprovalModel';
+import { DiplomaticClubCardAttachments } from './models/DiplomaticClubCardAttachmentModel';
+import { DiplomaticClubCardWorkFlow } from './models/DiplomaticClubCardWorkFlowModel';
+import { DiplomaticClubCardChat } from './models/DiplomaticClubCardChatModel';
+import { DiplomaticTitles } from './models/DiplomaticTitleModel';
+import { SubscriptionAmounts } from './models/SubscriptionAmountModel';
 
 
 import { WorkflowTask } from './models/WorkflowTask';
@@ -88,10 +96,6 @@ import { WorkflowDefinitions } from './models/WorkflowDefinitions';
 import { WorkflowHierarchy } from './models/WorkflowHierarchy';
 import { ImportantLinks } from './models/importantLinksModel';
 import { DelegateSettings } from './models/DelegateSettingsModel';
-import { UpdateAttendanceRequests } from './models/UpdateAttendanceRequestModel';
-import { UpdateAttendanceApprovalDetails } from './models/UpdateAttendanceApprovalModel';
-import { UpdateAttendanceRequestChat } from './models/UpdateAttendanceChatModel';
-import { UpdateAttendanceWorkFlow } from './models/UpdateAttendanceWorkflowModel';
 
 
 export const AppDataSource = new DataSource({
@@ -183,9 +187,13 @@ export const AppDataSource = new DataSource({
     ,StayAfterHoursRequestAttachment
     ,StayAfterHoursRequestChat
     ,StayAfterHoursWorkFlow
-    ,UpdateAttendanceRequests
-    ,UpdateAttendanceApprovalDetails
-    ,UpdateAttendanceRequestChat
-    ,UpdateAttendanceWorkFlow
+    ,DiplomaticClubCardRequests
+    ,DiplomaticClubCardMembers
+    ,DiplomaticClubCardApprovals
+    ,DiplomaticClubCardAttachments
+    ,DiplomaticClubCardWorkFlow
+    ,DiplomaticClubCardChat
+    ,DiplomaticTitles
+    ,SubscriptionAmounts
   ],
 });

package/src/index.ts

@@ -77,7 +77,11 @@ export * from './models/StayAfterHoursApprovalModel';
 export * from './models/StayAfterHoursAttachmentModel';
 export * from './models/StayAfterHoursChatModel';
 export * from './models/StayAfterHoursWorkflowModel';
-export * from './models/UpdateAttendanceRequestModel';
-export * from './models/UpdateAttendanceApprovalModel';
-export * from './models/UpdateAttendanceChatModel';
-export * from './models/UpdateAttendanceWorkflowModel';
+export * from './models/DiplomaticClubCardRequestModel';
+export * from './models/DiplomaticClubCardMemberModel';
+export * from './models/DiplomaticClubCardApprovalModel';
+export * from './models/DiplomaticClubCardAttachmentModel';
+export * from './models/DiplomaticClubCardWorkFlowModel';
+export * from './models/DiplomaticClubCardChatModel';
+export * from './models/DiplomaticTitleModel';
+export * from './models/SubscriptionAmountModel';

package/src/models/AttendanceModel.ts

@@ -7,7 +7,6 @@ export enum AttendanceStatus {
     ABSENT = 'ABSENT',
     LEAVE = 'LEAVE',
     HALF_DAY = 'HALF_DAY',
-    REGULARISED = 'REGULARISED',
 }
 
 @Entity({ name: 'attendance_details' })
@@ -20,7 +19,7 @@ export class AttendanceDetails extends BaseModel {
     @Column({ type: 'int', nullable: true })
     shift_id: number;
 
-    @Column({ type: 'date', nullable: true })
+    @Column({ type: 'date', nullable: true , unique: true})
     attendance_date: string;
 
     @Column({ type: 'time', nullable: true })

package/src/models/DiplomaticClubCardApprovalModel.ts

@@ -0,0 +1,37 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DiplomaticClubCardApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'diplomatic_club_card_approvals' })
+export class DiplomaticClubCardApprovals extends BaseModel {
+  
+  @Column({ type: 'int', nullable: false })
+  request_id: number; // Reference to diplomatic_club_card_requests
+
+  @Column({ type: 'int', nullable: false })
+  approver_user_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  approver_role_id: number | null;
+
+  @Column({ type: 'int', nullable: false, default: 0 })
+  step_order: number; // Approval step order
+
+  @Column({ type: 'enum', enum: DiplomaticClubCardApprovalStatus, default: DiplomaticClubCardApprovalStatus.PENDING, nullable: false })
+  status: DiplomaticClubCardApprovalStatus;
+
+  @Column({ type: 'text', nullable: true })
+  comments: string | null;
+
+  @Column({ type: 'timestamp', nullable: true })
+  approved_at: Date | null;
+
+  @Column({ type: 'timestamp', nullable: true })
+  rejected_at: Date | null;
+}
+

package/src/models/DiplomaticClubCardAttachmentModel.ts

@@ -0,0 +1,25 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'diplomatic_club_card_attachments' })
+export class DiplomaticClubCardAttachments extends BaseModel {
+  
+  @Column({ type: 'int', nullable: false })
+  request_id: number; // Reference to diplomatic_club_card_requests
+
+  @Column({ type: 'int', nullable: true })
+  member_id: number | null; // Reference to diplomatic_club_card_members (if family member)
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  file_name: string;
+
+  @Column({ type: 'varchar', length: 500, nullable: false })
+  file_path: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  file_type: string | null; // image/jpeg, image/png, etc.
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  attachment_type: string | null; // photo, document, etc.
+}
+

package/src/models/DiplomaticClubCardChatModel.ts

@@ -0,0 +1,19 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'diplomatic_club_card_chats' })
+export class DiplomaticClubCardChat extends BaseModel {
+  
+  @Column({ type: 'int', nullable: false })
+  request_id: number; // Reference to diplomatic_club_card_requests
+
+  @Column({ type: 'int', nullable: false })
+  user_id: number; // User who sent the message
+
+  @Column({ type: 'text', nullable: false })
+  message: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  message_type: string | null; // text, file, etc.
+}
+

package/src/models/DiplomaticClubCardMemberModel.ts

@@ -0,0 +1,37 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'diplomatic_club_card_members' })
+export class DiplomaticClubCardMembers extends BaseModel {
+  
+  @Column({ type: 'int', nullable: false })
+  request_id: number; // Reference to diplomatic_club_card_requests
+
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  member_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  relation: string | null; // S/O, D/O, W/O, etc.
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  membership_id: string | null; // Auto generated
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  title: string | null; // S/O (Diplomatic Title), D/O (Diplomatic Title), etc.
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null; // Reference to diplomatic_titles master
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  organization: string | null; // Auto filled as "Foreign Ministry" for family members
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'varchar', length: 500, nullable: true })
+  photo: string | null; // Photo URL/path
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  subscription_amount: number | null;
+}
+

package/src/models/DiplomaticClubCardRequestModel.ts

@@ -0,0 +1,70 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum MembershipType {
+  SINGLE = "Single",
+  FAMILY = "Family"
+}
+
+export enum RequestStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  IN_PROGRESS = "In Progress"
+}
+
+export enum RequestType {
+  EMPLOYEE_SELF = "Employee Self",
+  EMPLOYEE_FAMILY = "Employee Family",
+  NON_EMPLOYEE = "Non Employee"
+}
+
+@Entity({ name: 'diplomatic_club_card_requests' })
+export class DiplomaticClubCardRequests extends BaseModel {
+  
+  @Column({ type: 'int', nullable: true })
+  user_id: number | null; // For employee requests, null for non-employee
+
+  @Column({ type: 'varchar', length: 50, nullable: false })
+  membership_type: MembershipType; // Single or Family
+
+  @Column({ type: 'enum', enum: RequestType, nullable: false })
+  request_type: RequestType; // Employee Self, Employee Family, Non Employee
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  member_name: string | null; // For single membership
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  membership_id: string | null; // Auto generated
+
+  @Column({ type: 'int', nullable: true })
+  diplomatic_title_id: number | null; // Reference to diplomatic_titles master
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  organization: string | null; // Auto filled as "Ministry" for employees, manual for non-employees
+
+  @Column({ type: 'date', nullable: true })
+  expiry_date: Date | null;
+
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  subscription_amount: number | null; // Pulled from master
+
+  @Column({ type: 'enum', enum: RequestStatus, default: RequestStatus.PENDING, nullable: false })
+  status: RequestStatus;
+
+  @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 })
+  workflow_execution_id: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  notes: string | null;
+
+  @Column({ type: 'int', nullable: true })
+  registered_by_user_id: number | null; // For non-employee registration by diplomatic club staff
+}
+

package/src/models/DiplomaticClubCardWorkFlowModel.ts

@@ -0,0 +1,25 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum DiplomaticClubCardWorkFlowStatus {
+  COMPLETED = "Completed",
+  NOT_YET_STARTED = "Not Yet Started",
+  PENDING = "Pending"
+}
+
+@Entity({ name: 'diplomatic_club_card_work_flows' })
+export class DiplomaticClubCardWorkFlow extends BaseModel {
+  
+  @Column({ type: 'int', nullable: false })
+  request_id: number; // Reference to diplomatic_club_card_requests
+
+  @Column({ type: 'int', nullable: false, default: 0 })
+  approval_details_id: number; // Reference to diplomatic_club_card_approvals
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  content: string;
+
+  @Column({ type: 'enum', enum: DiplomaticClubCardWorkFlowStatus, default: DiplomaticClubCardWorkFlowStatus.NOT_YET_STARTED, nullable: false })
+  status: DiplomaticClubCardWorkFlowStatus;
+}
+

package/src/models/DiplomaticTitleModel.ts

@@ -0,0 +1,27 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum TitleCategory {
+  EMPLOYEE = "Employee",
+  NON_EMPLOYEE = "Non Employee"
+}
+
+@Entity({ name: 'diplomatic_titles' })
+export class DiplomaticTitles extends BaseModel {
+  
+  @Column({ type: 'varchar', length: 100, nullable: false })
+  title_name: string; // Agent or Equivalent, Ambassador, etc.
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  title_name_arabic: string | null;
+
+  @Column({ type: 'enum', enum: TitleCategory, nullable: false })
+  category: TitleCategory; // Employee or Non Employee
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_active: boolean;
+
+  @Column({ type: 'int', nullable: true })
+  display_order: number | null;
+}
+

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

@@ -0,0 +1,26 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { MembershipType } from './DiplomaticClubCardRequestModel';
+
+@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;
+}
+