@platform-modules/civil-aviation-authority 2.3.62 → 2.3.65

package/dist/data-source.js

@@ -126,6 +126,7 @@ const RequestForCoverageChatModel_1 = require("./models/RequestForCoverageChatMo
 const RequestForCoverageAttachmentModel_1 = require("./models/RequestForCoverageAttachmentModel");
 const CashAllowanceLeaveRequestModel_1 = require("./models/CashAllowanceLeaveRequestModel");
 const PromotionRequestModel_1 = require("./models/PromotionRequestModel");
+const AnnualIncrementRequestModel_1 = require("./models/AnnualIncrementRequestModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -255,6 +256,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         AssignTasksEmpAttachmentModel_1.AssignTasksEmpRequestAttachment,
         AssignTasksEmpChatModel_1.AssignTasksEmpRequestChat,
         CashAllowanceLeaveRequestModel_1.CashAllowanceLeaveRequest,
-        PromotionRequestModel_1.PromotionRequest
+        PromotionRequestModel_1.PromotionRequest,
+        AnnualIncrementRequestModel_1.AnnualIncrementRequest
     ],
 });

package/dist/index.d.ts

@@ -199,3 +199,5 @@ export * from './models/CashAllowanceLeaveRequestModel';
 export { CashAllowanceLeaveRequestStatus } from './models/CashAllowanceLeaveRequestModel';
 export * from './models/PromotionRequestModel';
 export { PromotionRequestStatus } from './models/PromotionRequestModel';
+export * from './models/AnnualIncrementRequestModel';
+export { AnnualIncrementRequestStatus } from './models/AnnualIncrementRequestModel';

package/dist/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestForCoverageWorkFlowStatus = exports.RequestForCoverageNewsSize = exports.RequestForCoverageRequestStatus = exports.ServiceTransferRequestType = exports.SalaryDetailsType = exports.ServiceTransferRequestStatus = exports.TemporaryAssignmentRequestType = exports.TemporaryAssignmentRequestStatus = exports.SecondmentRequestStatus = exports.TrainingRoomBookingChatStatus = exports.TrainingRoomBookingMessageType = exports.TrainingRoomBookingRequestChat = exports.TrainingRoomBookingRequestAttachment = exports.TrainingRoomBookingWorkFlowStatus = exports.TrainingRoomBookingApprovalStatus = exports.TrainingRoomBookingRoomType = exports.TrainingRoomBookingRequestStatus = exports.AnnualTrainingPlanChatStatus = exports.AnnualTrainingPlanMessageType = exports.AnnualTrainingPlanRequestChat = exports.AnnualTrainingPlanRequestAttachment = exports.AnnualTrainingPlanWorkFlowStatus = exports.AnnualTrainingPlanApprovalStatus = exports.AnnualTrainingPlanPlace = exports.AnnualTrainingPlanRequestStatus = exports.StudyLeaveChatStatus = exports.StudyLeaveMessageType = exports.StudyLeaveRequestChat = exports.StudyLeaveRequestAttachment = exports.StudyLeaveWorkFlowStatus = exports.StudyLeaveApprovalStatus = exports.StudyLeaveRequestStatus = exports.TrainingMessageType = exports.TrainingRequestChat = exports.TrainingRequestAttachment = exports.TrainingWorkFlowStatus = exports.TrainingApprovalStatus = exports.TrainingRequestStatus = exports.HrServiceChatStatus = exports.HrServiceMessageType = exports.HrServiceRequestChat = exports.HrServiceRequestAttachment = exports.HrServiceWorkFlowStatus = exports.HrServiceApprovalStatus = exports.HrServiceRequestStatus = exports.LogisticsVehicleMaintenanceWorkFlowStatus = exports.LogisticsVehicleMaintenanceMessageType = exports.LogisticsVehicleMaintenanceApprovalStatus = exports.VehicleMaintenanceStatus = exports.VehicleMaintenanceType = void 0;
-exports.PromotionRequestStatus = exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = void 0;
+exports.AnnualIncrementRequestStatus = exports.PromotionRequestStatus = exports.CashAllowanceLeaveRequestStatus = exports.NotificationFrequency = exports.ServicesNotificationTriggerType = exports.NewResourceRequestStatus = exports.JobTransferRequestStatus = exports.ShiftAllowanceValue = exports.ShiftAllowanceRequestStatus = exports.AssignTasksEmpMessageType = exports.AssignTasksEmpRequestChat = exports.AssignTasksEmpRequestAttachment = exports.AssignTasksEmpWorkFlowStatus = exports.AssignTasksEmpApprovalStatus = exports.AssignTasksEmpPriority = exports.AssignTasksEmpStatus = exports.RequestForCoverageRequestAttachment = exports.RequestForCoverageChatStatus = exports.RequestForCoverageMessageType = exports.RequestForCoverageRequestChat = exports.RequestForCoverageApprovalStatus = void 0;
 __exportStar(require("./models/user"), exports);
 __exportStar(require("./models/role"), exports);
 __exportStar(require("./models/user-sessions"), exports);
