@platform-modules/civil-aviation-authority 2.3.311 → 2.3.314

package/dist/data-source.js

@@ -257,6 +257,7 @@ const SlaApprovalsViewModel_1 = require("./models/SlaApprovalsViewModel");
 const ServiceSlaApprovalModel_1 = require("./models/ServiceSlaApprovalModel");
 const SlaConfigModel_1 = require("./models/SlaConfigModel");
 const ChatbotQnsAnsMappingModel_1 = require("./models/ChatbotQnsAnsMappingModel");
+const IconsModel_1 = require("./models/IconsModel");
 const CSRMBusinessImpactRatingMasterModel_1 = require("./models/CSRMBusinessImpactRatingMasterModel");
 const CSRMLikelihoodMasterModel_1 = require("./models/CSRMLikelihoodMasterModel");
 const LocationModel_1 = require("./models/LocationModel");
@@ -581,6 +582,7 @@ exports.AppDataSource = new typeorm_1.DataSource({
         ServiceSlaApprovalModel_1.ServiceSlaApproval,
         SlaConfigModel_1.SlaConfig,
         ChatbotQnsAnsMappingModel_1.ChatbotQnsAnsMapping,
+        IconsModel_1.Icons,
         CSRMBusinessImpactRatingMasterModel_1.CSRMBusinessImpactRatingMaster,
         CSRMLikelihoodMasterModel_1.CSRMLikelihoodMaster,
         LocationModel_1.Location,

package/dist/index.d.ts

@@ -415,6 +415,7 @@ export * from './models/ContractServiceRequestModel';
 export * from './models/ContractServiceRequestDocumentModel';
 export * from './models/SlaConfigModel';
 export * from './models/ChatbotQnsAnsMappingModel';
+export * from './models/IconsModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
 export * from './models/SlaApprovalsViewModel';

package/dist/index.js

@@ -604,6 +604,7 @@ __exportStar(require("./models/ContractServiceRequestModel"), exports);
 __exportStar(require("./models/ContractServiceRequestDocumentModel"), exports);
 __exportStar(require("./models/SlaConfigModel"), exports);
 __exportStar(require("./models/ChatbotQnsAnsMappingModel"), exports);
+__exportStar(require("./models/IconsModel"), exports);
 __exportStar(require("./models/SlaRequestModel"), exports);
 __exportStar(require("./models/SlaMyRequestsViewModel"), exports);
 __exportStar(require("./models/SlaApprovalsViewModel"), exports);

package/dist/models/IconsModel.d.ts

@@ -0,0 +1,7 @@
+import { BaseModel } from "./BaseModel";
+export declare class Icons extends BaseModel {
+    icon_name: string;
+    icon_name_arabic: string | null;
+    url: string;
+    constructor(icon_name: string, url: string);
+}

package/dist/models/IconsModel.js

@@ -0,0 +1,39 @@
+"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.Icons = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let Icons = class Icons extends BaseModel_1.BaseModel {
+    constructor(icon_name, url) {
+        super();
+        this.icon_name = icon_name;
+        this.url = url;
+        this.icon_name_arabic = null;
+    }
+};
+exports.Icons = Icons;
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
+    __metadata("design:type", String)
+], Icons.prototype, "icon_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", Object)
+], Icons.prototype, "icon_name_arabic", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 2000, nullable: false }),
+    __metadata("design:type", String)
+], Icons.prototype, "url", void 0);
+exports.Icons = Icons = __decorate([
+    (0, typeorm_1.Entity)({ name: "icons" }),
+    __metadata("design:paramtypes", [String, String])
+], Icons);

package/dist/models/SlaApprovalsViewModel.js

@@ -40,7 +40,14 @@ SELECT
     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
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
 LEFT JOIN caa_services svc
     ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
 LEFT JOIN caa_sub_services subsvc

package/dist/models/SlaMyRequestsViewModel.d.ts

@@ -23,6 +23,9 @@ export declare class SlaMyRequestsView {
     request_id: number;
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     request_fields: Record<string, unknown>;
+    req_user_arabicname: string;
+    req_user_department_arabicname: string;
+    req_user_section_arabicname: string;
 }
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 export declare function flattenSlaMyRequestsViewRow(row: SlaMyRequestsView): Record<string, unknown>;

package/dist/models/SlaMyRequestsViewModel.js

