@platform-modules/civil-aviation-authority 2.3.264 → 2.3.266

package/sql/sla_reports_admin_procedures.sql

@@ -0,0 +1,283 @@
+-- Admin SLA reports + approvals Excel export
+-- Prerequisites: sla_reports_procedures.sql, vw_sla_my_requests.sql, vw_sla_approvals.sql
+-- Applied via: npm run sync:sla-sql (after sla_reports_procedures.sql in manifest)
+
+CREATE OR REPLACE FUNCTION sla_filtered_request_fields(p_request_obj JSONB)
+RETURNS JSONB
+LANGUAGE sql
+IMMUTABLE
+AS $$
+  SELECT
+    COALESCE(p_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';
+$$;
+
+-- Admin list views: served by Reports_Service TypeORM (sla-my-requests-view.query.ts, sla-approvals-view.query.ts)
+
+-- ---------------------------------------------------------------------------
+-- ADMIN — my requests Excel (optional p_target_user_id)
+-- Per sub-service Requests + Approvals sheets (same as user my-requests download)
+-- ---------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION sp_sla_admin_my_requests_excel_export(
+  p_target_user_id    INT      DEFAULT NULL,
+  p_service_ids       INT[]    DEFAULT NULL,
+  p_sub_service_ids   INT[]    DEFAULT NULL,
+  p_statuses          TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_from_date         DATE     DEFAULT NULL,
+  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'
+)
+RETURNS TABLE (
+  sheet_order         INT,
+  sub_service_id      INT,
+  sub_service_name    TEXT,
+  sheet_name          TEXT,
+  headers             JSONB,
+  rows                JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_sort_col          TEXT;
+  v_sort_dir          TEXT;
+  v_sub               RECORD;
+  v_row               RECORD;
+  v_dyn_keys          TEXT[];
+  v_dyn_labels        TEXT[];
+  v_common_labels     TEXT[] := ARRAY[
+    'SLA Request ID', 'Request ID', 'User', 'Status', 'Created At',
+    'Created By', 'Department', 'Section'
+  ];
+  v_headers_labels    TEXT[];
+  v_headers_json      JSONB;
+  v_cells             TEXT[];
+  v_all_rows          JSONB;
+  v_k                 TEXT;
+  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_sort_col := CASE lower(trim(p_sort_by))
+    WHEN 'updated_at'  THEN 'v.created_at'
+    WHEN 'id'          THEN 'v.sla_request_id'
+    WHEN 'status'       THEN 'v.status'
+    WHEN 'request_id'   THEN 'v.request_id'
+    ELSE 'v.created_at'
+  END;
+  v_sort_dir := CASE WHEN upper(trim(p_sort_order)) = 'ASC' THEN 'ASC' ELSE 'DESC' END;
+
+  FOR v_sub IN
+    EXECUTE format($q$
+      SELECT DISTINCT
+        COALESCE(sr.sub_service_id, 0) AS sub_service_id_num,
+        COALESCE(NULLIF(trim(subsvc.sub_service_name), ''), NULLIF(trim(v.sub_service_name), ''), 'Uncategorized') AS sub_service_name
+      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
+      LEFT JOIN caa_sub_services subsvc ON subsvc.id = sr.sub_service_id
+      WHERE %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) || '%%')
+      ORDER BY sub_service_name ASC
+    $q$, v_user_filter)
+    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;
+
+    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 %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) = %s
+    $q$, v_user_filter, v_sub.sub_service_id_num)
+    INTO v_dyn_keys
+    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
+      FOREACH v_k IN ARRAY v_dyn_keys LOOP
+        v_dyn_labels := array_append(v_dyn_labels, sla_excel_header_label(v_k));
+      END LOOP;
+    END IF;
+
+    v_headers_labels := ARRAY(
+      SELECT sla_excel_header_label(lbl)
+      FROM unnest(v_common_labels || COALESCE(v_dyn_labels, ARRAY[]::TEXT[])) AS u(lbl)
+    );
+    v_headers_json := to_jsonb(v_headers_labels);
+    v_all_rows := '[]'::jsonb;
+
+    FOR v_row IN
+      EXECUTE format($q$
+        SELECT
+          v.sla_request_id, v.request_id, v.status, v.created_at, v.created_by,
+          v.req_user_department_id, v.req_user_section_id, v.request_fields,
+          TRIM(COALESCE(u.employee_name, '')) AS user_name
+        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
+        LEFT JOIN users u ON u.id = v.user_id AND COALESCE(u.is_deleted, false) = false
+        WHERE %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) = %s
+        ORDER BY %s %s, v.sla_request_id ASC
+      $q$, v_user_filter, 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[
+        COALESCE(v_row.sla_request_id::TEXT, ''),
+        COALESCE(v_row.request_id::TEXT, ''),
+        COALESCE(v_row.user_name, ''),
+        COALESCE(v_row.status, ''),
+        COALESCE(to_char(v_row.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), ''),
+        COALESCE(v_row.created_by, ''),
+        COALESCE(v_row.req_user_department_id, ''),
+        COALESCE(v_row.req_user_section_id, '')
+      ];
+      IF v_dyn_keys IS NOT NULL THEN
+        FOREACH v_k IN ARRAY v_dyn_keys LOOP
+          v_cells := array_append(v_cells, COALESCE(sla_request_field_cell(v_row.request_fields, v_k), ''));
+        END LOOP;
+      END IF;
+      v_all_rows := v_all_rows || jsonb_build_array(to_jsonb(v_cells));
+    END LOOP;
+
+    sheet_order := v_sheet_order;
+    sub_service_id := NULLIF(v_sub.sub_service_id_num, 0);
+    sub_service_name := v_sub.sub_service_name;
+    sheet_name := sla_excel_sheet_name(v_sub.sub_service_name);
+    headers := v_headers_json;
+    rows := v_all_rows;
+    RETURN NEXT;
+  END LOOP;
+
+  RETURN QUERY
+  SELECT *
+  FROM sla_my_requests_approvals_excel_sheet(
+    v_user_filter,
+    p_statuses,
+    p_service_ids,
+    p_sub_service_ids,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    v_sheet_order + 1
+  );
+
+  RETURN;
+END;
+$$;
+
+-- ---------------------------------------------------------------------------
+-- APPROVALS — Excel export (approver-scoped; user download)
+-- Workbook: per sub-service Requests + Approvals (see sla_reports_approvals_workbook.sql)
+-- ---------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS sp_sla_approvals_excel_export_internal(
+  TEXT, BOOLEAN, 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,
+  p_sub_service_ids     INT[]    DEFAULT NULL,
+  p_request_statuses    TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_approval_statuses   TEXT[]   DEFAULT ARRAY['In Progress','Approved','Rejected'],
+  p_from_date           DATE     DEFAULT NULL,
+  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'
+)
+RETURNS TABLE (
+  sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
+)
+LANGUAGE plpgsql
+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);
+BEGIN
+  RETURN QUERY
+  SELECT * FROM sp_sla_approvals_workbook_excel_export(
+    v_exists,
+    v_own,
+    p_service_ids,
+    p_sub_service_ids,
+    p_request_statuses,
+    p_approval_statuses,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    p_sort_by,
+    p_sort_order
+  );
+END;
+$$;
+
+-- ---------------------------------------------------------------------------
+-- ADMIN — approvals Excel
+-- Per sub-service Requests + Approvals; optional approver_user_id (NULL = all queues)
+-- Does not exclude own requests (unlike user approvals download)
+-- ---------------------------------------------------------------------------
+CREATE OR REPLACE FUNCTION sp_sla_admin_approvals_excel_export(
+  p_target_approver_user_id INT      DEFAULT NULL,
+  p_service_ids             INT[]    DEFAULT NULL,
+  p_sub_service_ids         INT[]    DEFAULT NULL,
+  p_request_statuses        TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_approval_statuses       TEXT[]   DEFAULT ARRAY['In Progress','Approved','Rejected'],
+  p_from_date               DATE     DEFAULT NULL,
+  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'
+)
+RETURNS TABLE (
+  sheet_order INT, sub_service_id INT, sub_service_name TEXT, sheet_name TEXT, headers JSONB, rows JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_exists TEXT := sla_approval_queue_exists_sql_optional(p_target_approver_user_id);
+  v_own    TEXT := 'TRUE';
+BEGIN
+  RETURN QUERY
+  SELECT * FROM sp_sla_approvals_workbook_excel_export(
+    v_exists,
+    v_own,
+    p_service_ids,
+    p_sub_service_ids,
+    p_request_statuses,
+    p_approval_statuses,
+    p_from_date,
+    p_to_date,
+    p_search_text,
+    p_sort_by,
+    p_sort_order
+  );
+END;
+$$;

package/sql/sla_reports_approvals_workbook.sql

@@ -0,0 +1,383 @@
+-- Approvals Excel download: per sub-service "{name} Requests" + "{name} Approvals"
+-- Approver queue filter uses EXISTS on sla_approval (same pattern as HR annual-training-plan).
+-- Applied via: npm run sync:sla-sql
+
+CREATE OR REPLACE FUNCTION sla_approval_matches_user_view(p_va_alias TEXT, p_user_id INT)
+RETURNS TEXT
+LANGUAGE sql
+IMMUTABLE
+AS $$
+SELECT format('(
+  %1$s.approver_user_id = %2$s
+  OR %1$s.delegate_user_id = %2$s
+  OR (
+    %1$s.approver_user_id IS NULL
+    AND %1$s.delegate_user_id IS NULL
+    AND %1$s.approval_role_id IS NOT NULL
+    AND %1$s.approval_department_id IS NOT NULL
+    AND EXISTS (
+      SELECT 1 FROM user_role ur
+      WHERE ur.user_id = %2$s
+        AND ur.role_id = %1$s.approval_role_id
+        AND ur.department_id = %1$s.approval_department_id
+        AND (
+          %1$s.approval_section_id IS NULL
+          OR (%1$s.approval_section_id IS NOT NULL AND (ur.section_id = %1$s.approval_section_id OR ur.section_id IS NULL))
+        )
+        AND ur.is_deleted = false AND ur.is_active = true
+    )
+  )
+  OR (
+    %1$s.approver_user_id IS NULL
+    AND %1$s.delegate_user_id IS NULL
+    AND %1$s.approval_role_id IS NULL
+    AND %1$s.approval_department_id IS NOT NULL
+    AND %1$s.approval_section_id IS NOT NULL
+    AND EXISTS (
+      SELECT 1 FROM users u
+      WHERE u.id = %2$s AND COALESCE(u.is_deleted, false) = false
+        AND u.department = %1$s.approval_department_id AND u.section = %1$s.approval_section_id
+    )
+  )
+  OR (
+    %1$s.approver_user_id IS NULL
+    AND %1$s.delegate_user_id IS NULL
+    AND %1$s.approval_role_id IS NULL
+    AND %1$s.approval_department_id IS NOT NULL
+    AND %1$s.approval_section_id IS NULL
+    AND EXISTS (
+      SELECT 1 FROM users u
+      WHERE u.id = %2$s AND COALESCE(u.is_deleted, false) = false
+        AND u.department = %1$s.approval_department_id
+    )
+  )
+)', p_va_alias, p_user_id);
+$$;
+
+-- EXISTS (sla_approval appr ...) — mirrors annual_training_plan_approvals queue filter
+CREATE OR REPLACE FUNCTION sla_approval_queue_exists_sql(p_user_id INT)
+RETURNS TEXT
+LANGUAGE sql
+IMMUTABLE
+AS $$
+  SELECT format(
+    'EXISTS (
+      SELECT 1
+      FROM sla_approval appr
+      WHERE appr.request_id = sr.request_id
+        AND COALESCE(appr.is_deleted, false) = false
+        AND (appr.service_id = sr.service_id OR appr.service_id IS NULL)
+        AND (appr.sub_service_id = sr.sub_service_id OR appr.sub_service_id IS NULL)
+        AND (%s)
+        AND (appr.approval_status = ANY($1) OR appr.approval_status IS NULL)
+    )',
+    sla_approval_matches_user('appr', p_user_id)
+  );
+$$;
+
+-- Admin: all approvers (NULL user) — any request with a matching approval row
+CREATE OR REPLACE FUNCTION sla_approval_queue_exists_sql_optional(p_user_id INT)
+RETURNS TEXT
+LANGUAGE sql
+STABLE
+AS $$
+  SELECT CASE
+    WHEN p_user_id IS NULL THEN
+      'EXISTS (
+        SELECT 1
+        FROM sla_approval appr
+        WHERE appr.request_id = sr.request_id
+          AND COALESCE(appr.is_deleted, false) = false
+          AND (appr.service_id = sr.service_id OR appr.service_id IS NULL)
+          AND (appr.sub_service_id = sr.sub_service_id OR appr.sub_service_id IS NULL)
+          AND (appr.approval_status = ANY($1) OR appr.approval_status IS NULL)
+      )'
+    ELSE sla_approval_queue_exists_sql(p_user_id)
+  END;
+$$;
+
+DROP FUNCTION IF EXISTS sp_sla_approvals_workbook_excel_export(
+  TEXT, TEXT, INT[], INT[], TEXT[], TEXT[], DATE, DATE, TEXT, TEXT, TEXT
+);
+
+CREATE OR REPLACE FUNCTION sp_sla_approvals_workbook_excel_export(
+  p_queue_exists_sql        TEXT,
+  p_own_requests_filter_sql TEXT,
+  p_service_ids             INT[]    DEFAULT NULL,
+  p_sub_service_ids         INT[]    DEFAULT NULL,
+  p_request_statuses        TEXT[]   DEFAULT ARRAY['Pending','In Progress','Approved','Rejected'],
+  p_approval_statuses       TEXT[]   DEFAULT ARRAY['In Progress','Approved','Rejected'],
+  p_from_date               DATE     DEFAULT NULL,
+  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'
+)
+RETURNS TABLE (
+  sheet_order         INT,
+  sub_service_id      INT,
+  sub_service_name    TEXT,
+  sheet_name          TEXT,
+  headers             JSONB,
+  rows                JSONB
+)
+LANGUAGE plpgsql
+STABLE
+AS $$
+DECLARE
+  v_sort_col_req      TEXT;
+  v_sort_dir          TEXT;
+  v_sub               RECORD;
+  v_row               RECORD;
+  v_approval          RECORD;
+  v_dyn_keys          TEXT[];
+  v_dyn_labels        TEXT[];
+  v_common_req_labels TEXT[] := ARRAY[
+    'SLA Request ID', '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',
+    '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',
+    'Approved By ID', 'Approved By Name', 'Comment', 'Created At', 'Updated At'
+  ];
+  v_headers_labels    TEXT[];
+  v_headers_json      JSONB;
+  v_cells             TEXT[];
+  v_all_rows          JSONB;
+  v_k                 TEXT;
+  v_sheet_order       INT := 0;
+  v_sheet_label       TEXT;
+BEGIN
+  v_sort_col_req := CASE lower(trim(p_sort_by))
+    WHEN 'updated_at'  THEN 'v.created_at'
+    WHEN 'id'          THEN 'v.sla_request_id'
+    WHEN 'status'       THEN 'v.status'
+    WHEN 'request_id'   THEN 'v.request_id'
+    ELSE 'v.created_at'
+  END;
+  v_sort_dir := CASE WHEN upper(trim(p_sort_order)) = 'ASC' THEN 'ASC' ELSE 'DESC' END;
+
+  -- ----- Per sub-service: Requests (queue requests with dynamic request_fields) -----
+  FOR v_sub IN
+    EXECUTE format($q$
+      SELECT DISTINCT
+        COALESCE(sr.sub_service_id, 0) AS sub_service_id_num,
+        COALESCE(NULLIF(trim(subsvc.sub_service_name), ''), NULLIF(trim(v.sub_service_name), ''), 'Uncategorized') AS sub_service_name
+      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
+      LEFT JOIN caa_sub_services subsvc ON subsvc.id = sr.sub_service_id
+      WHERE (%s)
+        AND (%s)
+        AND sr.status::TEXT = 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) || '%%')
+      ORDER BY sub_service_name ASC
+    $q$, p_own_requests_filter_sql, p_queue_exists_sql)
+    USING p_request_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;
+
+    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 (%s)
+        AND (%s)
+        AND sr.status::TEXT = 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) = %s
+    $q$, p_own_requests_filter_sql, p_queue_exists_sql, v_sub.sub_service_id_num)
+    INTO v_dyn_keys
+    USING p_request_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
+      FOREACH v_k IN ARRAY v_dyn_keys LOOP
+        v_dyn_labels := array_append(v_dyn_labels, sla_excel_header_label(v_k));
+      END LOOP;
+    END IF;
+
+    v_headers_labels := ARRAY(
+      SELECT sla_excel_header_label(lbl)
+      FROM unnest(v_common_req_labels || COALESCE(v_dyn_labels, ARRAY[]::TEXT[])) AS u(lbl)
+    );
+    v_headers_json := to_jsonb(v_headers_labels);
+    v_all_rows := '[]'::jsonb;
+
+    FOR v_row IN
+      EXECUTE format($q$
+        SELECT
+          v.sla_request_id,
+          v.request_id,
+          v.status,
+          v.created_at,
+          v.created_by,
+          v.req_user_department_id,
+          v.req_user_section_id,
+          v.request_fields,
+          TRIM(COALESCE(u.employee_name, '')) AS user_name
+        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
+        LEFT JOIN users u ON u.id = v.user_id AND COALESCE(u.is_deleted, false) = false
+        WHERE (%s)
+          AND (%s)
+          AND sr.status::TEXT = 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) = %s
+        ORDER BY %s %s, v.sla_request_id ASC
+      $q$, p_own_requests_filter_sql, p_queue_exists_sql, v_sub.sub_service_id_num, v_sort_col_req, v_sort_dir)
+      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, ''),
+        COALESCE(to_char(v_row.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), ''),
+        COALESCE(v_row.created_by, ''),
+        COALESCE(v_row.req_user_department_id, ''),
+        COALESCE(v_row.req_user_section_id, '')
+      ];
+      IF v_dyn_keys IS NOT NULL THEN
+        FOREACH v_k IN ARRAY v_dyn_keys LOOP
+          v_cells := array_append(v_cells, COALESCE(sla_request_field_cell(v_row.request_fields, v_k), ''));
+        END LOOP;
+      END IF;
+      v_all_rows := v_all_rows || jsonb_build_array(to_jsonb(v_cells));
+    END LOOP;
+
+    sheet_order      := v_sheet_order;
+    sub_service_id   := NULLIF(v_sub.sub_service_id_num, 0);
+    sub_service_name := v_sub.sub_service_name;
+    sheet_name       := sla_excel_sheet_name(v_sub.sub_service_name);
+    headers          := v_headers_json;
+    rows             := v_all_rows;
+    RETURN NEXT;
+  END LOOP;
+
+  -- ----- Per sub-service: Approvals (all steps for queue requests) -----
+  FOR v_sub IN
+    EXECUTE format($q$
+      SELECT DISTINCT
+        COALESCE(sr.sub_service_id, 0) AS sub_service_id_num,
+        COALESCE(NULLIF(trim(subsvc.sub_service_name), ''), NULLIF(trim(v.sub_service_name), ''), 'Uncategorized') AS sub_service_name
+      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
+      LEFT JOIN caa_sub_services subsvc ON subsvc.id = sr.sub_service_id
+      WHERE (%s)
+        AND (%s)
+        AND sr.status::TEXT = 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) || '%%')
+      ORDER BY sub_service_name ASC
+    $q$, p_own_requests_filter_sql, p_queue_exists_sql)
+    USING p_request_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;
+    v_sheet_label := sla_excel_approvals_sheet_name(v_sub.sub_service_name);
+    v_all_rows := '[]'::jsonb;
+
+    FOR v_approval IN
+      EXECUTE format($q$
+        SELECT
+          va.request_id,
+          sr.service_id,
+          va.service_name,
+          sr.sub_service_id,
+          va.sub_service_name,
+          va.sla_approval_id,
+          va.source_approval_id,
+          va.level,
+          va.approval_status,
+          va.request_status,
+          va.approval_role_id,
+          va.approval_role_name,
+          va.approval_department_id,
+          va.approval_department_name,
+          va.approval_section_id,
+          va.approval_section_name,
+          va.approver_user_id,
+          va.approver_user_name,
+          va.delegate_user_id,
+          va.delegate_user_name,
+          va.approved_by,
+          va.approved_by_name,
+          va.comment,
+          va.created_at,
+          va.updated_at
+        FROM vw_sla_approvals va
+        INNER JOIN sla_requests sr
+          ON sr.request_id = va.request_id AND COALESCE(sr.is_deleted, false) = false
+        INNER JOIN vw_sla_my_requests v ON v.sla_request_id = sr.id
+        WHERE (%s)
+          AND (%s)
+          AND sr.status::TEXT = 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) = %s
+        ORDER BY va.request_id ASC, va.level ASC NULLS LAST, va.sla_approval_id ASC
+      $q$, p_own_requests_filter_sql, p_queue_exists_sql, v_sub.sub_service_id_num)
+      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_approval.request_id::TEXT, ''),
+        COALESCE(v_approval.service_id::TEXT, ''),
+        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, ''),
+        COALESCE(v_approval.approval_role_id::TEXT, ''),
+        COALESCE(v_approval.approval_role_name, ''),
+        COALESCE(v_approval.approval_department_id::TEXT, ''),
+        COALESCE(v_approval.approval_department_name, ''),
+        COALESCE(v_approval.approval_section_id::TEXT, ''),
+        COALESCE(v_approval.approval_section_name, ''),
+        COALESCE(v_approval.approver_user_id::TEXT, ''),
+        COALESCE(v_approval.approver_user_name, ''),
+        COALESCE(v_approval.delegate_user_id::TEXT, ''),
+        COALESCE(v_approval.delegate_user_name, ''),
+        COALESCE(v_approval.approved_by::TEXT, ''),
+        COALESCE(v_approval.approved_by_name, ''),
+        COALESCE(v_approval.comment, ''),
+        COALESCE(to_char(v_approval.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), ''),
+        COALESCE(to_char(v_approval.updated_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), '')
+      ];
+      v_all_rows := v_all_rows || jsonb_build_array(to_jsonb(v_cells));
+    END LOOP;
+
+    sheet_order      := v_sheet_order;
+    sub_service_id   := NULLIF(v_sub.sub_service_id_num, 0);
+    sub_service_name := v_sub.sub_service_name;
+    sheet_name       := v_sheet_label;
+    headers          := to_jsonb(v_approval_headers);
+    rows             := v_all_rows;
+    RETURN NEXT;
+  END LOOP;
+END;
+$$;