@platform-modules/foreign-ministry 1.0.90 → 1.0.92

package/.env

@@ -2,4 +2,10 @@ DB_HOST=localhost
 DB_PORT=5432
 DB_USER=postgres
 DB_PASS=Fa@123
-DB_NAME=FM
+DB_NAME=FM
+
+# DB_HOST=164.52.222.169
+# DB_PORT=5432
+# DB_USER=postgres_admin_user
+# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+# DB_NAME=FM

package/dist/data-source.js

@@ -53,19 +53,6 @@ const HolidaysModel_1 = require("./models/HolidaysModel");
 const userRolesModel_1 = require("./models/userRolesModel");
 const roleRightsModel_1 = require("./models/roleRightsModel");
 const PortalFeedbackModel_1 = require("./models/PortalFeedbackModel");
-const NotificationModel_1 = require("./models/NotificationModel");
-const FinancialRequestsModel_1 = require("./models/FinancialRequestsModel");
-const FinancialApprovalsModel_1 = require("./models/FinancialApprovalsModel");
-const FinancialSettingsModel_1 = require("./models/FinancialSettingsModel");
-const PayslipRequestsModel_1 = require("./models/PayslipRequestsModel");
-const SalaryCertificateRequestsModel_1 = require("./models/SalaryCertificateRequestsModel");
-const AllowanceRequestsModel_1 = require("./models/AllowanceRequestsModel");
-const ReimbursementRequestsModel_1 = require("./models/ReimbursementRequestsModel");
-const BankAccountChangeRequestsModel_1 = require("./models/BankAccountChangeRequestsModel");
-const FinancialChatsModel_1 = require("./models/FinancialChatsModel");
-const FinancialWorkFlowModel_1 = require("./models/FinancialWorkFlowModel");
-const FinancialAttachmentsModel_1 = require("./models/FinancialAttachmentsModel");
-const RequestTypeMasterModel_1 = require("./models/RequestTypeMasterModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -123,19 +110,6 @@ exports.AppDataSource = new typeorm_1.DataSource({
         HolidaysModel_1.Holidays,
         userRolesModel_1.UserRole,
         roleRightsModel_1.RoleRights,
-        PortalFeedbackModel_1.PortalFeedback,
-        NotificationModel_1.Notification,
-        FinancialRequestsModel_1.FinancialRequests,
-        FinancialApprovalsModel_1.FinancialApprovals,
-        FinancialSettingsModel_1.FinancialSettings,
-        PayslipRequestsModel_1.PayslipRequests,
-        SalaryCertificateRequestsModel_1.SalaryCertificateRequests,
-        AllowanceRequestsModel_1.AllowanceRequests,
-        ReimbursementRequestsModel_1.ReimbursementRequests,
-        BankAccountChangeRequestsModel_1.BankAccountChangeRequests,
-        FinancialChatsModel_1.FinancialChats,
-        FinancialWorkFlowModel_1.FinancialWorkFlow,
-        FinancialAttachmentsModel_1.FinancialAttachments,
-        RequestTypeMasterModel_1.RequestTypeMaster,
+        PortalFeedbackModel_1.PortalFeedback
     ],
 });

package/dist/index.d.ts

@@ -46,16 +46,3 @@ export * from './models/HolidaysModel';
 export * from './models/userRolesModel';
 export * from './models/roleRightsModel';
 export * from './models/PortalFeedbackModel';
-export * from './models/NotificationModel';
-export * from './models/FinancialRequestsModel';
-export * from './models/FinancialApprovalsModel';
-export * from './models/FinancialSettingsModel';
-export * from './models/PayslipRequestsModel';
-export * from './models/SalaryCertificateRequestsModel';
-export * from './models/AllowanceRequestsModel';
-export * from './models/ReimbursementRequestsModel';
-export * from './models/BankAccountChangeRequestsModel';
-export * from './models/FinancialChatsModel';
-export * from './models/FinancialAttachmentsModel';
-export * from './models/FinancialWorkFlowModel';
-export * from './models/RequestTypeMasterModel';