@@ -300,3 +300,7 @@ Object.defineProperty(exports, "CashAllowanceLeaveRequestStatus", { enumerable:
 __exportStar(require("./models/PromotionRequestModel"), exports);
 var PromotionRequestModel_1 = require("./models/PromotionRequestModel");
 Object.defineProperty(exports, "PromotionRequestStatus", { enumerable: true, get: function () { return PromotionRequestModel_1.PromotionRequestStatus; } });
+// Annual Increment (Periodic Allowance) Request Service
+__exportStar(require("./models/AnnualIncrementRequestModel"), exports);
+var AnnualIncrementRequestModel_1 = require("./models/AnnualIncrementRequestModel");
+Object.defineProperty(exports, "AnnualIncrementRequestStatus", { enumerable: true, get: function () { return AnnualIncrementRequestModel_1.AnnualIncrementRequestStatus; } });

package/dist/models/AnnualIncrementRequestModel.d.ts

@@ -0,0 +1,31 @@
+import { BaseModel } from "./BaseModel";
+export declare enum AnnualIncrementRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+export declare class AnnualIncrementRequest extends BaseModel {
+    req_user_department_id: number | null;
+    req_user_section_id: number | null;
+    req_user_position_id: number | null;
+    service_id: number | null;
+    sub_service_id: number | null;
+    user_id: number;
+    description: string | null;
+    status: AnnualIncrementRequestStatus;
+    reviewer_user_id: number | null;
+    assigned_to_user_id: number | null;
+    assigned_at: Date | null;
+    workflow_execution_id: string | null;
+    employee_name: string;
+    employee_id: string;
+    allowance_year: number;
+    effective_date: Date;
+    current_basic_salary: number | null;
+    increment_percentage: number | null;
+    new_basic_salary: number | null;
+    constructor(user_id: number, status?: AnnualIncrementRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, employee_name?: string, employee_id?: string, allowance_year?: number, effective_date?: Date, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null);
+}

package/dist/models/AnnualIncrementRequestModel.js

@@ -0,0 +1,128 @@
+"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.AnnualIncrementRequest = exports.AnnualIncrementRequestStatus = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+var AnnualIncrementRequestStatus;
+(function (AnnualIncrementRequestStatus) {
+    AnnualIncrementRequestStatus["PENDING"] = "Pending";
+    AnnualIncrementRequestStatus["ASSIGNED"] = "Assigned";
+    AnnualIncrementRequestStatus["IN_PROGRESS"] = "In Progress";
+    AnnualIncrementRequestStatus["COMPLETED"] = "Completed";
+    AnnualIncrementRequestStatus["APPROVED"] = "Approved";
+    AnnualIncrementRequestStatus["REJECTED"] = "Rejected";
+})(AnnualIncrementRequestStatus || (exports.AnnualIncrementRequestStatus = AnnualIncrementRequestStatus = {}));
+let AnnualIncrementRequest = class AnnualIncrementRequest extends BaseModel_1.BaseModel {
+    constructor(user_id, status = AnnualIncrementRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, employee_name, employee_id, allowance_year, effective_date, current_basic_salary, increment_percentage, new_basic_salary) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.employee_name = employee_name || "";
+        this.employee_id = employee_id || "";
+        this.allowance_year = allowance_year || new Date().getFullYear();
+        this.effective_date = effective_date || new Date();
+        this.current_basic_salary = current_basic_salary || null;
+        this.increment_percentage = increment_percentage || null;
+        this.new_basic_salary = new_basic_salary || null;
+    }
+};
+exports.AnnualIncrementRequest = AnnualIncrementRequest;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "req_user_department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "req_user_section_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "req_user_position_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "sub_service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualIncrementRequest.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "text", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "enum", enum: AnnualIncrementRequestStatus, default: AnnualIncrementRequestStatus.PENDING, nullable: false }),
+    __metadata("design:type", String)
+], AnnualIncrementRequest.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "reviewer_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "assigned_to_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "timestamp", nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "assigned_at", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "workflow_execution_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], AnnualIncrementRequest.prototype, "employee_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 100, nullable: false }),
+    __metadata("design:type", String)
+], AnnualIncrementRequest.prototype, "employee_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], AnnualIncrementRequest.prototype, "allowance_year", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "date", nullable: false }),
+    __metadata("design:type", Date)
+], AnnualIncrementRequest.prototype, "effective_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "current_basic_salary", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 5, scale: 2, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "increment_percentage", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "new_basic_salary", void 0);
+exports.AnnualIncrementRequest = AnnualIncrementRequest = __decorate([
+    (0, typeorm_1.Entity)({ name: "annual_increment_requests" }),
+    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Number, Date, Object, Object, Object])
+], AnnualIncrementRequest);

