From ff3d88001e5749323ea9ef9d16e3681d44c41fb6 Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Thu, 30 Jul 2020 18:47:22 -0400 Subject: [PATCH] Refacter transmitter_card fields and kaitai struct decoder info Removes the field.html include - and the frequent inclusion of that in the transmitter cards. Fix a bug in satellite.js where input not recognized as an integer Add gitlab links to the version info Removes the manually-entered kaitai struct field from view (will need removed from db in a later change) - replacing with a procedurally generated list of fields from the class imported through satnogsdecoders. Fixes #385 Signed-off-by: Corey Shields --- db/base/models.py | 13 +++ db/static/js/satellite.js | 3 +- db/templates/base.html | 4 +- db/templates/base/satellite.html | 58 +++++++------ .../includes/cards/transmitter_card.html | 84 ++++++++----------- db/templates/includes/field.html | 20 ----- 6 files changed, 84 insertions(+), 98 deletions(-) delete mode 100644 db/templates/includes/field.html diff --git a/db/base/models.py b/db/base/models.py index 16a2437..733a4ca 100644 --- a/db/base/models.py +++ b/db/base/models.py @@ -4,6 +4,7 @@ from os import path from uuid import uuid4 import h5py +import satnogsdecoders from django.conf import settings from django.contrib.auth.models import User from django.core.exceptions import ValidationError @@ -488,6 +489,18 @@ class Telemetry(models.Model): def __str__(self): return self.name + def get_kaitai_fields(self): + """Return an empty-value dict of fields for this kaitai.io struct + Beware the overuse of "decoder" in satnogsdecoders and "decoder" the + field above in this Telemetry model""" + results = {} + try: + decoder_class = getattr(satnogsdecoders.decoder, self.decoder.capitalize()) + results = satnogsdecoders.decoder.get_fields(decoder_class, empty=True) + except AttributeError: + pass + return results + @python_2_unicode_compatible class DemodData(models.Model): diff --git a/db/static/js/satellite.js b/db/static/js/satellite.js index b5db463..6395d61 100644 --- a/db/static/js/satellite.js +++ b/db/static/js/satellite.js @@ -81,7 +81,8 @@ function freq_to_ppb(freq_obs, freq) { } } -function format_freq(frequency) { +function format_freq(freq) { + var frequency = +freq; if (frequency < 1000) { // Frequency is in Hz range return frequency.toFixed(3) + ' Hz'; diff --git a/db/templates/base.html b/db/templates/base.html index 490e2d2..7403fd8 100644 --- a/db/templates/base.html +++ b/db/templates/base.html @@ -161,9 +161,9 @@
- {{ version }} + {{ version }}
- {{ decoders_version }} + {{ decoders_version }}
diff --git a/db/templates/base/satellite.html b/db/templates/base/satellite.html index 522414a..96f7a72 100644 --- a/db/templates/base/satellite.html +++ b/db/templates/base/satellite.html @@ -272,25 +272,28 @@ {% for telemetry in satellite.telemetries.all %}
-
-
-
-
Decoder: - {{ telemetry.name }}
-
+
+
+ + Decoder: {{ telemetry.name }}
+
+
- {% include "includes/field.html" with name="Decoder Script" value=telemetry.decoder %} -
-
- Decoder Struct -
-
+
+
Script Name
+
{{ telemetry.decoder }}
+
+
+
+ Decoder Fields +
+
Click here -
-
+ +
@@ -301,23 +304,25 @@
- +
{% if not telemetry.schema == '' %}
- See kaitai.io for more information on the format + See kaitai.io for more information on the format and - the satnogs-decoders repository for the most recent decoders. + the satnogs-decoders repository for the most recent decoders.
-
- 
{{ telemetry.schema }}
+
+ {% for field in telemetry.get_kaitai_fields %} + {{ field }}
+ {% endfor %}
{% else %}
- Struct format appears to be missing. + Struct fields appear to be missing.
{% endif %}
@@ -331,14 +336,13 @@ {% else %}
-
-
-
-
No Decoders - Found
-
-
+
+
+ + No Decoders Found
+
+
Help us develop a decoder, you can find instructions at this wiki link diff --git a/db/templates/includes/cards/transmitter_card.html b/db/templates/includes/cards/transmitter_card.html index 1079fe8..1b3ab3c 100644 --- a/db/templates/includes/cards/transmitter_card.html +++ b/db/templates/includes/cards/transmitter_card.html @@ -46,68 +46,56 @@
-
- {% if transmitter.type %} - {% include "includes/field.html" with name="Type" value=transmitter.type %} - {% endif %} - {% if transmitter.service %} - {% include "includes/field.html" with name="Service" value=transmitter.service %} +
+
Type
+
{{ transmitter.type }}
+ {% if transmitter.service and transmitter.service != 'Unknown' %} +
Service
+
{{ transmitter.service }}
{% endif %} {% if transmitter.downlink_mode %} - {% include "includes/field.html" with name="Downlink Mode" value=transmitter.downlink_mode %} +
Downlink Mode
+
{{ transmitter.downlink_mode }}
{% endif %} - {% if transmitter.uplink_mode %} - {% include "includes/field.html" with name="Uplink Mode" value=transmitter.uplink_mode %} + {% if transmitter.downlink_low %} +
Downlink Frequency
+
+ {{ transmitter.downlink_low }}
+ {% endif %} + {% if transmitter.downlink_drift %} +
Downlink Drifted
+
+ {{ transmitter.downlink_drift }}
{% endif %} {% if transmitter.baud %} - {% include "includes/field.html" with name="Baud" value=transmitter.baud %} - {% endif %} - {% if transmitter.type == 'Transmitter' %} - {% if transmitter.downlink_low %} - {% include "includes/field.html" with name="Downlink" value=transmitter.downlink_low hz=transmitter.downlink_low %} - {% endif %} - {% if transmitter.downlink_drift %} - {% include "includes/field.html" with name="Downlink Drifted" value=transmitter.downlink_drift hz=transmitter.downlink_drift class="drifted" freq_or=transmitter.downlink_low %} - {% endif %} - {% endif %} - {% if transmitter.type == 'Transceiver' %} - {% if transmitter.downlink_low %} - {% include "includes/field.html" with name="Downlink" value=transmitter.downlink_low hz=transmitter.downlink_low %} - {% endif %} - {% if transmitter.downlink_drift %} - {% include "includes/field.html" with name="Downlink Drifted" value=transmitter.downlink_drift hz=transmitter.downlink_drift class="drifted" freq_or=transmitter.downlink_low %} - {% endif %} - {% if transmitter.uplink_low %} - {% include "includes/field.html" with name="Uplink" value=transmitter.uplink_low hz=transmitter.uplink_low %} - {% endif %} - {% if transmitter.uplink_drift %} - {% include "includes/field.html" with name="Uplink Drifted" value=transmitter.uplink_drift hz=transmitter.uplink_drift class="drifted" freq_or=transmitter.uplink_low %} - {% endif %} - {% endif %} - {% if transmitter.type == 'Transponder' %} - {% if transmitter.downlink_low %} - {% include "includes/field.html" with name="Downlink Low" value=transmitter.downlink_low hz=transmitter.downlink_low %} +
Baud
+
{{ transmitter.baud|floatformat:0 }}
{% endif %} {% if transmitter.downlink_high %} - {% include "includes/field.html" with name="Downlink High" value=transmitter.downlink_high hz=transmitter.downlink_high %} - {% endif %} - {% if transmitter.downlink_drift %} - {% include "includes/field.html" with name="Downlink Drift" value=transmitter.downlink_drift hz=transmitter.downlink_drift %} +
Downlink High
+
+ {{ transmitter.downlink_high }}
{% endif %} {% if transmitter.uplink_low %} - {% include "includes/field.html" with name="Uplink Low" value=transmitter.uplink_low hz=transmitter.uplink_low %} - {% endif %} - {% if transmitter.uplink_high %} - {% include "includes/field.html" with name="Uplink High" value=transmitter.uplink_high hz=transmitter.uplink_high %} +
Uplink Frequency
+
+ {{ transmitter.uplink_low }}
{% endif %} {% if transmitter.uplink_drift %} - {% include "includes/field.html" with name="Uplink Drift" value=transmitter.uplink_drift hz=transmitter.uplink_drift %} +
Uplink Drift
+
+ {{ transmitter.uplink_drift }}
+ {% endif %} + {% if transmitter.uplink_high %} +
Uplink High
+
+ {{ transmitter.uplink_high }}
{% endif %} {% if transmitter.invert %} - {% include "includes/field.html" with name="Invert" value=transmitter.invert %} +
Inverted
+
Yes
{% endif %} - {% endif %} -
+
Updated on {{ transmitter.created|date:'Y-m-d H:i' }} by {{ transmitter.user }} diff --git a/db/templates/includes/field.html b/db/templates/includes/field.html deleted file mode 100644 index 612e814..0000000 --- a/db/templates/includes/field.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- {{ name }} -
-
- {{ value }} - {% if original and original != value %} -
- {{ original }} -
- {% endif %} -
-