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

Change "unknown" to "unvetted"

environments/stage/deployments/268
Pierros Papadeas 2018-12-16 20:31:21 +02:00
parent 3c5d5105a6
commit e8e384dc80
No known key found for this signature in database
GPG Key ID: 8DB97129D9982991
7 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/api/serializers.py
View File

@ -171,8 +171,8 @@ class TransmitterSerializer(serializers.ModelSerializer):
model = Transmitter
fields = ('uuid', 'description', 'alive', 'downlink_low', 'downlink_high',
'mode', 'uplink_low', 'uplink_high', 'satellite', 'norad_cat_id',
'success_rate', 'bad_rate', 'unknown_rate', 'good_count',
'bad_count', 'unknown_count', 'data_count')
'success_rate', 'bad_rate', 'unvetted_rate', 'good_count',
'bad_count', 'unvetted_count', 'data_count')
def get_mode(self, obj):
if obj.mode is None:

18
network/base/models.py
View File

@ -313,10 +313,16 @@ class Satellite(models.Model):
return data.filter(vetted_status='bad').count()
@property
def unknown_count(self):
def unvetted_count(self):
data = Observation.objects.filter(satellite=self)
return data.filter(vetted_status='unknown').count()
@property
def future_count(self):
data = Observation.objects.filter(satellite=self)
return data.filter(id__in=(o.id for
o in data if o.is_future)).count()
@property
def success_rate(self):
try:
@ -332,9 +338,9 @@ class Satellite(models.Model):
return 0
@property
def unknown_rate(self):
def unvetted_rate(self):
try:
return int(100 * (float(self.unknown_count) / float(self.data_count)))
return int(100 * (float(self.unvetted_count) / float(self.data_count)))
except (ZeroDivisionError, TypeError):
return 0
@ -408,7 +414,7 @@ class Transmitter(models.Model):
return data
@property
def unknown_count(self):
def unvetted_count(self):
data = cache.get('tr-{0}-unk-count'.format(self.uuid))
if data is None:
obs = Observation.objects.filter(transmitter=self)
@ -444,11 +450,11 @@ class Transmitter(models.Model):
return rate
@property
def unknown_rate(self):
def unvetted_rate(self):
rate = cache.get('tr-{0}-unk-rate'.format(self.uuid))
if rate is None:
try:
rate = int(100 * (float(self.unknown_count) / float(self.data_count)))
rate = int(100 * (float(self.unvetted_count) / float(self.data_count)))
cache.set('tr-{0}-unk-rate'.format(self.uuid), rate, 3600)
return rate
except (ZeroDivisionError, TypeError):

10
network/base/views.py
View File

@ -704,12 +704,12 @@ def pass_predictions(request, id):
'name': str(satellite.name),
'id': str(satellite.id),
'success_rate': str(satellite.success_rate),
'unknown_rate': str(satellite.unknown_rate),
'unvetted_rate': str(satellite.unvetted_rate),
'bad_rate': str(satellite.bad_rate),
'data_count': str(satellite.data_count),
'good_count': str(satellite.good_count),
'bad_count': str(satellite.bad_count),
'unknown_count': str(satellite.unknown_count),
'unvetted_count': str(satellite.unvetted_count),
'norad_cat_id': str(satellite.norad_cat_id),
'tle1': str(satellite.latest_tle.tle1),
'tle2': str(satellite.latest_tle.tle2),
@ -788,8 +788,8 @@ class TransmittersSerializer(serializers.ModelSerializer):
class Meta:
model = Transmitter
fields = ('uuid', 'description', 'alive', 'downlink_low', 'mode',
'success_rate', 'bad_rate', 'unknown_rate', 'good_count',
'bad_count', 'unknown_count', 'data_count')
'success_rate', 'bad_rate', 'unvetted_rate', 'good_count',
'bad_count', 'unvetted_count', 'data_count')
def get_mode(self, obj):
if obj.mode is None:
@ -816,7 +816,7 @@ def satellite_view(request, id):
'success_rate': sat.success_rate,
'good_count': sat.good_count,
'bad_count': sat.bad_count,
'unknown_count': sat.unknown_count,
'unvetted_count': sat.unvetted_count,
'data_count': sat.data_count,
'transmitters': TransmittersSerializer(transmitters, many=True).data,
}

6
network/static/js/observation_new.js
View File