package/dist/models/ShiftAllowanceRequestModel.d.ts

@@ -32,6 +32,8 @@ export declare class ShiftAllowanceRequest extends BaseModel {
     allowance_value: ShiftAllowanceValue;
     shift_start_date: Date;
     shift_end_date: Date;
+    start_time: string | null;
+    end_time: string | null;
     reason_for_request: string | null;
-    constructor(user_id: number, status?: ShiftAllowanceRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, employee_name?: string, employee_id?: string, job_title?: string, financial_grade?: string, allowance_value?: ShiftAllowanceValue, shift_start_date?: Date, shift_end_date?: Date, reason_for_request?: string | null);
+    constructor(user_id: number, status?: ShiftAllowanceRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, employee_name?: string, employee_id?: string, job_title?: string, financial_grade?: string, allowance_value?: ShiftAllowanceValue, shift_start_date?: Date, shift_end_date?: Date, start_time?: string | null, end_time?: string | null, reason_for_request?: string | null);
 }

package/dist/models/ShiftAllowanceRequestModel.js

@@ -28,7 +28,7 @@ var ShiftAllowanceValue;
     ShiftAllowanceValue["SEVENTY_PERCENT"] = "70%";
 })(ShiftAllowanceValue || (exports.ShiftAllowanceValue = ShiftAllowanceValue = {}));
 let ShiftAllowanceRequest = class ShiftAllowanceRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, status = ShiftAllowanceRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, employee_name, employee_id, job_title, financial_grade, allowance_value, shift_start_date, shift_end_date, reason_for_request) {
+    constructor(user_id, status = ShiftAllowanceRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, employee_name, employee_id, job_title, financial_grade, allowance_value, shift_start_date, shift_end_date, start_time, end_time, reason_for_request) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -49,6 +49,8 @@ let ShiftAllowanceRequest = class ShiftAllowanceRequest extends BaseModel_1.Base
         this.allowance_value = allowance_value || ShiftAllowanceValue.TWENTY_TWO_PERCENT;
         this.shift_start_date = shift_start_date || new Date();
         this.shift_end_date = shift_end_date || new Date();
+        this.start_time = start_time || null;
+        this.end_time = end_time || null;
         this.reason_for_request = reason_for_request || null;
     }
 };
