@platform-modules/civil-aviation-authority 2.3.265 → 2.3.267

package/.env

@@ -1,27 +1,12 @@
-# DB_HOST=localhost
+# DB_HOST=164.52.222.169
 # DB_PORT=5432 
-# DB_USER=postgres
-# DB_PASS=stevejobs
+# DB_USER=postgres_admin_user
+# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
 # DB_NAME=CAA
 
 
-DB_HOST=164.52.222.169
+DB_HOST=localhost
 DB_PORT=5432 
-DB_USER=postgres_admin_user
-DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=CAA
-
-# DB_HOST=216.48.187.46
-# DB_PORT=5432 
-# DB_USER=adminuser
-# DB_PASS=postgres_caa_fm_qa_34567
-# DB_NAME=CAA_QA
-
-
-
-
-# DB_HOST=localhost
-# DB_PORT=5432 
-# DB_USER=postgres
-# DB_PASS=stevejobs
-# DB_NAME=CAA
+DB_USER=postgres
+DB_PASS=stevejobs
+DB_NAME=CAA

package/dist/index.d.ts

@@ -307,6 +307,7 @@ export * from './models/DocumentVersionModel';
 export * from './models/DocumentAccessModel';
 export * from './models/DepartmentDocumentOwnerModel';
 export * from './models/EmployeeSecurityDriveMasterModel';
+export * from './models/EmployeeSecurityDriveOwnerModel';
 export * from './models/EmployeeSecurityFileModel';
 export * from './models/EmployeeSecurityFileTypeModel';
 export * from './models/EmployeeSecurityFolderModel';

package/dist/index.js

@@ -475,6 +475,7 @@ __exportStar(require("./models/DocumentAccessModel"), exports);
 __exportStar(require("./models/DepartmentDocumentOwnerModel"), exports);
 // Employee Security Files Service
 __exportStar(require("./models/EmployeeSecurityDriveMasterModel"), exports);
+__exportStar(require("./models/EmployeeSecurityDriveOwnerModel"), exports);
 __exportStar(require("./models/EmployeeSecurityFileModel"), exports);
 __exportStar(require("./models/EmployeeSecurityFileTypeModel"), exports);
 __exportStar(require("./models/EmployeeSecurityFolderModel"), exports);

package/dist/models/AnnualIncrementRequestEmployeeModel.d.ts

@@ -11,6 +11,7 @@ export declare class AnnualIncrementRequestEmployee extends BaseModel {
     current_basic_salary: number | null;
     increment_percentage: number | null;
     new_basic_salary: number | null;
+    annual_periodic_allowance: number | null;
     request: AnnualIncrementRequest;
-    constructor(request_id: number, employee_name: string, employee_id: string, allowance_year: number, effective_date: Date, service_id?: number | null, sub_service_id?: number | null, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null);
+    constructor(request_id: number, employee_name: string, employee_id: string, allowance_year: number, effective_date: Date, service_id?: number | null, sub_service_id?: number | null, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null, annual_periodic_allowance?: number | null);
 }

package/dist/models/AnnualIncrementRequestEmployeeModel.js

@@ -14,7 +14,7 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const AnnualIncrementRequestModel_1 = require("./AnnualIncrementRequestModel");
 let AnnualIncrementRequestEmployee = class AnnualIncrementRequestEmployee extends BaseModel_1.BaseModel {
-    constructor(request_id, employee_name, employee_id, allowance_year, effective_date, service_id, sub_service_id, current_basic_salary, increment_percentage, new_basic_salary) {
+    constructor(request_id, employee_name, employee_id, allowance_year, effective_date, service_id, sub_service_id, current_basic_salary, increment_percentage, new_basic_salary, annual_periodic_allowance) {
         super();
         this.request_id = request_id;
         this.service_id = service_id ?? null;
@@ -26,6 +26,7 @@ let AnnualIncrementRequestEmployee = class AnnualIncrementRequestEmployee extend
         this.current_basic_salary = current_basic_salary ?? null;
         this.increment_percentage = increment_percentage ?? null;
         this.new_basic_salary = new_basic_salary ?? null;
+        this.annual_periodic_allowance = annual_periodic_allowance ?? null;
     }
 };
 exports.AnnualIncrementRequestEmployee = AnnualIncrementRequestEmployee;
@@ -69,6 +70,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
     __metadata("design:type", Object)
 ], AnnualIncrementRequestEmployee.prototype, "new_basic_salary", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequestEmployee.prototype, "annual_periodic_allowance", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => AnnualIncrementRequestModel_1.AnnualIncrementRequest, { onDelete: "CASCADE" }),
     (0, typeorm_1.JoinColumn)({ name: "request_id", referencedColumnName: "id" }),
