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

Merge pull request #104 from satnogs/frq 

Fix frequency precision
pull/108/merge
Nikos Roussos 2016-11-11 19:12:51 +02:00 committed by GitHub
parent 5b70310afd b509e87c82
commit 09536f735b
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/base/admin.py
View File

@ -25,7 +25,7 @@ class SatelliteAdmin(admin.ModelAdmin):
class TransmitterAdmin(admin.ModelAdmin):
list_display = ('uuid', 'description', 'satellite', 'uplink_low',
'uplink_high', 'downlink_low', 'downlink_high')
search_fields = ('satellite', 'uuid',)
search_fields = ('satellite__id', 'uuid',)
list_filter = ('mode', 'invert')
readonly_fields = ('uuid', 'satellite', 'approved',)

8
db/base/templatetags/tags.py
View File

@ -1,5 +1,6 @@
from django import template
from django.core.urlresolvers import reverse
from django.utils.html import format_html
register = template.Library()
@ -17,6 +18,9 @@ def frq(value):
to_format = float(value)
except (TypeError, ValueError):
return ''
formatted = format(float(to_format) / 1000000, '.3f')
formatted = formatted + ' Mhz'
prec = to_format / 1000
formatted = format(to_format / 1000000, '.3f')
if not prec.is_integer():
point = str(prec - int(prec))[2:]
formatted = format_html('{0}<small>{1}</small> MHz', formatted, point)
return formatted

3
db/static/js/app.js
View File

@ -21,4 +21,7 @@ $(document).ready(function() {
$('.satellite-group-item').show();
}
});
// Enable tooltips
$('[data-toggle="tooltip"]').tooltip();
});

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

@ -87,16 +87,16 @@
{% include "includes/field.html" with name="Baud" value=transmitter.baud %}
{% endif %}
{% if transmitter.uplink_low %}
{% include "includes/field.html" with name="Uplink Low" value=transmitter.uplink_low|frq %}
{% include "includes/field.html" with name="Uplink Low" value=transmitter.uplink_low|frq hz=transmitter.uplink_low %}
{% endif %}
{% if transmitter.uplink_high %}
{% include "includes/field.html" with name="Uplink High" value=transmitter.uplink_high|frq %}
{% include "includes/field.html" with name="Uplink High" value=transmitter.uplink_high|frq hz=transmitter.uplink_high %}
{% endif %}
{% if transmitter.downlink_low %}
{% include "includes/field.html" with name="Downlink Low" value=transmitter.downlink_low|frq %}
{% include "includes/field.html" with name="Downlink Low" value=transmitter.downlink_low|frq hz=transmitter.downlink_low %}
{% endif %}
{% if transmitter.downlink_high %}
{% include "includes/field.html" with name="Downlink High" value=transmitter.downlink_high|frq %}
{% include "includes/field.html" with name="Downlink High" value=transmitter.downlink_high|frq hz=transmitter.downlink_high %}
{% endif %}
</div>
</div>
@ -225,16 +225,16 @@
{% include "includes/field.html" with name="Baud" value=suggestion.baud original=suggestion.transmitter.baud %}
{% endif %}
{% if suggestion.uplink_low %}
{% include "includes/field.html" with name="Uplink Low" value=suggestion.uplink_low|frq original=suggestion.transmitter.uplink_low|frq %}
{% include "includes/field.html" with name="Uplink Low" value=suggestion.uplink_low|frq original=suggestion.transmitter.uplink_low|frq hz=transmitter.uplink_low %}
{% endif %}
{% if suggestion.uplink_high %}
{% include "includes/field.html" with name="Uplink High" value=suggestion.uplink_high|frq original=suggestion.transmitter.uplink_high|frq %}
{% include "includes/field.html" with name="Uplink High" value=suggestion.uplink_high|frq original=suggestion.transmitter.uplink_high|frq hz=transmitter.uplink_high %}
{% endif %}
{% if suggestion.downlink_low %}
{% include "includes/field.html" with name="Downlink Low" value=suggestion.downlink_low|frq original=suggestion.transmitter.downlink_low|frq %}
{% include "includes/field.html" with name="Downlink Low" value=suggestion.downlink_low|frq original=suggestion.transmitter.downlink_low|frq hz=transmitter.downlink_low %}
{% endif %}
{% if suggestion.downlink_high %}
{% include "includes/field.html" with name="Downlink High" value=suggestion.downlink_high|frq original=suggestion.transmitter.downlink_high|frq %}
{% include "includes/field.html" with name="Downlink High" value=suggestion.downlink_high|frq original=suggestion.transmitter.downlink_high|frq hz=transmitter.downlink_high %}
{% endif %}
{% if suggestion.citation %}
{% include "includes/field.html" with name="Citation" value=suggestion.citation|urlizetrunc:35 %}

2
db/templates/includes/field.html
View File

@ -2,7 +2,7 @@
<div class="col-md-6">
<span class="label label-default">{{ name }}</span>
</div>
<div class="col-md-6">
<div class="col-md-6" {% if hz %}data-toggle="tooltip" data-placement="bottom" title="{{ hz }} Hz"{% endif %}>
{{ value }}
{% if original %}
<div class="text-muted">{{ original }}</div>