Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue with dashboard dates being out of order #1959

Merged
merged 3 commits into from
Jan 27, 2023
Merged

Fixes issue with dashboard dates being out of order #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d10a070
Order by primary key as second criterion
phl0 Jan 25, 2023
84e689b
Merge pull request #1954 from phl0/secondaryOrderCriteria
magicbug Jan 26, 2023
348342d
[Dashboard] Fixes QSOs being out of order
magicbug Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions application/models/Logbook_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,7 @@ function get_qsos($num, $offset, $StationLocationsArray = null) {
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->where_in('station_profile.station_id', $logbooks_locations_array);
$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($num);
$this->db->offset($offset);
Expand Down Expand Up @@ -1179,11 +1180,12 @@ function get_last_qsos($num, $StationLocationsArray = null) {

$sql = "SELECT * FROM ( select * from " . $this->config->item('table_name'). "
WHERE station_id IN(". $location_list .")
order by col_time_on desc
order by col_time_on desc, col_primary_key desc
limit " . $num .
") hrd
JOIN station_profile ON station_profile.station_id = hrd.station_id
LEFT JOIN dxcc_entities ON hrd.col_dxcc = dxcc_entities.adif";
LEFT JOIN dxcc_entities ON hrd.col_dxcc = dxcc_entities.adif
order by col_time_on desc, col_primary_key desc";

$query = $this->db->query($sql);

Expand Down
4 changes: 2 additions & 2 deletions application/models/Logbookadvanced_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function searchQsos($searchCriteria) : array {
INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
WHERE station_profile.user_id = ?
$where
ORDER BY qsos.COL_TIME_ON desc
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc
LIMIT $limit
";

Expand Down Expand Up @@ -217,4 +217,4 @@ function get_modes() {

return $modes;
}
}
}