@platform-modules/foreign-ministry 1.3.337 → 1.3.339

package/.env

@@ -1,5 +1,5 @@
-DB_HOST=localhost
+DB_HOST=169.58.34.60
 DB_PORT=5432
-DB_USER=postgres
-DB_PASS=Fa@123
+DB_USER=postgres_admin_user
+DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
 DB_NAME=FM

package/dist/models/CurrencyModel.d.ts

@@ -3,6 +3,7 @@ export declare class Currency extends BaseModel {
     id: number;
     code: string;
     name: string;
+    arabic_name: string;
     symbol: string;
     countries: string;
     is_active: boolean;

package/dist/models/CurrencyModel.js

@@ -35,6 +35,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
     __metadata("design:type", String)
 ], Currency.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: true }),
+    __metadata("design:type", String)
+], Currency.prototype, "arabic_name", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 10, nullable: true }),
     __metadata("design:type", String)

package/dist/models/LMSExternalEntityTrainedPersonModel.d.ts

@@ -13,6 +13,8 @@ export declare class LMSExternalEntityTrainedPerson extends BaseModel {
     qualification: string | null;
     learning_curriculum: string | null;
     training_period: string | null;
+    from_date: Date | null;
+    to_date: Date | null;
     is_selected: boolean;
     display_order: number;
 }

package/dist/models/LMSExternalEntityTrainedPersonModel.js

@@ -58,6 +58,14 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
     __metadata("design:type", Object)
 ], LMSExternalEntityTrainedPerson.prototype, "training_period", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalEntityTrainedPerson.prototype, "from_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'date', nullable: true }),
