From b2e32080c2ac74f7f7c931fd0deba8faac33d06b Mon Sep 17 00:00:00 2001
From: Thomas Werzmirzowsky <werzi2001@gmx.de>
Date: Wed, 4 May 2022 23:42:05 +0200
Subject: [PATCH] added possibility to sort locations by id server side sort is
 obsolete because of client side sort

---
 application/models/Logbooks_model.php       | 1 -
 application/models/Stations.php             | 1 -
 application/views/station_profile/index.php | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php
index 1357b704..2351ca14 100644
--- a/application/models/Logbooks_model.php
+++ b/application/models/Logbooks_model.php
@@ -4,7 +4,6 @@ class Logbooks_model extends CI_Model {
 
     function show_all() {
         $this->db->where('user_id', $this->session->userdata('user_id'));
-        $this->db->order_by('logbook_name');
 		return $this->db->get('station_logbooks');
 	}
 
diff --git a/application/models/Stations.php b/application/models/Stations.php
index e7db2844..1a1e1b85 100644
--- a/application/models/Stations.php
+++ b/application/models/Stations.php
@@ -10,7 +10,6 @@ class Stations extends CI_Model {
        	$this->db->group_by('station_profile.station_id');
 		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$this->db->or_where('station_profile.user_id =', NULL);
-		$this->db->order_by('station_profile.station_profile_name');
         return $this->db->get();
 	}
 
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php
index 970db8ec..b6401e8c 100644
--- a/application/views/station_profile/index.php
+++ b/application/views/station_profile/index.php
@@ -60,7 +60,7 @@
 					<td><?php echo $row->station_callsign;?></td>
 					<td><?php echo $row->station_country;?></td>
 					<td><?php echo $row->station_gridsquare;?></td>
-					<td style="text-align: center">
+					<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
 						<?php if($row->station_active != 1) { ?>
 							<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make station <?php echo $row->station_profile_name; ?> the active station?');">Set Active</a>
 						<?php } else { ?>