@@ -129,6 +131,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: "date", nullable: false }),
     __metadata("design:type", Date)
 ], ShiftAllowanceRequest.prototype, "shift_end_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "time", nullable: true }),
+    __metadata("design:type", Object)
+], ShiftAllowanceRequest.prototype, "start_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "time", nullable: true }),
+    __metadata("design:type", Object)
+], ShiftAllowanceRequest.prototype, "end_time", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
@@ -136,5 +146,5 @@ __decorate([
 exports.ShiftAllowanceRequest = ShiftAllowanceRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "shift_allowance_requests" }),
     __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, String, String, String, Date,
-        Date, Object])
+        Date, Object, Object, Object])
 ], ShiftAllowanceRequest);

package/dist/models/Workflows.d.ts

@@ -0,0 +1,9 @@
+import { BaseModel } from './BaseModel';
+export declare class Workflows extends BaseModel {
+    name: string;
+    service_id: number;
+    sub_service_id: number;
+    request_for: string;
+    levels: number;
+    constructor(name: string, service_id: number, sub_service_id: number, request_for: string, levels: number);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.62",
+  "version": "2.3.65",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/data-source.ts

@@ -124,6 +124,7 @@ import { RequestForCoverageRequestChat } from './models/RequestForCoverageChatMo
 import { RequestForCoverageRequestAttachment } from './models/RequestForCoverageAttachmentModel';
 import { CashAllowanceLeaveRequest } from './models/CashAllowanceLeaveRequestModel';
 import { PromotionRequest } from './models/PromotionRequestModel';
+import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -254,6 +255,7 @@ export const AppDataSource = new DataSource({
     AssignTasksEmpRequestAttachment,
     AssignTasksEmpRequestChat,
     CashAllowanceLeaveRequest,
-    PromotionRequest
+    PromotionRequest,
+    AnnualIncrementRequest
   ],
 });

package/src/index.ts

@@ -224,4 +224,8 @@ export  { CashAllowanceLeaveRequestStatus } from './models/CashAllowanceLeaveReq
 
 // Promotion Request Service
 export * from './models/PromotionRequestModel';
-export { PromotionRequestStatus } from './models/PromotionRequestModel';
+export { PromotionRequestStatus } from './models/PromotionRequestModel';
+
+// Annual Increment (Periodic Allowance) Request Service
+export * from './models/AnnualIncrementRequestModel';
+export { AnnualIncrementRequestStatus } from './models/AnnualIncrementRequestModel';

package/src/models/AnnualIncrementRequestModel.ts

@@ -0,0 +1,115 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum AnnualIncrementRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "annual_increment_requests" })
+export class AnnualIncrementRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: AnnualIncrementRequestStatus, default: AnnualIncrementRequestStatus.PENDING, nullable: false })
+    status: AnnualIncrementRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // Annual Increment specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    employee_name: string;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "integer", nullable: false })
+    allowance_year: number;
+
+    @Column({ type: "date", nullable: false })
+    effective_date: Date;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    current_basic_salary: number | null;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    increment_percentage: number | null;
+
+    @Column({ type: "decimal", precision: 10, scale: 3, nullable: true })
+    new_basic_salary: number | null;
+
+    constructor(
+        user_id: number,
+        status: AnnualIncrementRequestStatus = AnnualIncrementRequestStatus.PENDING,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null,
+        req_user_position_id?: number | null,
+        description?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        employee_name?: string,
+        employee_id?: string,
+        allowance_year?: number,
+        effective_date?: Date,
+        current_basic_salary?: number | null,
+        increment_percentage?: number | null,
+        new_basic_salary?: number | null
+    ) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.employee_name = employee_name || "";
+        this.employee_id = employee_id || "";
+        this.allowance_year = allowance_year || new Date().getFullYear();
+        this.effective_date = effective_date || new Date();
+        this.current_basic_salary = current_basic_salary || null;
+        this.increment_percentage = increment_percentage || null;
+        this.new_basic_salary = new_basic_salary || null;
+    }
+}