@@ -73,8 +73,13 @@ SELECT
         - 'is_deleted'
         - 'sla_request'
         - 'sla_request_id'
-    ) AS request_fields
+    ) AS request_fields,
+    TRIM(COALESCE(req_owner.employee_arabic_name, ''))::TEXT AS req_user_arabicname,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname
 FROM sla_requests sr
+LEFT JOIN users req_owner
+    ON req_owner.id = sr.user_id AND COALESCE(req_owner.is_deleted, false) = false
 LEFT JOIN users creator
     ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
 LEFT JOIN departments dept
@@ -147,6 +152,18 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", Object)
 ], SlaMyRequestsView.prototype, "request_fields", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_department_arabicname", void 0);
+__decorate([
+    (0, typeorm_1.ViewColumn)(),
+    __metadata("design:type", String)
+], SlaMyRequestsView.prototype, "req_user_section_arabicname", void 0);
 exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
     (0, typeorm_1.ViewEntity)({
         name: "vw_sla_my_requests",
@@ -155,7 +172,7 @@ exports.SlaMyRequestsView = SlaMyRequestsView = __decorate([
 ], SlaMyRequestsView);
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
 function flattenSlaMyRequestsViewRow(row) {
-    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, service_name, sub_service_name, status, request_id, request_fields, } = row;
+    const { sla_request_id, user_id, service_id, sub_service_id, created_by, created_at, req_user_department_id, req_user_section_id, req_user_arabicname, req_user_department_arabicname, req_user_section_arabicname, service_name, sub_service_name, status, request_id, request_fields, } = row;
     return {
         sla_request_id,
         user_id,
@@ -165,6 +182,9 @@ function flattenSlaMyRequestsViewRow(row) {
         created_at,
         req_user_department_id,
         req_user_section_id,
+        req_user_arabicname,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
         service_name,
         sub_service_name,
         status,

package/dist/models/importantLinksModel.d.ts

@@ -2,5 +2,6 @@ import { BaseModel } from './BaseModel';
 export declare class ImportantLinks extends BaseModel {
     title: string;
     url: string;
+    icon_id: number | null;
     constructor(title: string, url: string);
 }

package/dist/models/importantLinksModel.js

@@ -17,6 +17,7 @@ let ImportantLinks = class ImportantLinks extends BaseModel_1.BaseModel {
         super();
         this.title = title;
         this.url = url;
+        this.icon_id = null;
     }
 };
 exports.ImportantLinks = ImportantLinks;
@@ -28,6 +29,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: false }),
     __metadata("design:type", String)
 ], ImportantLinks.prototype, "url", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Object)
