spacecruft
/
satnogs-db
1
0
Fork 0
Code Releases Activity

Update UI/UX for norad_follow_id 

Signed-off-by: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>
spacecruft
Alfredos-Panagiotis Damkalis 2022-07-08 17:00:20 +03:00
parent aa45aee2a3
commit 97dc2b8d79
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/base/tasks.py
View File

@ -55,7 +55,7 @@ def update_satellite_name(satellite_entry_pk):
norad_id = satellite_entry.norad_cat_id
if norad_id < 99000:
if norad_id < 70000:
other_sources = get_tle_sources()
tles = fetch_all_tles({norad_id}, **other_sources)
@ -73,11 +73,11 @@ def update_tle_sets():
for satellite in satellites:
# Check if satellite follows a NORAD ID and it is officially announced
if (satellite.satellite_entry.norad_follow_id
and satellite.satellite_entry.norad_follow_id < 99000):
and satellite.satellite_entry.norad_follow_id < 70000):
catalog_norad_ids.add(satellite.satellite_entry.norad_follow_id)
# Check if satellite has a NORAD ID that is officially announced
elif (satellite.satellite_entry.norad_cat_id
and satellite.satellite_entry.norad_cat_id < 99000):
and satellite.satellite_entry.norad_cat_id < 70000):
catalog_norad_ids.add(satellite.satellite_entry.norad_cat_id)
other_sources = get_tle_sources()

57
db/templates/base/satellite.html
View File

@ -120,25 +120,32 @@
</div>
<div class="card-body">
<dl class="row">
<dt class="col-sm-4" data-needshelp="{{ satellite.needs_help }}">Name</dt>
<dd class="col-sm-8">{{ satellite.satellite_entry.name }}</dd>
<dt class="col-sm-5" data-needshelp="{{ satellite.needs_help }}">Name</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.name }}</dd>
{% if satellite.satellite_entry.names %}
<dt class="col-sm-4">Alternate Names</dt>
<dd class="col-sm-8">{{ satellite.satellite_entry.names }}</dd>
<dt class="col-sm-5">Alternate Names</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.names }}</dd>
{% endif %}
<dt class="col-sm-5">Satellite ID</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.satellite_identifier }}</dd>
{% if satellite.satellite_entry.norad_follow_id or satellite.satellite_entry.norad_cat_id > 70000 %}
<dt class="col-sm-5">Temporary NORAD ID</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.norad_cat_id }}</dd>
<dt class="col-sm-5">Followed NORAD ID</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.norad_follow_id }}</dd>
{% else %}
<dt class="col-sm-5">NORAD ID</dt>
<dd class="col-sm-7">{{ satellite.satellite_entry.norad_cat_id }}</dd>
{% endif %}
<dt class="col-sm-4">Satellite ID</dt>
<dd class="col-sm-8">{{ satellite.satellite_entry.satellite_identifier }}</dd>
<dt class="col-sm-4">NORAD ID</dt>
<dd class="col-sm-8">{{ satellite.satellite_entry.norad_cat_id }}</dd>
{% if satellite.satellite_entry.website %}
<dt class="col-sm-4">Website</dt>
<dd class="col-sm-8 text-truncate">
<dt class="col-sm-5">Website</dt>
<dd class="col-sm-7 text-truncate">
<a href="{{ satellite.satellite_entry.website }}" target="_blank">{{ satellite.satellite_entry.website }}</a>
</dd>
{% endif %}
{% if satellite.satellite_entry.operator %}
<dt class="col-sm-4">Operator</dt>
<dd class="col-sm-8">
<dt class="col-sm-5">Operator</dt>
<dd class="col-sm-7">
{% if satellite.satellite_entry.operator.website %}
<a href="{{ satellite.satellite_entry.operator.website }}" target="_blank">
{{ satellite.satellite_entry.operator.name }} - {{ satellite.satellite_entry.operator.names }}
@ -150,11 +157,11 @@
{% endif %}
{% if satellite.satellite_entry.countries %}
{% if satellite.satellite_entry.countries|length > 1 %}
<dt class="col-sm-4">Countries of Origin</dt>
<dt class="col-sm-5">Countries of Origin</dt>
{% else %}
<dt class="col-sm-4">Country of Origin</dt>
<dt class="col-sm-5">Country of Origin</dt>
{% endif %}
<dd class="col-sm-8">
<dd class="col-sm-7">
{% for country in satellite.satellite_entry.countries %}<p>
<span class="flag-icon flag-icon-{{ country.code|lower }}"></span>
<span class="mb-0">{{ country.name }}</span></p>
@ -278,20 +285,20 @@
<div class="card-body">
<dl class="row">
{% if satellite.satellite_entry.launched %}
<dt class="col-sm-4">Launch Date</dt>
<dd class="col-sm-8" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.launched }}">
<dt class="col-sm-5">Launch Date</dt>
<dd class="col-sm-7" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.launched }}">
{{ satellite.satellite_entry.launched|date:"c" }}
</dd>
{% endif %}
{% if satellite.satellite_entry.deployed %}
<dt class="col-sm-4">Deploy Date</dt>
<dd class="col-sm-8" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.deployed }}">
<dt class="col-sm-5">Deploy Date</dt>
<dd class="col-sm-7" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.deployed }}">
{{ satellite.satellite_entry.deployed|date:"c" }}
</dd>
{% endif %}
{% if satellite.satellite_entry.decayed %}
<dt class="col-sm-4">Decay Date</dt>
<dd class="col-sm-8" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.decayed }}">
<dt class="col-sm-5">Decay Date</dt>
<dd class="col-sm-7" data-toggle="tooltip" data-placement="bottom" title="{{ satellite.satellite_entry.decayed }}">
{{ satellite.satellite_entry.decayed|date:"c" }}
</dd>
{% endif %}
@ -457,14 +464,14 @@
<div class="card-body">
<div class="col-12">
<dl class="row mb-0">
<dt class="col-sm-4">Script Name</dt>
<dd class="col-sm-8">{{ telemetry.decoder }}</dd>
<dt class="col-sm-5">Script Name</dt>
<dd class="col-sm-7">{{ telemetry.decoder }}</dd>
</dl>
<dl class="row mb-0">
<dt class="col-sm-4">
<dt class="col-sm-5">
Decoder Fields
</dt>
<dd class="col-sm-8">
<dd class="col-sm-7">
<a href="#" data-toggle="modal" data-target="#StructModal-{{ telemetry.id }}">
Click here
</a>