package/dist/index.js

@@ -62,16 +62,3 @@ __exportStar(require("./models/HolidaysModel"), exports);
 __exportStar(require("./models/userRolesModel"), exports);
 __exportStar(require("./models/roleRightsModel"), exports);
 __exportStar(require("./models/PortalFeedbackModel"), exports);
-__exportStar(require("./models/NotificationModel"), exports);
-__exportStar(require("./models/FinancialRequestsModel"), exports);
-__exportStar(require("./models/FinancialApprovalsModel"), exports);
-__exportStar(require("./models/FinancialSettingsModel"), exports);
-__exportStar(require("./models/PayslipRequestsModel"), exports);
-__exportStar(require("./models/SalaryCertificateRequestsModel"), exports);
-__exportStar(require("./models/AllowanceRequestsModel"), exports);
-__exportStar(require("./models/ReimbursementRequestsModel"), exports);
-__exportStar(require("./models/BankAccountChangeRequestsModel"), exports);
-__exportStar(require("./models/FinancialChatsModel"), exports);
-__exportStar(require("./models/FinancialAttachmentsModel"), exports);
-__exportStar(require("./models/FinancialWorkFlowModel"), exports);
-__exportStar(require("./models/RequestTypeMasterModel"), exports);

package/dist/models/LeaveApprovalDetailsModel.d.ts

@@ -0,0 +1,13 @@
+import { BaseModel } from './BaseModel';
+export declare enum ApprovalStatus {
+    PENDING = "Pending",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class LeaveApprovalDetails extends BaseModel {
+    leave_request_id: number;
+    level: number;
+    approver_id: number;
+    approval_status: ApprovalStatus;
+    constructor(leave_request_id: number, approver_id: number, approval_status: ApprovalStatus, level: number);
+}

package/dist/models/LeaveApprovalDetailsModel.js

@@ -0,0 +1,51 @@
+"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.LeaveApprovalDetails = exports.ApprovalStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var ApprovalStatus;
+(function (ApprovalStatus) {
+    ApprovalStatus["PENDING"] = "Pending";
+    ApprovalStatus["APPROVED"] = "Approved";
+    ApprovalStatus["REJECTED"] = "Rejected";
+})(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 {
+    constructor(leave_request_id, approver_id, approval_status, level) {
+        super();
+        this.leave_request_id = leave_request_id;
+        this.approver_id = approver_id;
+        this.approval_status = approval_status;
+        this.level = level;
+    }
+};
+exports.LeaveApprovalDetails = LeaveApprovalDetails;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "leave_request_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalDetails.prototype, "approver_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING, nullable: false }),
+    __metadata("design:type", String)
+], LeaveApprovalDetails.prototype, "approval_status", void 0);
+exports.LeaveApprovalDetails = LeaveApprovalDetails = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_details' }),
+    __metadata("design:paramtypes", [Number, Number, String, Number])
+], LeaveApprovalDetails);

package/dist/models/LeaveApprovalMatrixModel.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class LeaveApprovalMatrix extends BaseModel {
+    leave_type: number;
+    level: number;
+    approval_matrix: string;
+    constructor(leave_type: number, level: number, approval_matrix: string);
+}

package/dist/models/LeaveApprovalMatrixModel.js

@@ -0,0 +1,40 @@
+"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.LeaveApprovalMatrix = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+//This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
+let LeaveApprovalMatrix = class LeaveApprovalMatrix extends BaseModel_1.BaseModel {
+    constructor(leave_type, level, approval_matrix) {
+        super();
+        this.leave_type = leave_type;
+        this.level = level;
+        this.approval_matrix = approval_matrix;
+    }
+};
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "leave_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], LeaveApprovalMatrix.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
+    __metadata("design:type", String)
+], LeaveApprovalMatrix.prototype, "approval_matrix", void 0);
+exports.LeaveApprovalMatrix = LeaveApprovalMatrix = __decorate([
+    (0, typeorm_1.Entity)({ name: 'leave_approval_matrix' }),
+    __metadata("design:paramtypes", [Number, Number, String])
+], LeaveApprovalMatrix);