+], ImportantLinks.prototype, "icon_id", void 0);
 exports.ImportantLinks = ImportantLinks = __decorate([
     (0, typeorm_1.Entity)({ name: 'important_links' }),
     __metadata("design:paramtypes", [String, String])

package/package.json

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

package/sql/add_important_links_icon_id.sql

@@ -0,0 +1,17 @@
+-- Add icon_id column to important_links table (CAA).
+-- Run once per environment before deploying updated services.
+
+ALTER TABLE IF EXISTS important_links
+  ADD COLUMN IF NOT EXISTS icon_id INTEGER NULL;
+
+CREATE INDEX IF NOT EXISTS idx_important_links_icon_id
+  ON important_links (icon_id)
+  WHERE is_deleted = FALSE;
+
+DO $$ BEGIN
+  ALTER TABLE important_links
+    ADD CONSTRAINT fk_important_links_icon_id
+    FOREIGN KEY (icon_id) REFERENCES icons (id);
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;

package/sql/create_icons.sql

@@ -0,0 +1,21 @@
+-- Icons master table (User Service)
+-- PostgreSQL
+
+CREATE TABLE IF NOT EXISTS icons (
+    id SERIAL PRIMARY KEY,
+    icon_name VARCHAR(255) NOT NULL,
+    icon_name_arabic VARCHAR(255) NULL,
+    url VARCHAR(2000) NOT NULL,
+    created_by INTEGER NULL,
+    created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    updated_by INTEGER NULL,
+    updated_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP,
+    is_deleted BOOLEAN DEFAULT FALSE
+);
+
+CREATE INDEX IF NOT EXISTS idx_icons_icon_name
+    ON icons (LOWER(icon_name))
+    WHERE is_deleted = FALSE;
+
+CREATE INDEX IF NOT EXISTS idx_icons_is_deleted
+    ON icons (is_deleted);

package/sql/sla_reports_admin_procedures.sql

@@ -57,7 +57,7 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_labels     TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_headers_labels    TEXT[];
@@ -168,7 +168,6 @@ BEGIN
       USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),

package/sql/sla_reports_approvals_workbook.sql

@@ -180,12 +180,12 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_req_labels TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_approval_headers  TEXT[] := ARRAY[
     'Request ID', 'Service ID', 'Service Name', 'Sub Service ID', 'Sub Service Name',
-    'SLA Approval ID', 'Source Approval ID', 'Level', 'Approval Status', 'Request Status',
+    'Level', 'Approval Status', 'Request Status',
     'Approval Role ID', 'Approval Role Name', 'Approval Department ID', 'Approval Department Name',
     'Approval Section ID', 'Approval Section Name',
     'Approver User ID', 'Approver User Name', 'Delegate User ID', 'Delegate User Name',
@@ -292,7 +292,6 @@ BEGIN
       USING p_request_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),
@@ -394,8 +393,6 @@ BEGIN
         COALESCE(v_approval.service_name, ''),
         COALESCE(v_approval.sub_service_id::TEXT, ''),
         COALESCE(v_approval.sub_service_name, ''),
-        COALESCE(v_approval.sla_approval_id::TEXT, ''),
-        COALESCE(v_approval.source_approval_id::TEXT, ''),
         COALESCE(v_approval.level::TEXT, ''),
         COALESCE(v_approval.approval_status, ''),
         COALESCE(v_approval.request_status, ''),

package/sql/sla_reports_procedures.sql

@@ -574,7 +574,7 @@ DECLARE
   v_sheet_label       TEXT;
   v_headers_labels    TEXT[] := ARRAY[
     'Request ID', 'Service ID', 'Service Name', 'Sub Service ID', 'Sub Service Name',
-    'SLA Approval ID', 'Source Approval ID', 'Level', 'Approval Status', 'Request Status',
+    'Level', 'Approval Status', 'Request Status',
     'Approval Role ID', 'Approval Role Name', 'Approval Department ID', 'Approval Department Name',
     'Approval Section ID', 'Approval Section Name',
     'Approver User ID', 'Approver User Name', 'Delegate User ID', 'Delegate User Name',
@@ -661,8 +661,6 @@ BEGIN
         COALESCE(v_approval.service_name, ''),
         COALESCE(v_approval.sub_service_id::TEXT, ''),
         COALESCE(v_approval.sub_service_name, ''),
-        COALESCE(v_approval.sla_approval_id::TEXT, ''),
-        COALESCE(v_approval.source_approval_id::TEXT, ''),
         COALESCE(v_approval.level::TEXT, ''),
         COALESCE(v_approval.approval_status, ''),
         COALESCE(v_approval.request_status, ''),
@@ -733,7 +731,7 @@ DECLARE
   v_dyn_keys          TEXT[];
   v_dyn_labels        TEXT[];
   v_common_labels     TEXT[] := ARRAY[
-    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Request ID', 'User', 'Status', 'Created At',
     'Created By', 'Department', 'Section'
   ];
   v_headers_labels    TEXT[];
@@ -839,7 +837,6 @@ BEGIN
       USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
-        COALESCE(v_row.sla_request_id::TEXT, ''),
         COALESCE(v_row.request_id::TEXT, ''),
         COALESCE(v_row.user_name, ''),
         COALESCE(v_row.status, ''),

package/sql/vw_sla_approvals.sql

@@ -70,7 +70,14 @@ FROM sla_approval sa
 
 INNER JOIN sla_requests sr
 
-    ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
 
 LEFT JOIN caa_services svc
 

package/sql/vw_sla_my_requests.sql

@@ -38,8 +38,13 @@ SELECT
         - 'is_deleted'
         - 'sla_request'
         - 'sla_request_id'
-    ) AS request_fields
+    ) AS request_fields,
+    TRIM(COALESCE(req_owner.employee_arabic_name, ''))::TEXT AS req_user_arabicname,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname
 FROM sla_requests sr
+LEFT JOIN users req_owner
+    ON req_owner.id = sr.user_id AND COALESCE(req_owner.is_deleted, false) = false
 LEFT JOIN users creator
     ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
 LEFT JOIN departments dept

package/src/data-source.ts

