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 pull request #2122 from phl0/namelessSats

Browse Source 
Use displayname incase LoTW name is not set (yet)
This commit is contained in:
Florian (DF2ET)
2025-07-08 15:04:32 +02:00
committed by GitHub
parent 4ca720ea2d d59dfd0a04
commit 74841cbab4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/Satellite_model.php
View File

@@ -28,7 +28,7 @@ class Satellite_model extends CI_Model {
}
function get_all_satellites_with_tle() {
$sql = "select satellite.id, satellite.name as satname, tle.tle
$sql = "select satellite.id, satellite.name as satname, satellite.displayname as displayname, tle.tle
from satellite
join tle on satellite.id = tle.satelliteid
order by satellite.name
@@ -189,7 +189,7 @@ class Satellite_model extends CI_Model {
}
function get_tle($sat) {
$this->db->select('satellite.name AS satellite, tle.tle, tle.updated');
$this->db->select('satellite.name AS satellite, satellite.displayname AS displayname, tle.tle, tle.updated');
$this->db->join('tle', 'satellite.id = tle.satelliteid');
$this->db->where('name', $sat);
$query = $this->db->get('satellite');

2
application/views/satellite/flightpath.php
View File

@@ -42,7 +42,7 @@
<?php foreach($satellites as $sat) {
echo '<option value="' . $sat->satname . '"';
if ($sat->satname == $selsat) { echo ' selected'; }
echo '>' . $sat->satname . '</option>'."\n";
echo '>' . ($sat->satname != null ? ($sat->satname.' ('.$sat->displayname.')') : $sat->displayname). '</option>'."\n";
} ?>
</select>
</form>

4
assets/js/sections/flightpath.js
View File

@@ -695,7 +695,7 @@ function getBearing(lat1, lng1, lat2, lng2) {
}
function start(data) {
init(data.satellite);
init((data.satellite != '' ? (data.satellite+' ('+data.displayname+')') : data.displayname));
initSats(parseTle(data.tle));
}
@@ -726,7 +726,7 @@ function plot_sat() {
},
success: function (data) {
sats.start(data);
$("#satname").html($("#sats").val());
$("#satname").html($("#sats :selected").text());
},
error: function (data) {
alert('Something went wrong!');