package/dist/models/userRolesModel.d.ts

@@ -14,6 +14,5 @@ export declare class UserRole extends BaseModel {
     user_id: number;
     department_id: number;
     section_id: number;
-    is_active: boolean;
-    constructor(role_id: number, user_id: number, department_id: number, section_id: number, is_active?: boolean);
+    constructor(role_id: number, user_id: number, department_id: number, section_id: number);
 }

package/dist/models/userRolesModel.js

@@ -23,13 +23,12 @@ exports.UserRole = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let UserRole = class UserRole extends BaseModel_1.BaseModel {
-    constructor(role_id, user_id, department_id, section_id, is_active = false) {
+    constructor(role_id, user_id, department_id, section_id) {
         super();
         this.role_id = role_id;
         this.user_id = user_id;
         this.department_id = department_id;
         this.section_id = section_id;
-        this.is_active = is_active;
     }
 };
 exports.UserRole = UserRole;
@@ -49,11 +48,7 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
     __metadata("design:type", Number)
 ], UserRole.prototype, "section_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], UserRole.prototype, "is_active", void 0);
 exports.UserRole = UserRole = __decorate([
     (0, typeorm_1.Entity)({ name: 'user_role' }),
-    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
+    __metadata("design:paramtypes", [Number, Number, Number, Number])
 ], UserRole);

package/package.json

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

package/src/data-source.ts

@@ -70,6 +70,12 @@ import { FinancialAttachments } from './models/FinancialAttachmentsModel';
 import { RequestTypeMaster } from './models/RequestTypeMasterModel';
 
 
+import { WorkflowTask } from './models/WorkflowTask';
+import { WorkflowTaskNames } from './models/WorkflowTaskNames';
+import { WorkflowDefinitions } from './models/WorkflowDefinitions';
+import { WorkflowHierarchy } from './models/WorkflowHierarchy';
+
+
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -142,5 +148,9 @@ export const AppDataSource = new DataSource({
     FinancialWorkFlow,
     FinancialAttachments,
     RequestTypeMaster,
+    WorkflowTask,
+    WorkflowTaskNames,
+    WorkflowDefinitions,
+    WorkflowHierarchy,
   ],
 });

package/src/index.ts

@@ -59,3 +59,7 @@ export * from './models/FinancialChatsModel';
 export * from './models/FinancialAttachmentsModel';
 export * from './models/FinancialWorkFlowModel';
 export * from './models/RequestTypeMasterModel';
+export * from './models/WorkflowTask';
+export * from './models/WorkflowTaskNames';
+export * from './models/WorkflowDefinitions';
+export * from './models/WorkflowHierarchy';

package/src/models/FinancialRequestsModel.ts

@@ -11,7 +11,6 @@ import type { FinancialChats } from './FinancialChatsModel';
 import type { FinancialApprovals } from './FinancialApprovalsModel';
 import type { FinancialWorkFlow } from './FinancialWorkFlowModel';
 import type { FinancialAttachments } from './FinancialAttachmentsModel';
