@platform-modules/civil-aviation-authority 2.3.40 → 2.3.42

package/dist/models/roleRightsModel.d.ts

@@ -1,16 +1,13 @@
-/** *
-@author
-Amnet Digital
-@date
-2024-05-20
-@Model
-Role
-@usage
-Userrole Information will store
-*/
+/**
+ * @author Amnet Digital
+ * @date 2024-05-20
+ * @Model RoleRights
+ * @usage Stores role rights/permissions for user roles, mapping services and sub-services that a role can access
+ */
 import { BaseModel } from './BaseModel';
 export declare class RoleRights extends BaseModel {
-    user_role_id: number;
+    user_role_id: number | null;
     service_id: number;
-    constructor(user_role_id: number, service_id: number);
+    sub_service_ids: number[] | null;
+    constructor(user_role_id?: number | null, service_id?: number, sub_service_ids?: number[] | null);
 }

package/dist/models/roleRightsModel.js

@@ -1,14 +1,10 @@
 "use strict";
-/** *
-@author
-Amnet Digital
-@date
-2024-05-20
-@Model
-Role
-@usage
-Userrole Information will store
-*/
+/**
+ * @author Amnet Digital
+ * @date 2024-05-20
+ * @Model RoleRights
+ * @usage Stores role rights/permissions for user roles, mapping services and sub-services that a role can access
+ */
 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);
@@ -23,22 +19,27 @@ exports.RoleRights = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 let RoleRights = class RoleRights extends BaseModel_1.BaseModel {
-    constructor(user_role_id, service_id) {
+    constructor(user_role_id, service_id, sub_service_ids) {
         super();
-        this.user_role_id = user_role_id;
-        this.service_id = service_id;
+        this.user_role_id = user_role_id ?? null;
+        this.service_id = service_id ?? 0;
+        this.sub_service_ids = sub_service_ids ?? null;
     }
 };
 exports.RoleRights = RoleRights;
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
-    __metadata("design:type", Number)
+    __metadata("design:type", Object)
 ], RoleRights.prototype, "user_role_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: false }),
     __metadata("design:type", Number)
 ], RoleRights.prototype, "service_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', array: true, nullable: true }),
+    __metadata("design:type", Object)
+], RoleRights.prototype, "sub_service_ids", void 0);
 exports.RoleRights = RoleRights = __decorate([
     (0, typeorm_1.Entity)({ name: 'role_rights' }),
-    __metadata("design:paramtypes", [Number, Number])
+    __metadata("design:paramtypes", [Object, Number, Object])
 ], RoleRights);

package/package.json

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

package/src/index.ts

@@ -185,3 +185,10 @@ export {AssignTasksEmpWorkFlowStatus} from './models/AssignTasksEmpWorkflowModel
 export {AssignTasksEmpRequestAttachment} from './models/AssignTasksEmpAttachmentModel';
 export {AssignTasksEmpRequestChat} from './models/AssignTasksEmpChatModel';
 export {AssignTasksEmpMessageType} from './models/AssignTasksEmpChatModel';
+
+export * from './models/ShiftAllowanceRequestModel';
+export {ShiftAllowanceRequestStatus, ShiftAllowanceValue} from './models/ShiftAllowanceRequestModel';
+
+// Job Transfer (Transfer from One Job to Another Job Nature) Service
+export * from './models/JobTransferRequestModel';
+export {JobTransferRequestStatus} from './models/JobTransferRequestModel';

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

@@ -1,62 +1,62 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ITHelpDeskRequests } from './ITHelpDeskModel';
-import { User } from './user';
-
-@Entity({ name: 'it_request_chat' })
-export class ITRequestChat extends BaseModel {
-
-    @Column({ type: 'integer', nullable: false })
-    request_id: number;
-
-    @ManyToOne(() => ITHelpDeskRequests)
-    @JoinColumn({ name: 'request_id' })
-    request: ITHelpDeskRequests;
-
-    @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;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'user_id' })
-    user: User;
-
-    @Column({ type: 'integer', nullable: true })
-    role_id: number | null;
-
-    @Column({ type: 'text', nullable: false })
-    message: string;
-
-    @Column({ type: 'text', nullable: true })
-    status: string | null;
-
-    @Column({ type: 'boolean', default: false })
-    is_internal: boolean;
-
-    constructor(
-        request_id: number,
-        user_id: number,
-        message: string,
-        is_internal?: boolean,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        role_id?: number | null,
-        status?: string | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.user_id = user_id;
-        this.role_id = role_id || null;
-        this.message = message;
-        this.status = status || null;
-        this.is_internal = is_internal || false;
-    }
-}
-
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+
+@Entity({ name: 'it_request_chat' })
+export class ITRequestChat extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    request_id: number;
+
+    @ManyToOne(() => ITHelpDeskRequests)
+    @JoinColumn({ name: 'request_id' })
+    request: ITHelpDeskRequests;
+
+    @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;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
+
+    @Column({ type: 'integer', nullable: true })
+    role_id: number | null;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'text', nullable: true })
+    status: string | null;
+
+    @Column({ type: 'boolean', default: false })
+    is_internal: boolean;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        is_internal?: boolean,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        role_id?: number | null,
+        status?: string | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.role_id = role_id || null;
+        this.message = message;
+        this.status = status || null;
+        this.is_internal = is_internal || false;
+    }
+}
+