From 64579c72e3ea596f9eaa98e04ebee38b13f3db23 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 17 Nov 2025 11:38:52 +0530
Subject: [PATCH] FIX_HR_CLAIMSTATUS

---
 app/Controllers/EmployeeRestController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 7655ccff..581c29f6 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2474,7 +2474,13 @@ class EmployeeRestController extends AdminController
         $builder->select([
             'tm.id',
             'tm.ticket_type_id',
-            'tcs.claim_status AS status',
+            'tcs.claim_status AS original_status',
+            "CASE 
+                WHEN tcs.display_name IS NULL OR tcs.display_name = '' 
+                    THEN claims_status
+                ELSE UPPER(tcs.display_name)
+                END AS status
+            ",
             'tm.claim_number AS claim_no',
             'tm.claim_status_id',
             'tm.is_head_approved',
@@ -2590,6 +2596,7 @@ class EmployeeRestController extends AdminController
                 if ($history['old_status_value'] === $status) {
                     // Attach modified_by and created_at
                     // $fields['modified_by'] = $history['modified_by'];
+                    $fields['modified_by'] = "";
                     $fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at']));
                     // Break after first match (assuming latest entry is enough)
                     break;