@@ -255,6 +255,7 @@ import { SlaApprovalsView } from './models/SlaApprovalsViewModel';
 import { ServiceSlaApproval } from './models/ServiceSlaApprovalModel';
 import { SlaConfig } from './models/SlaConfigModel';
 import { ChatbotQnsAnsMapping } from './models/ChatbotQnsAnsMappingModel';
+import { Icons } from './models/IconsModel';
 import { CSRMBusinessImpactRatingMaster } from './models/CSRMBusinessImpactRatingMasterModel';
 import { CSRMLikelihoodMaster } from './models/CSRMLikelihoodMasterModel';
 import { Location } from './models/LocationModel';
@@ -581,6 +582,7 @@ export const AppDataSource = new DataSource({
     ServiceSlaApproval,
     SlaConfig,
     ChatbotQnsAnsMapping,
+    Icons,
     CSRMBusinessImpactRatingMaster,
     CSRMLikelihoodMaster,
     Location,

package/src/index.ts

@@ -505,6 +505,7 @@ export * from './models/ContractServiceRequestModel';
 export * from './models/ContractServiceRequestDocumentModel';
 export * from './models/SlaConfigModel';
 export * from './models/ChatbotQnsAnsMappingModel';
+export * from './models/IconsModel';
 export * from './models/SlaRequestModel';
 export * from './models/SlaMyRequestsViewModel';
 export * from './models/SlaApprovalsViewModel';

package/src/models/IconsModel.ts

@@ -0,0 +1,21 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+@Entity({ name: "icons" })
+export class Icons extends BaseModel {
+  @Column({ type: "varchar", length: 255, nullable: false })
+  icon_name: string;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  icon_name_arabic: string | null;
+
+  @Column({ type: "varchar", length: 2000, nullable: false })
+  url: string;
+
+  constructor(icon_name: string, url: string) {
+    super();
+    this.icon_name = icon_name;
+    this.url = url;
+    this.icon_name_arabic = null;
+  }
+}

package/src/models/SlaApprovalsViewModel.ts

@@ -29,7 +29,14 @@ SELECT
     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
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
 LEFT JOIN caa_services svc
     ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
 LEFT JOIN caa_sub_services subsvc

package/src/models/SlaMyRequestsViewModel.ts

@@ -62,8 +62,13 @@ SELECT
         - 'is_deleted'
         - 'sla_request'
         - 'sla_request_id'
-    ) AS request_fields
+    ) AS request_fields,
+    TRIM(COALESCE(req_owner.employee_arabic_name, ''))::TEXT AS req_user_arabicname,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname
 FROM sla_requests sr
+LEFT JOIN users req_owner
+    ON req_owner.id = sr.user_id AND COALESCE(req_owner.is_deleted, false) = false
 LEFT JOIN users creator
     ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
 LEFT JOIN departments dept
@@ -129,6 +134,15 @@ export class SlaMyRequestsView {
     /** Remaining `request_obj` keys after excluding workflow/common duplicates. */
     @ViewColumn()
     request_fields: Record<string, unknown>;
+
+    @ViewColumn()
+    req_user_arabicname: string;
+
+    @ViewColumn()
+    req_user_department_arabicname: string;
+
+    @ViewColumn()
+    req_user_section_arabicname: string;
 }
 
 /** Flatten view row: fixed columns plus each entry in `request_fields`. */
@@ -144,6 +158,9 @@ export function flattenSlaMyRequestsViewRow(
         created_at,
         req_user_department_id,
         req_user_section_id,
+        req_user_arabicname,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
         service_name,
         sub_service_name,
         status,
@@ -160,6 +177,9 @@ export function flattenSlaMyRequestsViewRow(
         created_at,
         req_user_department_id,
         req_user_section_id,
+        req_user_arabicname,
+        req_user_department_arabicname,
+        req_user_section_arabicname,
         service_name,
         sub_service_name,
         status,

package/src/models/importantLinksModel.ts

@@ -10,6 +10,9 @@ export class ImportantLinks extends BaseModel {
     @Column({ type: 'varchar', nullable: false })
     url: string;
 
+    @Column({ type: 'integer', nullable: true })
+    icon_id: number | null;
+
     constructor(
         title: string,
         url: string
@@ -17,6 +20,7 @@ export class ImportantLinks extends BaseModel {
         super();
         this.title = title;
         this.url = url;
+        this.icon_id = null;
     }
 }