From 31dce409e569477c0fd4c47a5c8f621d393261b8 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 25 Sep 2025 09:30:45 +0530 Subject: [PATCH] CHANGE_UI_Issues - VADIVEL J 2025-09-25 --- app/Controllers/ThzController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php index 5a868035..8a61a1cc 100644 --- a/app/Controllers/ThzController.php +++ b/app/Controllers/ThzController.php @@ -149,6 +149,7 @@ class ThzController extends BaseController $data['assign_to'] = $data['assign_to'] ?? get_session_userid(); } + $tickets = $this->fetchTicketsBasedOnrole($data); @@ -472,7 +473,7 @@ class ThzController extends BaseController if (!empty($assign_to)) { // Tickets assigned to a staff return $this->thzMasterModel - ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name') + ->select('thz_master.*, user_profiles.first_name as assignee_name') ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left') ->where('thz_master.assign_to', $assign_to) ->orderBy('thz_master.created_at', 'desc') @@ -483,7 +484,7 @@ class ThzController extends BaseController if (!empty($mobile)) { // Specific ticket by ID and mobile return $this->thzMasterModel - ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name') + ->select('thz_master.*, user_profiles.first_name as assignee_name') ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left') // ->where('thz_id', $id) ->where('thz_master.mobile', $mobile) @@ -493,7 +494,7 @@ class ThzController extends BaseController // All tickets (e.g., for managers) return $this->thzMasterModel - ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name') + ->select('thz_master.*, user_profiles.first_name as assignee_name') ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left') ->orderBy('thz_master.created_at', 'desc') ->findAll();