-import type { RequestTypeMaster } from './RequestTypeMasterModel';
 
 export enum FinancialRequestStatus {
   DRAFT = "Draft",
@@ -50,9 +49,6 @@ export class FinancialRequests extends BaseModel {
   @Column({ type: 'varchar', length: 20 })
   contact_number: string;
 
-  @Column({ type: 'int' })
-  request_type_id: number;
-
   @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
   request_date: Date;
 
@@ -83,6 +79,9 @@ export class FinancialRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   reporting_manager: number | null;
 
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  workflow_execution_id: string | null;
+
   @OneToOne('PayslipRequests', 'financialRequest', { nullable: true })
   payslipRequest?: PayslipRequests;
 
@@ -110,17 +109,12 @@ export class FinancialRequests extends BaseModel {
   @OneToMany('FinancialAttachments', 'financialRequest')
   attachments?: FinancialAttachments[];
 
-  @ManyToOne('RequestTypeMaster')
-  @JoinColumn({ name: 'request_type_id' })
-  requestType?: RequestTypeMaster;
-
   constructor(
     user_id: number,
     employee_id: string,
     employee_name: string,
     email_address: string,
     contact_number: string,
-    request_type_id: number,
     service_id: number | null,
     sub_service_id: number | null,
     section_id: number | null,
@@ -132,7 +126,6 @@ export class FinancialRequests extends BaseModel {
     this.employee_name = employee_name;
     this.email_address = email_address;
     this.contact_number = contact_number;
-    this.request_type_id = request_type_id;
     this.request_date = new Date();
     this.request_status = FinancialRequestStatus.PENDING;
     this.service_id = service_id;

package/src/models/LeaveApprovalsModel.ts

@@ -20,20 +20,28 @@ export class LeaveApprovalDetails extends BaseModel {
   @Column({ type: 'int', nullable: true })
   approver_user_id: number;
 
-  @Column({ type: 'int', nullable: false })
+  @Column({ type: 'int', nullable: true })
   approver_role_id: number;
 
+  @Column({ type: 'int', nullable: true })
+  department_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  section_id: number;
+
   @Column({ type: 'varchar', length: 255, nullable: false })
   comment: string;
 
   @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
   approval_status: ApprovalStatus;
 
-  constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number) {
+  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;
     this.approver_role_id = approver_role_id;
+    this.department_id = department_id;
+    this.section_id = section_id;
     this.comment = comment;
     this.approval_status = approval_status;
     this.level = level;

package/src/models/LeaveRequestModel.ts

@@ -85,8 +85,17 @@ export class LeaveRequests extends BaseModel {
   @Column({ type: 'int', nullable: true })
   mounring_leave_relation: number;
 
+  @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;
+
 
-  constructor(user_id: string, leave_for: Leave_For, leave_type: 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) {
+  constructor(user_id: string, leave_for: Leave_For, leave_type: 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();
     this.user_id = user_id;
     this.leave_for = leave_for;
@@ -112,5 +121,8 @@ export class LeaveRequests extends BaseModel {
     this.activity_title = activity_title;
     this.relationship = relationship;
     this.mounring_leave_relation = mounring_leave_relation;
+    this.service_id = service_id;
+    this.sub_service_id = sub_service_id;
+    this.workflow_execution_id = workflow_execution_id;
   }
 }

package/src/models/WorkflowDefinitions.ts

@@ -0,0 +1,71 @@
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { FMServices } from './FMServices';
+import { FMSubServices } from './FMSubservices';
+
+@Entity({ name: 'workflow_definitions' })
+export class WorkflowDefinitions extends BaseModel {
+
+    @Column({ type: 'varchar', length: 100, nullable: false})
+    name: string;
+
+    @Column({ type: 'text', nullable: true })
+    description: string;
+
+    @Column({ type: 'integer', default: 1 })
+    version: number;
+
+    @Column({ type: 'boolean', default: true })
+    is_active: boolean;
+
+    @Column({ 
+        type: 'varchar', 
+        length: 20, 
+        nullable: true,
+        enum: ['internal', 'external', 'none']
+    })
+    service_type: 'internal' | 'external' | 'none';
+
+    @Column({ type: 'bigint', nullable: true })
+    service_id: number | null;
+
+    @ManyToOne(() => FMServices)
+    @JoinColumn({ name: 'service_id' })
+    service: FMServices;
+
+    @Column({ type: 'bigint', nullable: true })
+    sub_service_id: number | null;
+
+    @ManyToOne(() => FMSubServices)
+    @JoinColumn({ name: 'sub_service_id' })
+    sub_service: FMSubServices;
+
+
+    @Column({ 
+        type: 'varchar', 
+        length: 20, 
+        default: 'draft',
+        enum: ['draft', 'published']
+    })
+    status: 'draft' | 'published' ;
+    constructor(
+        name: string,
+        description?: string,
+        version?: number,
+        is_active?: boolean,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        status?: 'draft' | 'published',
+        service_type?: 'internal' | 'external' | 'none'
+    ) {
+        super();
+        this.name = name;
+        this.description = description || '';
+        this.version = version || 1;
+        this.is_active = is_active !== undefined ? is_active : true;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.status = status || 'draft';
+        this.service_type = service_type || 'none';
+    }
+}

package/src/models/WorkflowHierarchy.ts

@@ -0,0 +1,67 @@
+import { Column, Entity, ManyToOne, JoinColumn, Unique } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { WorkflowDefinitions } from './WorkflowDefinitions';
+
+@Entity({ name: 'workflow_hierarchy' })
+@Unique(['workflow_definition_id', 'step_order'])
+export class WorkflowHierarchy extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    workflow_definition_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    department_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    section_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    approval_role_id: number;
+
+    @Column({ type: 'integer', nullable: true })
+    approval_user_id: number;
+
+    @Column({ type: 'varchar', length: 255, nullable: true })
+    taskname: string | null;
+
+    @Column({ type: 'varchar', length: 50, nullable: true })
+    status: string | null;
+
+    @Column({ type: 'jsonb', nullable: true })
+    task: any | null;
+
+    @Column({ type: 'integer', nullable: false })
+    step_order: number;
+
+    @Column({ type: 'boolean', default: true })
+    is_required: boolean;
+
+    @ManyToOne(() => WorkflowDefinitions, { onDelete: 'CASCADE' })
+    @JoinColumn({ name: 'workflow_definition_id' })
+    workflow_definition: WorkflowDefinitions;
+
+    constructor(
+        workflow_definition_id: number,
+        department_id: number,
+        section_id: number,
+        approval_role_id: number,
+        approval_user_id: number,
+        step_order: number,
+        is_required?: boolean,
+        taskname?: string,
+        status?: string,
+        task?: any
+    ) {
+        super();
+        this.workflow_definition_id = workflow_definition_id;
+        this.department_id = department_id;
+        this.section_id = section_id;
+        this.approval_role_id = approval_role_id;
+        this.approval_user_id = approval_user_id;
+        this.step_order = step_order;
+        this.is_required = is_required !== undefined ? is_required : true;
+        this.taskname = taskname || null;
+        this.status = status || null;
+        this.task = task || null;
+    }
+}

package/src/models/WorkflowTask.ts

@@ -0,0 +1,26 @@
+import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'workflow_tasks' })
+export class WorkflowTask extends BaseModel {
+
+    @PrimaryGeneratedColumn()
+    task_id: number;
+
+    @Column({ type: 'varchar', length: 100, nullable: false })
+    name: string;
+
+    @Column({ type: 'varchar', length: 200, nullable: true })
+    task_type: string;
+
+    constructor(
+        name: string,
+        task_id?: number,
+        task_type?: string
+    ) {
+        super();
+        this.name = name;
+        this.task_id = task_id || 0;
+        this.task_type = task_type || '';
+    }
+}

package/src/models/WorkflowTaskNames.ts

@@ -0,0 +1,31 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@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: 'varchar', length: 200, nullable: true })
+    task_type: string;
+
+    constructor(
+        name: string,
+        task_id: number,
+        description: string,
+        task_type: string
+    ) {
+        super();
+        this.name = name;
+        this.task_id = task_id;
+        this.description = description;
+        this.task_type = task_type;
+    }
+}

package/dist/models/AllowanceRequestsModel.d.ts

@@ -1,13 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { FinancialRequests } from "./FinancialRequestsModel";
-export declare class AllowanceRequests extends BaseModel {
-    financial_request_id: number;
-    allowance_type_id: number;
-    allowance_amount: number;
-    approved_allowance_amount: number;
-    currency: string;
-    contact_number: string;
-    description: string;
-    financialRequest?: FinancialRequests;
-    constructor(financial_request_id: number, allowance_type_id: number, allowance_amount: number, approved_allowance_amount: number, currency: string, contact_number: string, description: string);
-}