Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PK as secondary sorting criteria (as in other places)

Browse Source
This commit is contained in:
phl0
2025-02-02 11:57:19 +01:00
parent de5be2f111
commit cc6bd962ea
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Logbook.php
View File

@@ -640,6 +640,7 @@ class Logbook extends CI_Controller {
$this->db->group_end();
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
$this->db->order_by($this->config->item('table_name').".COL_PRIMARY_KEY", "desc");
$this->db->limit($count);
$query = $this->db->get();

3
application/models/Logbook_model.php
View File

@@ -1539,6 +1539,7 @@ class Logbook_model extends CI_Model {
$this->db->join('dxcc_entities', $this->config->item('table_name') . '.col_dxcc = dxcc_entities.adif', 'left outer');
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->order_by("COL_PRIMARY_KEY", "desc");
$this->db->limit($num);
return $this->db->get($this->config->item('table_name'));
@@ -2246,7 +2247,7 @@ class Logbook_model extends CI_Model {
LIMIT ?) hrd
JOIN station_profile ON station_profile.station_id = hrd.station_id
LEFT JOIN dxcc_entities ON hrd.col_dxcc = dxcc_entities.adif
ORDER BY col_time_on DESC";
ORDER BY col_time_on DESC, col_primary_key DESC";
$binding[] = $num * 1;
$query = $this->db->query($sql, $binding);