package/src/models/HrServiceRequestModel.ts

@@ -1,167 +1,167 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-export enum HrServiceRequestStatus {
-    PENDING = "Pending",
-    ASSIGNED = "Assigned",
-    IN_PROGRESS = "In Progress",
-    COMPLETED = "Completed",
-    APPROVED = "Approved",
-    REJECTED = "Rejected"
-}
-
-@Entity({ name: "hr_service_requests" })
-export class HrServiceRequest extends BaseModel {
-    @Column({ type: "integer", nullable: true })
-    req_user_department_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_section_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    req_user_position_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    service_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    sub_service_id: number | null;
-
-    @Column({ type: "integer", nullable: false })
-    user_id: number;
-
-    @Column({ type: "text", nullable: true })
-    description: string | null;
-
-    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
-    status: HrServiceRequestStatus;
-
-    @Column({ type: "integer", nullable: true })
-    reviewer_user_id: number | null;
-
-    @Column({ type: "integer", nullable: true })
-    assigned_to_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    assigned_at: Date | null;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    workflow_execution_id: string | null;
-
-    // Assignment Decision specific fields
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_employee_name: string;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    civil_id_card_number: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: false })
-    employee_id: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    current_job_position: string;
-
-    @Column({ type: "varchar", length: 255, nullable: false })
-    assigned_job_position: string;
-
-    @Column({ type: "date", nullable: false })
-    start_date: Date;
-
-    @Column({ type: "date", nullable: false })
-    end_date: Date;
-
-    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
-    assignment_allowance: number | null; // 0-100 percentage
-
-    @Column({ type: "varchar", length: 20, nullable: false })
-    phone_number: string;
-
-    @Column({ type: "text", nullable: false })
-    reason_for_request: string;
-
-    // Replacement tracking fields
-    @Column({ type: "boolean", default: false, nullable: false })
-    is_replaced: boolean;
-
-    @Column({ type: "varchar", length: 255, nullable: true })
-    replacement_employee_name: string | null;
-
-    @Column({ type: "varchar", length: 100, nullable: true })
-    replacement_employee_id: string | null;
-
-    @Column({ type: "varchar", length: 50, nullable: true })
-    replacement_civil_id_card_number: string | null;
-
-    @Column({ type: "text", nullable: true })
-    replacement_reason: string | null;
-
-    @Column({ type: "integer", nullable: true })
-    replaced_by_user_id: number | null;
-
-    @Column({ type: "timestamp", nullable: true })
-    replaced_at: Date | null;
-
-    constructor(
-        user_id: number,
-        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        req_user_department_id?: number | null,
-        req_user_section_id?: number | null,
-        req_user_position_id?: number | null,
-        description?: string | null,
-        reviewer_user_id?: number | null,
-        assigned_to_user_id?: number | null,
-        assigned_at?: Date | null,
-        workflow_execution_id?: string | null,
-        assigned_employee_name?: string,
-        civil_id_card_number?: string | null,
-        employee_id?: string,
-        current_job_position?: string,
-        assigned_job_position?: string,
-        start_date?: Date,
-        end_date?: Date,
-        assignment_allowance?: number | null,
-        phone_number?: string,
-        reason_for_request?: string,
-        is_replaced?: boolean,
-        replacement_employee_name?: string | null,
-        replacement_employee_id?: string | null,
-        replacement_civil_id_card_number?: string | null,
-        replacement_reason?: string | null,
-        replaced_by_user_id?: number | null,
-        replaced_at?: Date | null
-    ) {
-        super();
-        this.user_id = user_id;
-        this.status = status;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.req_user_department_id = req_user_department_id || null;
-        this.req_user_section_id = req_user_section_id || null;
-        this.req_user_position_id = req_user_position_id || null;
-        this.description = description || null;
-        this.reviewer_user_id = reviewer_user_id || null;
-        this.assigned_to_user_id = assigned_to_user_id || null;
-        this.assigned_at = assigned_at || null;
-        this.workflow_execution_id = workflow_execution_id || null;
-        this.assigned_employee_name = assigned_employee_name || "";
-        this.civil_id_card_number = civil_id_card_number || null;
-        this.employee_id = employee_id || "";
-        this.current_job_position = current_job_position || "";
-        this.assigned_job_position = assigned_job_position || "";
-        this.start_date = start_date || new Date();
-        this.end_date = end_date || new Date();
-        this.assignment_allowance = assignment_allowance || null;
-        this.phone_number = phone_number || "";
-        this.reason_for_request = reason_for_request || "";
-        this.is_replaced = is_replaced || false;
-        this.replacement_employee_name = replacement_employee_name || null;
-        this.replacement_employee_id = replacement_employee_id || null;
-        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
-        this.replacement_reason = replacement_reason || null;
-        this.replaced_by_user_id = replaced_by_user_id || null;
-        this.replaced_at = replaced_at || null;
-    }
-}
-
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+export enum HrServiceRequestStatus {
+    PENDING = "Pending",
+    ASSIGNED = "Assigned",
+    IN_PROGRESS = "In Progress",
+    COMPLETED = "Completed",
+    APPROVED = "Approved",
+    REJECTED = "Rejected"
+}
+
+@Entity({ name: "hr_service_requests" })
+export class HrServiceRequest extends BaseModel {
+    @Column({ type: "integer", nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    req_user_position_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    service_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    sub_service_id: number | null;
+
+    @Column({ type: "integer", nullable: false })
+    user_id: number;
+
+    @Column({ type: "text", nullable: true })
+    description: string | null;
+
+    @Column({ type: "enum", enum: HrServiceRequestStatus, default: HrServiceRequestStatus.PENDING, nullable: false })
+    status: HrServiceRequestStatus;
+
+    @Column({ type: "integer", nullable: true })
+    reviewer_user_id: number | null;
+
+    @Column({ type: "integer", nullable: true })
+    assigned_to_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    assigned_at: Date | null;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    workflow_execution_id: string | null;
+
+    // Assignment Decision specific fields
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_employee_name: string;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    civil_id_card_number: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: false })
+    employee_id: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    current_job_position: string;
+
+    @Column({ type: "varchar", length: 255, nullable: false })
+    assigned_job_position: string;
+
+    @Column({ type: "date", nullable: false })
+    start_date: Date;
+
+    @Column({ type: "date", nullable: false })
+    end_date: Date;
+
+    @Column({ type: "decimal", precision: 5, scale: 2, nullable: true })
+    assignment_allowance: number | null; // 0-100 percentage
+
+    @Column({ type: "varchar", length: 20, nullable: false })
+    phone_number: string;
+
+    @Column({ type: "text", nullable: false })
+    reason_for_request: string;
+
+    // Replacement tracking fields
+    @Column({ type: "boolean", default: false, nullable: false })
+    is_replaced: boolean;
+
+    @Column({ type: "varchar", length: 255, nullable: true })
+    replacement_employee_name: string | null;
+
+    @Column({ type: "varchar", length: 100, nullable: true })
+    replacement_employee_id: string | null;
+
+    @Column({ type: "varchar", length: 50, nullable: true })
+    replacement_civil_id_card_number: string | null;
+
+    @Column({ type: "text", nullable: true })
+    replacement_reason: string | null;
+
+    @Column({ type: "integer", nullable: true })
+    replaced_by_user_id: number | null;
+
+    @Column({ type: "timestamp", nullable: true })
+    replaced_at: Date | null;
+
+    constructor(
+        user_id: number,
+        status: HrServiceRequestStatus = HrServiceRequestStatus.PENDING,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null,
+        req_user_position_id?: number | null,
+        description?: string | null,
+        reviewer_user_id?: number | null,
+        assigned_to_user_id?: number | null,
+        assigned_at?: Date | null,
+        workflow_execution_id?: string | null,
+        assigned_employee_name?: string,
+        civil_id_card_number?: string | null,
+        employee_id?: string,
+        current_job_position?: string,
+        assigned_job_position?: string,
+        start_date?: Date,
+        end_date?: Date,
+        assignment_allowance?: number | null,
+        phone_number?: string,
+        reason_for_request?: string,
+        is_replaced?: boolean,
+        replacement_employee_name?: string | null,
+        replacement_employee_id?: string | null,
+        replacement_civil_id_card_number?: string | null,
+        replacement_reason?: string | null,
+        replaced_by_user_id?: number | null,
+        replaced_at?: Date | null
+    ) {
+        super();
+        this.user_id = user_id;
+        this.status = status;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.req_user_position_id = req_user_position_id || null;
+        this.description = description || null;
+        this.reviewer_user_id = reviewer_user_id || null;
+        this.assigned_to_user_id = assigned_to_user_id || null;
+        this.assigned_at = assigned_at || null;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.assigned_employee_name = assigned_employee_name || "";
+        this.civil_id_card_number = civil_id_card_number || null;
+        this.employee_id = employee_id || "";
+        this.current_job_position = current_job_position || "";
+        this.assigned_job_position = assigned_job_position || "";
+        this.start_date = start_date || new Date();
+        this.end_date = end_date || new Date();
+        this.assignment_allowance = assignment_allowance || null;
+        this.phone_number = phone_number || "";
+        this.reason_for_request = reason_for_request || "";
+        this.is_replaced = is_replaced || false;
+        this.replacement_employee_name = replacement_employee_name || null;
+        this.replacement_employee_id = replacement_employee_id || null;
+        this.replacement_civil_id_card_number = replacement_civil_id_card_number || null;
+        this.replacement_reason = replacement_reason || null;
+        this.replaced_by_user_id = replaced_by_user_id || null;
+        this.replaced_at = replaced_at || null;
+    }
+}
+