@@ -76,5 +81,5 @@ __decorate([
 ], AnnualIncrementRequestEmployee.prototype, "request", void 0);
 exports.AnnualIncrementRequestEmployee = AnnualIncrementRequestEmployee = __decorate([
     (0, typeorm_1.Entity)({ name: "annual_increment_request_employees" }),
-    __metadata("design:paramtypes", [Number, String, String, Number, Date, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, String, String, Number, Date, Object, Object, Object, Object, Object, Object])
 ], AnnualIncrementRequestEmployee);

package/dist/models/AnnualIncrementRequestModel.d.ts

@@ -28,5 +28,6 @@ export declare class AnnualIncrementRequest extends BaseModel {
     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);
+    annual_periodic_allowance: 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, annual_periodic_allowance?: number | null);
 }

package/dist/models/AnnualIncrementRequestModel.js

@@ -22,7 +22,7 @@ var AnnualIncrementRequestStatus;
     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) {
+    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, annual_periodic_allowance) {
         super();
         this.user_id = user_id;
         this.status = status;
@@ -44,6 +44,7 @@ let AnnualIncrementRequest = class AnnualIncrementRequest extends BaseModel_1.Ba
         this.current_basic_salary = current_basic_salary || null;
         this.increment_percentage = increment_percentage || null;
         this.new_basic_salary = new_basic_salary || null;
+        this.annual_periodic_allowance = annual_periodic_allowance || null;
     }
 };
 exports.AnnualIncrementRequest = AnnualIncrementRequest;
@@ -127,7 +128,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
     __metadata("design:type", Object)
 ], AnnualIncrementRequest.prototype, "new_basic_salary", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
+    __metadata("design:type", Object)
+], AnnualIncrementRequest.prototype, "annual_periodic_allowance", 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])
+    __metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Number, Date, Object, Object, Object, Object])
 ], AnnualIncrementRequest);

package/dist/models/EmployeeSecurityDriveOwnerModel.d.ts

@@ -0,0 +1,13 @@
+import { BaseModel } from "./BaseModel";
+import { EmployeeSecurityDriveMaster } from "./EmployeeSecurityDriveMasterModel";
+import { Departments } from "./DepartmentsModel";
+import { User } from "./user";
+export declare class EmployeeSecurityDriveOwner extends BaseModel {
+    drive_id: number;
+    department_id: number;
+    owner_user_id: number;
+    is_active: boolean;
+    drive?: EmployeeSecurityDriveMaster;
+    department?: Departments;
+    owner_user?: User;
+}

package/dist/models/EmployeeSecurityDriveOwnerModel.js

@@ -0,0 +1,54 @@
+"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.EmployeeSecurityDriveOwner = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+const EmployeeSecurityDriveMasterModel_1 = require("./EmployeeSecurityDriveMasterModel");
+const DepartmentsModel_1 = require("./DepartmentsModel");
+const user_1 = require("./user");
+let EmployeeSecurityDriveOwner = class EmployeeSecurityDriveOwner extends BaseModel_1.BaseModel {
+};
+exports.EmployeeSecurityDriveOwner = EmployeeSecurityDriveOwner;
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], EmployeeSecurityDriveOwner.prototype, "drive_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], EmployeeSecurityDriveOwner.prototype, "department_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
+    __metadata("design:type", Number)
+], EmployeeSecurityDriveOwner.prototype, "owner_user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "boolean", nullable: false, default: true }),
+    __metadata("design:type", Boolean)
+], EmployeeSecurityDriveOwner.prototype, "is_active", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => EmployeeSecurityDriveMasterModel_1.EmployeeSecurityDriveMaster),
+    (0, typeorm_1.JoinColumn)({ name: "drive_id" }),
+    __metadata("design:type", EmployeeSecurityDriveMasterModel_1.EmployeeSecurityDriveMaster)
+], EmployeeSecurityDriveOwner.prototype, "drive", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => DepartmentsModel_1.Departments),
+    (0, typeorm_1.JoinColumn)({ name: "department_id" }),
+    __metadata("design:type", DepartmentsModel_1.Departments)
+], EmployeeSecurityDriveOwner.prototype, "department", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => user_1.User),
+    (0, typeorm_1.JoinColumn)({ name: "owner_user_id" }),
+    __metadata("design:type", user_1.User)
+], EmployeeSecurityDriveOwner.prototype, "owner_user", void 0);
+exports.EmployeeSecurityDriveOwner = EmployeeSecurityDriveOwner = __decorate([
+    (0, typeorm_1.Entity)({ name: "employee_security_drive_owners" })
+], EmployeeSecurityDriveOwner);

package/dist/models/ITApprovalSettings.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from './BaseModel';
+export declare class ITApprovalSettings extends BaseModel {
+    level: number;
+    approval_role_id: number;
+    workflow_id: number;
+    constructor(level: number, approval_role_id: number, workflow_id: number);
+}