+    __metadata("design:type", Object)
+], LMSExternalEntityTrainedPerson.prototype, "to_date", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', default: false }),
     __metadata("design:type", Boolean)

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/foreign-ministry",
- "version": "1.3.337",
+ "version": "1.3.339",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "exports": {
@@ -22,6 +22,7 @@
   "access": "public"
  },
  "dependencies": {
+  "@platform-modules/foreign-ministry": "^1.3.338",
   "moment-timezone": "^0.6.0",
   "pg": "^8.16.0",
   "typeorm": "^0.3.17"

package/scripts/sync-sla-reports-sql.js

@@ -1,7 +1,7 @@
 /**
  * Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
  *
- * Env (shared_models/.env or Reports_Service/.env):
+ * Env from shared_models/.env only:
  *   DB_HOST / TYPEORM_HOST
  *   DB_PORT / TYPEORM_PORT
  *   DB_USER / TYPEORM_USERNAME
@@ -19,29 +19,26 @@ const { Client } = require('pg');
 
 function loadEnvFiles() {
   const dotenv = require('dotenv');
-  const sharedRoot = path.resolve(__dirname, '..');
-  const reportsEnv = path.resolve(sharedRoot, '..', 'Reports_Service', '.env');
-  const sharedEnv = path.join(sharedRoot, '.env');
+  const packageRoot = path.resolve(__dirname, '..');
+  const packageEnv = path.join(packageRoot, '.env');
 
-  // Reports_Service defaults first; shared_models/.env wins (FM DB for sync:sla-sql).
-  if (fs.existsSync(reportsEnv)) {
-    dotenv.config({ path: reportsEnv });
-  }
-  if (fs.existsSync(sharedEnv)) {
-    dotenv.config({ path: sharedEnv, override: true });
+  if (!fs.existsSync(packageEnv)) {
+    throw new Error(`Missing env file: ${packageEnv}`);
   }
+
+  dotenv.config({ path: packageEnv, override: true });
 }
 
 function getDbConfig() {
-  const host = (process.env.TYPEORM_HOST || process.env.DB_HOST || '').trim();
-  const port = parseInt(process.env.TYPEORM_PORT || process.env.DB_PORT || '5432', 10);
-  const user = (process.env.TYPEORM_USERNAME || process.env.DB_USER || '').trim();
-  const password = process.env.TYPEORM_PASSWORD || process.env.DB_PASS || '';
-  const database = (process.env.TYPEORM_DATABASE || process.env.DB_NAME || '').trim();
+  const host = (process.env.DB_HOST || process.env.TYPEORM_HOST || '').trim();
+  const port = parseInt(process.env.DB_PORT || process.env.TYPEORM_PORT || '5432', 10);
+  const user = (process.env.DB_USER || process.env.TYPEORM_USERNAME || '').trim();
+  const password = process.env.DB_PASS || process.env.TYPEORM_PASSWORD || '';
+  const database = (process.env.DB_NAME || process.env.TYPEORM_DATABASE || '').trim();
 
   if (!host || !user || !database) {
     throw new Error(
-      'Missing DB config. Set TYPEORM_* in Reports_Service/.env or DB_* in shared_models/.env'
+      'Missing DB config. Set DB_HOST, DB_USER, DB_NAME (and DB_PASS) in shared_models/.env'
     );
   }
 

package/sql/add_lms_external_entity_trained_people_dates.sql

@@ -0,0 +1,4 @@
+-- Add per-person training date range to lms_external_entity_trained_people
+ALTER TABLE lms_external_entity_trained_people
+  ADD COLUMN IF NOT EXISTS from_date DATE NULL,
+  ADD COLUMN IF NOT EXISTS to_date DATE NULL;

package/sql/sla_reports_admin_procedures.sql

@@ -22,6 +22,8 @@ $$;
 -- ADMIN — my requests Excel (optional p_target_user_id)
 -- Per sub-service Requests + Approvals sheets (same as user my-requests download)
 -- ---------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS sp_sla_admin_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT);
+
 CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
   p_target_user_id    INT      DEFAULT NULL,
   p_service_ids       INT[]    DEFAULT NULL,
@@ -31,7 +33,8 @@ CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
   p_to_date           DATE     DEFAULT NULL,
   p_search_text       TEXT     DEFAULT NULL,
   p_sort_by           TEXT     DEFAULT 'created_at',
-  p_sort_order        TEXT     DEFAULT 'DESC'
+  p_sort_order        TEXT     DEFAULT 'DESC',
+  p_extra_filter_sql  TEXT     DEFAULT 'TRUE'
 )
 RETURNS TABLE (
   sheet_order         INT,
@@ -63,7 +66,11 @@ DECLARE
   v_sheet_order       INT := 0;
   v_user_filter       TEXT;
 BEGIN
-  v_user_filter := CASE WHEN p_target_user_id IS NULL THEN 'TRUE' ELSE format('v.user_id = %s', p_target_user_id) END;
+  v_user_filter := format(
+    '(%s) AND (%s)',
+    CASE WHEN p_target_user_id IS NULL THEN 'TRUE' ELSE format('v.user_id = %s', p_target_user_id) END,
+    COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE')
+  );
 
   v_sort_col := CASE lower(trim(p_sort_by))
     WHEN 'updated_at'  THEN 'v.created_at'
@@ -199,6 +206,10 @@ DROP FUNCTION IF EXISTS sp_sla_approvals_excel_export_internal(
   TEXT, BOOLEAN, INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
 );
 
+DROP FUNCTION IF EXISTS sp_sla_approvals_excel_export(
+  INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
+);
+
 CREATE OR REPLACE FUNCTION sp_sla_approvals_excel_export(
   p_approver_user_id    INT,
   p_service_ids         INT[]    DEFAULT NULL,
@@ -209,7 +220,8 @@ CREATE OR REPLACE FUNCTION sp_sla_approvals_excel_export(
   p_to_date             DATE     DEFAULT NULL,
   p_search_text         TEXT     DEFAULT NULL,
   p_sort_by             TEXT     DEFAULT 'created_at',
-  p_sort_order          TEXT     DEFAULT 'DESC'
+  p_sort_order          TEXT     DEFAULT 'DESC',
+  p_extra_filter_sql    TEXT     DEFAULT 'TRUE'
 )
 RETURNS TABLE (
   sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
@@ -219,7 +231,11 @@ STABLE
 AS $$
 DECLARE
   v_exists TEXT := sla_approval_queue_exists_sql(p_approver_user_id);
-  v_own    TEXT := format('sr.user_id != %s', p_approver_user_id);
+  v_own    TEXT := format(
+    '(%s) AND (%s)',
+    format('sr.user_id != %s', p_approver_user_id),
+    COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE')
+  );
 BEGIN
   RETURN QUERY
   SELECT * FROM sp_sla_approvals_workbook_excel_export(
@@ -243,6 +259,10 @@ $$;
 -- Per sub-service Requests + Approvals; optional approver_user_id (NULL = all queues)
 -- Does not exclude own requests (unlike user approvals download)
 -- ---------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS sp_sla_admin_approvals_excel_export(
+  INT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
+);
+
 CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
   p_target_approver_user_id INT      DEFAULT NULL,
   p_service_ids             INT[]    DEFAULT NULL,
@@ -253,7 +273,8 @@ CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
   p_to_date                 DATE     DEFAULT NULL,
   p_search_text             TEXT     DEFAULT NULL,
   p_sort_by                 TEXT     DEFAULT 'created_at',
-  p_sort_order              TEXT     DEFAULT 'DESC'
+  p_sort_order              TEXT     DEFAULT 'DESC',
+  p_extra_filter_sql        TEXT     DEFAULT 'TRUE'
 )
 RETURNS TABLE (
   sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
@@ -263,7 +284,7 @@ STABLE
 AS $$
 DECLARE
   v_exists TEXT := sla_approval_queue_exists_sql_optional(p_target_approver_user_id);
-  v_own    TEXT := 'TRUE';
+  v_own    TEXT := COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE');
 BEGIN
   RETURN QUERY
   SELECT * FROM sp_sla_approvals_workbook_excel_export(

package/sql/sla_reports_procedures.sql

@@ -700,6 +700,8 @@ $$;
 -- MY REQUESTS — Excel workbook payload (one result row per sub-service sheet)
 -- Uses vw_sla_my_requests; flattening and dynamic columns are built in the database.
 -- ---------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS sp_sla_my_requests_excel_export(INT, INT[], INT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT);
+
 CREATE OR REPLACE FUNCTION sp_sla_my_requests_excel_export(
   p_user_id           INT,
   p_service_ids       INT[]    DEFAULT NULL,
@@ -709,7 +711,8 @@ CREATE OR REPLACE FUNCTION sp_sla_my_requests_excel_export(
   p_to_date           DATE     DEFAULT NULL,
   p_search_text       TEXT     DEFAULT NULL,
   p_sort_by           TEXT     DEFAULT 'created_at',
-  p_sort_order        TEXT     DEFAULT 'DESC'
+  p_sort_order        TEXT     DEFAULT 'DESC',
+  p_extra_filter_sql  TEXT     DEFAULT 'TRUE'
 )
 RETURNS TABLE (
   sheet_order         INT,
@@ -739,7 +742,10 @@ DECLARE
   v_all_rows          JSONB;
   v_k                 TEXT;
   v_sheet_order       INT := 0;
+  v_extra             TEXT;
 BEGIN
+  v_extra := COALESCE(NULLIF(trim(p_extra_filter_sql), ''), 'TRUE');
+
   v_sort_col := CASE lower(trim(p_sort_by))
     WHEN 'updated_at'  THEN 'v.created_at'
     WHEN 'id'          THEN 'v.sla_request_id'
@@ -758,6 +764,7 @@ BEGIN
       INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
       LEFT JOIN fm_sub_services subsvc ON subsvc.id = sr.sub_service_id
       WHERE v.user_id = %1$s
+        AND (%2$s)
         AND v.status = ANY($1)
         AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
         AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
@@ -765,24 +772,28 @@ BEGIN
         AND ($5 IS NULL OR v.created_at::date <= $5)
         AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
       ORDER BY sub_service_name ASC
-    $q$, p_user_id)
+    $q$, p_user_id, v_extra)
     USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
   LOOP
     v_sheet_order := v_sheet_order + 1;
 
-    SELECT COALESCE(array_agg(DISTINCT keys.k ORDER BY keys.k), ARRAY[]::TEXT[])
+    EXECUTE format($q$
+      SELECT COALESCE(array_agg(DISTINCT keys.k ORDER BY keys.k), ARRAY[]::TEXT[])
+      FROM vw_sla_my_requests v
+      INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
+      CROSS JOIN LATERAL jsonb_object_keys(COALESCE(v.request_fields, '{}'::jsonb)) AS keys(k)
+      WHERE v.user_id = %1$s
+        AND (%2$s)
+        AND v.status = ANY($1)
+        AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
+        AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
+        AND ($4 IS NULL OR v.created_at::date >= $4)
+        AND ($5 IS NULL OR v.created_at::date <= $5)
+        AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
+        AND COALESCE(sr.sub_service_id, 0) = %3$s
+    $q$, p_user_id, v_extra, v_sub.sub_service_id_num)
     INTO v_dyn_keys
-    FROM vw_sla_my_requests v
-    INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
-    CROSS JOIN LATERAL jsonb_object_keys(COALESCE(v.request_fields, '{}'::jsonb)) AS keys(k)
-    WHERE v.user_id = p_user_id
-      AND v.status = ANY(p_statuses)
-      AND (p_service_ids IS NULL OR cardinality(p_service_ids) = 0 OR sr.service_id = ANY(p_service_ids))
-      AND (p_sub_service_ids IS NULL OR cardinality(p_sub_service_ids) = 0 OR sr.sub_service_id = ANY(p_sub_service_ids))
-      AND (p_from_date IS NULL OR v.created_at::date >= p_from_date)
-      AND (p_to_date IS NULL OR v.created_at::date <= p_to_date)
-      AND (p_search_text IS NULL OR trim(p_search_text) = '' OR CAST(v.request_id AS TEXT) ILIKE '%' || trim(p_search_text) || '%')
-      AND COALESCE(sr.sub_service_id, 0) = v_sub.sub_service_id_num;
+    USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text;
 
     v_dyn_labels := ARRAY[]::TEXT[];
     IF v_dyn_keys IS NOT NULL THEN
@@ -815,15 +826,16 @@ BEGIN
         INNER JOIN sla_requests sr ON sr.id = v.sla_request_id AND COALESCE(sr.is_deleted, false) = false
         LEFT JOIN users u ON u.id = v.user_id AND COALESCE(u.is_deleted, false) = false
         WHERE v.user_id = %1$s
+          AND (%2$s)
           AND v.status = ANY($1)
           AND ($2 IS NULL OR cardinality($2) = 0 OR sr.service_id = ANY($2))
           AND ($3 IS NULL OR cardinality($3) = 0 OR sr.sub_service_id = ANY($3))
           AND ($4 IS NULL OR v.created_at::date >= $4)
           AND ($5 IS NULL OR v.created_at::date <= $5)
           AND ($6 IS NULL OR trim($6) = '' OR CAST(v.request_id AS TEXT) ILIKE '%%' || trim($6) || '%%')
-          AND COALESCE(sr.sub_service_id, 0) = %2$s
-        ORDER BY %3$s %4$s, v.sla_request_id ASC
-      $q$, p_user_id, v_sub.sub_service_id_num, v_sort_col, v_sort_dir)
+          AND COALESCE(sr.sub_service_id, 0) = %3$s
+        ORDER BY %4$s %5$s, v.sla_request_id ASC
+      $q$, p_user_id, v_extra, v_sub.sub_service_id_num, v_sort_col, v_sort_dir)
       USING p_statuses, p_service_ids, p_sub_service_ids, p_from_date, p_to_date, p_search_text
     LOOP
       v_cells := ARRAY[
@@ -859,7 +871,7 @@ BEGIN
   RETURN QUERY
   SELECT *
   FROM sla_my_requests_approvals_excel_sheet(
-    format('v.user_id = %s', p_user_id),
+    format('v.user_id = %s AND (%s)', p_user_id, v_extra),
     p_statuses,
     p_service_ids,
     p_sub_service_ids,

package/src/models/CurrencyModel.ts

@@ -12,6 +12,9 @@ export class Currency extends BaseModel {
   @Column({ type: "varchar", length: 255, nullable: false })
   name: string; // Currency name (e.g., "Omani Rial", "US Dollar")
 
+  @Column({ type: "varchar", length: 255, nullable: true })
+  arabic_name: string; // Currency name (e.g., "Omani Rial", "US Dollar")
+
   @Column({ type: "varchar", length: 10, nullable: true })
   symbol: string; // Currency symbol (e.g., "﷼", "$")
 

package/src/models/LMSExternalEntityTrainedPersonModel.ts

@@ -37,6 +37,12 @@ export class LMSExternalEntityTrainedPerson extends BaseModel {
   @Column({ type: 'varchar', length: 255, nullable: true })
   training_period: string | null;
 
+  @Column({ type: 'date', nullable: true })
+  from_date: Date | null;
+
+  @Column({ type: 'date', nullable: true })
+  to_date: Date | null;
+
   @Column({ type: 'boolean', default: false })
   is_selected: boolean;