package/src/models/ShiftAllowanceRequestModel.ts

@@ -76,6 +76,12 @@ export class ShiftAllowanceRequest extends BaseModel {
     @Column({ type: "date", nullable: false })
     shift_end_date: Date;
 
+    @Column({ type: "time", nullable: true })
+    start_time: string | null;
+
+    @Column({ type: "time", nullable: true })
+    end_time: string | null;
+
     @Column({ type: "text", nullable: true })
     reason_for_request: string | null;
 
@@ -99,6 +105,8 @@ export class ShiftAllowanceRequest extends BaseModel {
         allowance_value?: ShiftAllowanceValue,
         shift_start_date?: Date,
         shift_end_date?: Date,
+        start_time?: string | null,
+        end_time?: string | null,
         reason_for_request?: string | null
     ) {
         super();
@@ -121,6 +129,8 @@ export class ShiftAllowanceRequest extends BaseModel {
         this.allowance_value = allowance_value || ShiftAllowanceValue.TWENTY_TWO_PERCENT;
         this.shift_start_date = shift_start_date || new Date();
         this.shift_end_date = shift_end_date || new Date();
+        this.start_time = start_time || null;
+        this.end_time = end_time || null;
         this.reason_for_request = reason_for_request || null;
     }
 }

package/dist/models/HotelreservationModal.d.ts

@@ -1,30 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare enum MealType {
-    BREAKFAST = "Breakfast",
-    LUNCH = "Lunch",
-    DINNER = "Dinner"
-}
-export declare enum ServiceTypes {
-    LAUNDRY = "Laundry",
-    TELEPHONE = "Telephone Service"
-}
-export declare class HotelReservation extends BaseModel {
-    type_of_accommodation: string;
-    price: number;
-    meal: MealType;
-    service: ServiceTypes;
-    date_of_request: Date;
-    hotel_name: string;
-    check_in_date: Date;
-    check_in_time: string;
-    check_out_date: Date;
-    check_out_time: string;
-    number_of_guests: number;
-    description: string;
-    attachment_url: string;
-    requested_by: string;
-    visitor_name: string;
-    hr_approval: boolean;
-    pr_approval: boolean;
-    constructor(type_of_accommodation: string, price: number, meal: MealType, service: ServiceTypes, date_of_request: Date, hotel_name: string, check_in_date: Date, check_in_time: string, check_out_date: Date, check_out_time: string, number_of_guests: number, description: string, requested_by: string, visitor_name: string, hr_approval: boolean, pr_approval: boolean);
-}

package/dist/models/HotelreservationModal.js

@@ -1,119 +0,0 @@
-"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.HotelReservation = exports.ServiceTypes = exports.MealType = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-var MealType;
-(function (MealType) {
-    MealType["BREAKFAST"] = "Breakfast";
-    MealType["LUNCH"] = "Lunch";
-    MealType["DINNER"] = "Dinner";
-})(MealType || (exports.MealType = MealType = {}));
-var ServiceTypes;
-(function (ServiceTypes) {
-    ServiceTypes["LAUNDRY"] = "Laundry";
-    ServiceTypes["TELEPHONE"] = "Telephone Service";
-})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
-let HotelReservation = class HotelReservation extends BaseModel_1.BaseModel {
-    constructor(type_of_accommodation, price, meal, service, date_of_request, hotel_name, check_in_date, check_in_time, check_out_date, check_out_time, number_of_guests, description, requested_by, visitor_name, hr_approval, pr_approval) {
-        super();
-        this.type_of_accommodation = type_of_accommodation;
-        this.price = price;
-        this.meal = meal;
-        this.service = service;
-        this.date_of_request = date_of_request;
-        this.hotel_name = hotel_name;
-        this.check_in_date = check_in_date;
-        this.check_in_time = check_in_time;
-        this.check_out_date = check_out_date;
-        this.check_out_time = check_out_time;
-        this.number_of_guests = number_of_guests;
-        this.description = description;
-        this.requested_by = requested_by;
-        this.visitor_name = visitor_name;
-        this.hr_approval = hr_approval;
-        this.pr_approval = pr_approval;
-    }
-};
-exports.HotelReservation = HotelReservation;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 50 }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "type_of_accommodation", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'decimal', precision: 10, scale: 2, nullable: false }),
-    __metadata("design:type", Number)
-], HotelReservation.prototype, "price", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: MealType, nullable: false, }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "meal", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'enum', enum: ServiceTypes, nullable: false, }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "service", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamptz', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "date_of_request", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "hotel_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "check_in_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "check_in_time", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'date', nullable: false }),
-    __metadata("design:type", Date)
-], HotelReservation.prototype, "check_out_date", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'time', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "check_out_time", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
-    __metadata("design:type", Number)
-], HotelReservation.prototype, "number_of_guests", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: true }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "attachment_url", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "requested_by", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: false }),
-    __metadata("design:type", String)
-], HotelReservation.prototype, "visitor_name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], HotelReservation.prototype, "hr_approval", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], HotelReservation.prototype, "pr_approval", void 0);
-exports.HotelReservation = HotelReservation = __decorate([
-    (0, typeorm_1.Entity)({ name: 'hotel_reservations' }),
-    __metadata("design:paramtypes", [String, Number, String, String, Date, String, Date, String, Date, String, Number, String, String, String, Boolean, Boolean])
-], HotelReservation);