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

Fix / Re-Add orbit at LBA

Browse Source
This commit is contained in:
int2001
2026-02-06 08:15:06 +00:00
parent df67dba116
commit 74edf6778c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/models/Logbookadvanced_model.php
View File

@@ -96,9 +96,12 @@ class Logbookadvanced_model extends CI_Model {
public function searchDb($searchCriteria) {
// Load all satellites once for PHP-side join (much faster than SQL COALESCE)
$satellites = [];
$sat_query = $this->db->query('SELECT name, displayname FROM satellite');
$sat_query = $this->db->query('SELECT name, displayname, orbit FROM satellite');
foreach ($sat_query->result() as $sat) {
$satellites[$sat->name] = $sat->displayname;
$satellites[$sat->name] = [
'displayname' => $sat->displayname,
'orbit' => $sat->orbit
];
}
$conditions = [];
@@ -238,7 +241,7 @@ class Logbookadvanced_model extends CI_Model {
}
}
if ($searchCriteria['orbits'] !== 'All' && $searchCriteria['orbits'] !== '') {
$conditions[] = "orbit = ?";
$conditions[] = "COL_SAT_NAME IN (SELECT name FROM satellite WHERE orbit = ?)";
$binding[] = $searchCriteria['orbits'];
}
if ($searchCriteria['qslSent'] !== '') {
@@ -664,8 +667,10 @@ class Logbookadvanced_model extends CI_Model {
foreach ($results as &$row) {
$row->sat_name = $row->COL_SAT_NAME ?? null;
$row->sat_displayname = null;
$row->sat_orbit = null;
if (!empty($row->COL_SAT_NAME) && isset($satellites[$row->COL_SAT_NAME])) {
$row->sat_displayname = $satellites[$row->COL_SAT_NAME];
$row->sat_displayname = $satellites[$row->COL_SAT_NAME]['displayname'];
$row->sat_orbit = $satellites[$row->COL_SAT_NAME]['orbit'];
}
}
unset($row);