package/dist/models/ITApprovalSettings.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.ITApprovalSettings = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITApprovalSettings = class ITApprovalSettings extends BaseModel_1.BaseModel {
+    constructor(level, approval_role_id, workflow_id) {
+        super();
+        this.level = level;
+        this.approval_role_id = approval_role_id;
+        this.workflow_id = workflow_id;
+    }
+};
+exports.ITApprovalSettings = ITApprovalSettings;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "approval_role_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: false }),
+    __metadata("design:type", Number)
+], ITApprovalSettings.prototype, "workflow_id", void 0);
+exports.ITApprovalSettings = ITApprovalSettings = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_approval_settings' }),
+    (0, typeorm_1.Unique)(['workflow_id', 'level']),
+    __metadata("design:paramtypes", [Number, Number, Number])
+], ITApprovalSettings);

package/dist/models/ITServicesTypesMuscatModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypesMuscat extends BaseModel {
+    name: string;
+    name_in_arabic: string;
+    constructor(name: string, name_in_arabic: string);
+}

package/dist/models/ITServicesTypesMuscatModel.js

@@ -0,0 +1,34 @@
+"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.ITServicesTypesMuscat = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypesMuscat = class ITServicesTypesMuscat extends BaseModel_1.BaseModel {
+    constructor(name, name_in_arabic) {
+        super();
+        this.name = name;
+        this.name_in_arabic = name_in_arabic;
+    }
+};
+exports.ITServicesTypesMuscat = ITServicesTypesMuscat;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesMuscat.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesMuscat.prototype, "name_in_arabic", void 0);
+exports.ITServicesTypesMuscat = ITServicesTypesMuscat = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_services_types_muscat' }),
+    __metadata("design:paramtypes", [String, String])
+], ITServicesTypesMuscat);

package/dist/models/ITServicesTypesSalalahModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypesSalalah extends BaseModel {
+    name: string;
+    name_in_arabic: string;
+    constructor(name: string, name_in_arabic: string);
+}

package/dist/models/ITServicesTypesSalalahModel.js

@@ -0,0 +1,34 @@
+"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.ITServicesTypesSalalah = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypesSalalah = class ITServicesTypesSalalah extends BaseModel_1.BaseModel {
+    constructor(name, name_in_arabic) {
+        super();
+        this.name = name;
+        this.name_in_arabic = name_in_arabic;
+    }
+};
+exports.ITServicesTypesSalalah = ITServicesTypesSalalah;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesSalalah.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypesSalalah.prototype, "name_in_arabic", void 0);
+exports.ITServicesTypesSalalah = ITServicesTypesSalalah = __decorate([
+    (0, typeorm_1.Entity)({ name: 'it_services_types_salalah' }),
+    __metadata("design:paramtypes", [String, String])
+], ITServicesTypesSalalah);

package/dist/models/SlaApprovalsViewModel.js

@@ -11,53 +11,53 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlaApprovalsView = void 0;
 const typeorm_1 = require("typeorm");