@ -31,10 +31,10 @@ $(document).ready( function(){
data-toggle="tooltip" data-placement="bottom"
title="` + transmitter.success_rate + '% (' + transmitter.good_count + `) Good"
style="width:` + transmitter.success_rate + `%"></div>
<div class="progress-bar progress-bar-warning transmitter-unknown"
<div class="progress-bar progress-bar-warning transmitter-unvetted"
data-toggle="tooltip" data-placement="bottom"
title="` + transmitter.unknown_rate + '% (' + transmitter.unknown_count + `) Unknown"
style="width:` + transmitter.unknown_rate + `%"></div>
title="` + transmitter.unvetted_rate + '% (' + transmitter.unvetted_count + `) Unvetted"
style="width:` + transmitter.unvetted_rate + `%"></div>
<div class="progress-bar progress-bar-danger transmitter-bad"
data-toggle="tooltip" data-placement="bottom"
title="` + transmitter.bad_rate + '% (' + transmitter.bad_count + `) Bad"

14
network/static/js/satellite.js
View File

@ -16,12 +16,12 @@ $(document).ready(function() {
modal.find('#new-obs-link').attr('href', '/observations/new/?norad=' + satlink.data('id'));
modal.find('#old-obs-link').attr('href', '/observations/?norad=' + satlink.data('id'));
modal.find('#good-sat-obs').attr('href', '/observations/?future=0&good=1&bad=0&unvetted=0&failed=0&norad=' + satlink.data('id'));
modal.find('#unknown-sat-obs').attr('href', '/observations/?future=0&good=0&bad=0&unvetted=1&failed=0&norad=' + satlink.data('id'));
modal.find('#unvetted-sat-obs').attr('href', '/observations/?future=0&good=0&bad=0&unvetted=1&failed=0&norad=' + satlink.data('id'));
modal.find('#bad-sat-obs').attr('href', '/observations/?future=0&good=0&bad=1&unvetted=0&failed=0&norad=' + satlink.data('id'));
modal.find('.satellite-success-rate').text(data.success_rate + '%');
modal.find('.satellite-total-obs').text(data.data_count);
modal.find('.satellite-good').text(data.good_count);
modal.find('.satellite-unknown').text(data.unknown_count);
modal.find('.satellite-unvetted').text(data.unvetted_count);
modal.find('.satellite-bad').text(data.bad_count);
modal.find('#transmitters').empty();
$.each(data.transmitters, function(i, transmitter){
@ -30,11 +30,11 @@ $(document).ready(function() {
transmitter_status = '-success';
}
var good_percentage = 0;
var unknown_percentage = 0;
var unvetted_percentage = 0;
var bad_percentage = 0;
if(transmitter.data_count > 0){
good_percentage = Math.round((transmitter.good_count / transmitter.data_count) * 100);
unknown_percentage = Math.round((transmitter.unknown_count / transmitter.data_count) * 100);
unvetted_percentage = Math.round((transmitter.unvetted_count / transmitter.data_count) * 100);
bad_percentage = Math.round((transmitter.bad_count / transmitter.data_count) * 100);
}
modal.find('#transmitters').append(`
@ -52,10 +52,10 @@ $(document).ready(function() {
data-toggle="tooltip" data-placement="bottom"
title="` + good_percentage + '% (' + transmitter.good_count + `) Good"
style="width:` + good_percentage + `%"></div>
<div class="progress-bar progress-bar-warning transmitter-unknown"
<div class="progress-bar progress-bar-warning transmitter-unvetted"
data-toggle="tooltip" data-placement="bottom"
title="` + unknown_percentage + '% (' + transmitter.unknown_count + `) Unknown"
style="width:` + unknown_percentage + `%"></div>
title="` + unvetted_percentage + '% (' + transmitter.unvetted_count + `) Unvetted"
style="width:` + unvetted_percentage + `%"></div>
<div class="progress-bar progress-bar-danger transmitter-bad"
data-toggle="tooltip" data-placement="bottom"
title="` + bad_percentage + '% (' + transmitter.bad_count + `) Bad"

6
network/static/js/station_view.js
View File

@ -233,9 +233,9 @@ $(document).ready(function() {
data-toggle="tooltip" data-placement="bottom" title="${data.nextpasses[i].success_rate}% (${data.nextpasses[i].good_count}) Good">
<span class="sr-only">${data.nextpasses[i].success_rate}% Good</span>
</div>
<div class="progress-bar progress-bar-warning" style="width: ${data.nextpasses[i].unknown_rate}%"
data-toggle="tooltip" data-placement="bottom" title="${data.nextpasses[i].unknown_rate}% (${data.nextpasses[i].unknown_count}) Unknown">
<span class="sr-only">${data.nextpasses[i].unknown_rate}% Unknown</span>
<div class="progress-bar progress-bar-warning" style="width: ${data.nextpasses[i].unvetted_rate}%"
data-toggle="tooltip" data-placement="bottom" title="${data.nextpasses[i].unvetted_rate}% (${data.nextpasses[i].unvetted_count}) Unvetted">
<span class="sr-only">${data.nextpasses[i].unvetted_rate}% Unvetted</span>
</div>
<div class="progress-bar progress-bar-danger" style="width: ${data.nextpasses[i].bad_rate}%"
data-toggle="tooltip" data-placement="bottom" title="${data.nextpasses[i].bad_rate}% (${data.nextpasses[i].bad_count}) Bad">

4
network/templates/includes/satellite.html
View File

@ -33,8 +33,8 @@
<a href="/observations" id="good-sat-obs">
<button type="button" class="btn btn-xs btn-success satellite-good" data-toggle="tooltip" data-placement="bottom" title="Successful observations"></button>
</a>
<a href="/observations" id="unknown-sat-obs">
<button type="button" class="btn btn-xs btn-warning satellite-unknown" data-toggle="tooltip" data-placement="bottom" title="Unknown observations"></button>
<a href="/observations" id="unvetted-sat-obs">
<button type="button" class="btn btn-xs btn-warning satellite-unvetted" data-toggle="tooltip" data-placement="bottom" title="Unvetted observations"></button>
</a>
<a href="/observations" id="bad-sat-obs">
<button type="button" class="btn btn-xs btn-bad satellite-bad" data-toggle="tooltip" data-placement="bottom" title="Bad observations"></button>