From 11d6ee8728948ae1c683b4ed97d0ed70c363ea08 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Tue, 30 Dec 2025 09:33:05 +0100 Subject: [PATCH] fixed sorting --- .../AssetManagement/AssetManagementController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/AssetManagement/AssetManagementController.php b/application/AssetManagement/AssetManagementController.php index 9db10b068..af710d615 100644 --- a/application/AssetManagement/AssetManagementController.php +++ b/application/AssetManagement/AssetManagementController.php @@ -7,7 +7,7 @@ class AssetManagementController extends TTCrud // Simplified columns for better layout, details are in the 'assetDetails' slot protected array $columns = [ - ['key' => 'assetDetails', 'text' => 'Gerät', 'modal' => false, 'table' => ['filter' => 'search']], + ['key' => 'assetDetails', 'text' => 'Gerät', 'modal' => false, 'table' => ['filter' => 'search', 'sortable' => true]], ['key' => 'currentUser', 'text' => 'Status', 'modal' => false, 'table' => ['sortable' => false, 'filter' => false]], ['key' => 'location', 'text' => 'Lagerort', 'required' => true, 'modal' => ['type' => 'text'], 'table' => ['filter' => 'search']], ['key' => 'serviceDueDate', 'text' => 'Service fällig', 'required' => false, 'modal' => ['type' => 'date'], 'table' => ['filter' => 'date']], @@ -42,7 +42,12 @@ class AssetManagementController extends TTCrud $json = json_decode(file_get_contents('php://input'), true); $pagination = $json['pagination'] ?? ['page' => 1, 'per_page' => 10]; $filters = $json['filters'] ?? []; - $order = $json['order'] ?? ['key' => 'id', 'order' => 'DESC']; + $order = $json['order'] ?? ['key' => 'name', 'order' => 'ASC']; + + // Map virtual column 'assetDetails' to actual 'name' column for sorting + if (isset($order['key']) && $order['key'] === 'assetDetails') { + $order['key'] = 'name'; + } // Fetch paginated assets $assets = AssetManagementModel::getAll($filters, $pagination['per_page'], ($pagination['page'] - 1) * $pagination['per_page'], $order);