From 687b8535992309a7cf84f19bce4bfa3e5c2e0c7a Mon Sep 17 00:00:00 2001 From: mahdahar <89adham@gmail.com> Date: Fri, 7 Nov 2025 08:39:01 +0700 Subject: [PATCH] fix workstation show --- app/Controllers/Organization/Workstation.php | 2 +- app/Models/Organization/WorkstationModel.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controllers/Organization/Workstation.php b/app/Controllers/Organization/Workstation.php index 4c052fc..800102f 100644 --- a/app/Controllers/Organization/Workstation.php +++ b/app/Controllers/Organization/Workstation.php @@ -64,7 +64,7 @@ class Workstation extends BaseController { try { $id = $input['WorkstationID']; $this->model->update($id, $input); - return $this->respondCreated([ 'status' => 'success', 'message' => 'data updated successfully', 'data' => $id ], 201); + return $this->respondCreated([ 'status' => 'success', 'message' => 'data updated successfully', 'data' => $this->db->getLastQuery()->getQuery() ], 201); } catch (\Throwable $e) { return $this->failServerError('Something went wrong: ' . $e->getMessage()); } diff --git a/app/Models/Organization/WorkstationModel.php b/app/Models/Organization/WorkstationModel.php index 6a02eb5..862ab46 100644 --- a/app/Models/Organization/WorkstationModel.php +++ b/app/Models/Organization/WorkstationModel.php @@ -15,7 +15,7 @@ class WorkstationModel extends BaseModel { protected $deletedField = 'EndDate'; public function getWorkstations() { - $rows = $this->select('workstation.*, department.DepartmentName, wst1.WorkstationName') + $rows = $this->select('workstation.*, department.DepartmentName, wst1.WorkstationName as LinkToName') ->join('workstation wst1', 'workstation.LinkTo=wst1.WorkstationID', 'left') ->join('department', 'department.DepartmentID=workstation.DepartmentID', 'left') ->findAll(); @@ -23,7 +23,7 @@ class WorkstationModel extends BaseModel { } public function getWorkstation($WorkstationID) { - $rows = $this->select('workstation.*, department.DepartmentName, wst1.WorkstationName') + $rows = $this->select('workstation.*, department.DepartmentName, wst1.WorkstationName as LinkToName') ->join('workstation wst1', 'workstation.LinkTo=wst1.WorkstationID', 'left') ->join('department', 'department.DepartmentID=workstation.DepartmentID', 'left') ->where('workstation.WorkstationID', $WorkstationID)