-const VW_SLA_APPROVALS_SQL = `
-SELECT
-    sa.id AS sla_approval_id,
-    sa.source_approval_id,
-    sa.request_id,
-    sa.service_id AS service_id,
-    sa.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sa.approver_role_id AS approval_role_id,
-    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
-    sa.department_id AS approval_department_id,
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
-    sa.section_id AS approval_section_id,
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
-    sa.approval_status::TEXT AS approval_status,
-    sr.status::TEXT AS request_status,
-    sa.level AS level,
-    sa.approver_user_id AS approver_user_id,
-    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-    sa.delegate_user_id AS delegate_user_id,
-    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-    sa.approved_by AS approved_by,
-    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-    sa.comment::TEXT AS comment,
-    sa.created_at AS created_at,
-    sa.updated_at AS updated_at
-FROM sla_approval sa
-INNER JOIN sla_requests sr
-    ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
-LEFT JOIN caa_services svc
-    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN caa_sub_services subsvc
-    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-LEFT JOIN departments adpt
-    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
-LEFT JOIN sections asec
-    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
-LEFT JOIN role ar
-    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
-LEFT JOIN users au
-    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
-LEFT JOIN users du
-    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
-LEFT JOIN users ab
-    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
-WHERE COALESCE(sa.is_deleted, false) = false
+const VW_SLA_APPROVALS_SQL = `
+SELECT
+    sa.id AS sla_approval_id,
+    sa.source_approval_id,
+    sa.request_id,
+    sa.service_id AS service_id,
+    sa.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sa.approver_role_id AS approval_role_id,
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+    sa.department_id AS approval_department_id,
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+    sa.section_id AS approval_section_id,
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+    sa.approval_status::TEXT AS approval_status,
+    sr.status::TEXT AS request_status,
+    sa.level AS level,
+    sa.approver_user_id AS approver_user_id,
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+    sa.delegate_user_id AS delegate_user_id,
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+    sa.approved_by AS approved_by,
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+    sa.comment::TEXT AS comment,
+    sa.created_at AS created_at,
+    sa.updated_at AS updated_at
+FROM sla_approval sa
+INNER JOIN sla_requests sr
+    ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
+LEFT JOIN caa_services svc
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+LEFT JOIN departments adpt
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+LEFT JOIN sections asec
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+LEFT JOIN role ar
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+LEFT JOIN users au
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+LEFT JOIN users du
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+LEFT JOIN users ab
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+WHERE COALESCE(sa.is_deleted, false) = false
 `;
 /**
  * Read-only view for SLA approvals listings (TypeORM).

package/dist/models/SlaMyRequestsViewModel.js

@@ -36,56 +36,56 @@ exports.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
     "sla_request",
     "sla_request_id",
 ];
-const VW_SLA_MY_REQUESTS_SQL = `
-SELECT
-    sr.id AS sla_request_id,
-    sr.user_id,
-    sr.service_id AS service_id,
-    sr.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
-    sr.created_at,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sr.status::TEXT AS status,
-    sr.request_id,
-    (
-        COALESCE(sr.request_obj, '{}'::jsonb)
-        - 'id'
-        - 'status'
-        - 'role_id'
-        - 'user_id'
-        - 'createdBy'
-        - 'created_at'
-        - 'updated_by'
-        - 'updated_at'
-        - 'req_user_department_id'
-        - 'workflow_execution_id'
-        - 'department_id'
-        - 'req_user_section_id'
-        - 'service_type_id'
-        - 'service_type'
-        - 'created_by'
-        - 'service_id'
-        - 'sub_service_id'
-        - 'attachments'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields
-FROM sla_requests sr
-LEFT JOIN users creator
-    ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
-LEFT JOIN departments dept
-    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
-LEFT JOIN sections sec
-    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
-LEFT JOIN caa_services svc
-    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN caa_sub_services subsvc
-    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-WHERE COALESCE(sr.is_deleted, false) = false
+const VW_SLA_MY_REQUESTS_SQL = `
+SELECT
+    sr.id AS sla_request_id,
+    sr.user_id,
+    sr.service_id AS service_id,
+    sr.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
+    sr.created_at,
+    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
+    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sr.status::TEXT AS status,
+    sr.request_id,
+    (
+        COALESCE(sr.request_obj, '{}'::jsonb)
+        - 'id'
+        - 'status'
+        - 'role_id'
+        - 'user_id'
+        - 'createdBy'
+        - 'created_at'
+        - 'updated_by'
+        - 'updated_at'
+        - 'req_user_department_id'
+        - 'workflow_execution_id'
+        - 'department_id'
+        - 'req_user_section_id'
+        - 'service_type_id'
+        - 'service_type'
+        - 'created_by'
+        - 'service_id'
+        - 'sub_service_id'
+        - 'attachments'
+        - 'is_deleted'
+        - 'sla_request'
+        - 'sla_request_id'
+    ) AS request_fields
+FROM sla_requests sr
+LEFT JOIN users creator
+    ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
+LEFT JOIN departments dept
+    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
+LEFT JOIN sections sec
+    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
+LEFT JOIN caa_services svc
+    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN caa_sub_services subsvc
+    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+WHERE COALESCE(sr.is_deleted, false) = false
 `;
 /**
  * Read-only view for SLA "my requests" listings.

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/dist/models/Workflows.js

@@ -0,0 +1,31 @@
+"use strict";
+// import { Column, Entity, Unique } from "typeorm";
+// import { BaseModel } from './BaseModel';
+// @Entity({ name: 'workflows' })
+// @Unique(['service_id', 'sub_service_id', 'request_for'])
+// export class Workflows extends BaseModel {
+//     @Column({ type: 'varchar', length: 100, nullable: false })
+//     name: string;
+//     @Column({ type: 'bigint', nullable: false })
+//     service_id: number;
+//     @Column({ type: 'bigint', nullable: false })
+//     sub_service_id: number;
+//     @Column({ type: 'varchar', length: 20, nullable: false })
+//     request_for: string; // 'Self' | 'Behalf of' | 'Internal'
+//     @Column({ type: 'int', nullable: false })
+//     levels: number;
+//     constructor(
+//         name: string,
+//         service_id: number,
+//         sub_service_id: number,
+//         request_for: string,
+//         levels: number,
+//     ) {
+//         super();
+//         this.name = name;
+//         this.service_id = service_id;
+//         this.sub_service_id = sub_service_id;
+//         this.request_for = request_for;
+//         this.levels = levels;
+//     }
+// }

package/package.json

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