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

Merge remote-tracking branch 'upstream/dev' into refactorSat

Browse Source
This commit is contained in:
phl0
2024-12-02 15:35:22 +01:00
parent 2beebb0900 dc1cdba526
commit b5c4f62eb8
36 changed files with 2124 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/models/Distancerecords_model.php
View File

@@ -91,6 +91,7 @@ class Distancerecords_model extends CI_Model {
$this->db->select('*, satellite.displayname AS sat_displayname');
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->join('satellite', 'satellite.name = '.$this->config->item('table_name').'.COL_SAT_NAME');
$this->db->join('dxcc_entities', $this->config->item('table_name') . '.col_dxcc = dxcc_entities.adif', 'left outer');
$this->db->where('COL_SAT_NAME', $sat);
$this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
$this->db->order_by("COL_DISTANCE", "desc");