Expose client versions on ground station view and admin
parent
9ab85d78f0
commit
89f69fbbe7
|
@ -30,9 +30,9 @@ class AntennaAdmin(admin.ModelAdmin):
|
|||
|
||||
@admin.register(Station)
|
||||
class StationAdmin(admin.ModelAdmin):
|
||||
list_display = ('id', 'name', 'owner', 'lng', 'lat',
|
||||
'qthlocator', 'created_date', 'state')
|
||||
list_filter = ('status', 'created')
|
||||
list_display = ('id', 'name', 'owner', 'lng', 'lat', 'qthlocator', 'client_version',
|
||||
'created_date', 'state')
|
||||
list_filter = ('status', 'created', 'client_version')
|
||||
|
||||
def created_date(self, obj):
|
||||
return obj.created.strftime('%d.%m.%Y, %H:%M')
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.11 on 2018-08-27 11:22
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('base', '0045_auto_20180822_1947'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='station',
|
||||
name='client_version',
|
||||
field=models.CharField(blank=True, max_length=10),
|
||||
),
|
||||
]
|
|
@ -64,6 +64,7 @@ def _observation_post_save(sender, instance, created, **kwargs):
|
|||
Post save Observation operations
|
||||
* Auto vet as good obserfvation with Demod Data
|
||||
* Mark Observations from testing stations
|
||||
* Update client version for ground station
|
||||
"""
|
||||
post_save.disconnect(_observation_post_save, sender=Observation)
|
||||
if created and instance.ground_station.testing:
|
||||
|
@ -73,6 +74,10 @@ def _observation_post_save(sender, instance, created, **kwargs):
|
|||
instance.vetted_status = 'good'
|
||||
instance.vetted_datetime = now()
|
||||
instance.save()
|
||||
if instance.client_version:
|
||||
instance.ground_station.client_version = instance.client_version
|
||||
instance.save()
|
||||
instance.ground_station.save()
|
||||
post_save.connect(_observation_post_save, sender=Observation)
|
||||
|
||||
|
||||
|
@ -164,6 +169,7 @@ class Station(models.Model):
|
|||
rig = models.ForeignKey(Rig, related_name='ground_stations',
|
||||
on_delete=models.SET_NULL, null=True, blank=True)
|
||||
description = models.TextField(max_length=500, blank=True, help_text='Max 500 characters')
|
||||
client_version = models.CharField(max_length=10, blank=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ['-status']
|
||||
|
|
|
@ -139,6 +139,14 @@
|
|||
{{ station.created|timesince }} ago
|
||||
</span>
|
||||
</div>
|
||||
{% if station.client_version %}
|
||||
<div class="front-line">
|
||||
<span class="label label-default">Client version</span>
|
||||
<span class="front-data" title="on latest reported observation">
|
||||
{{ station.client_version }}
|
||||
</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="front-line">
|
||||
<span class="label label-{{ station.get_status_display|lower }}">{{ station.get_status_display }}</span>
|
||||
<span class="front-data" data-toggle="tooltip"
|
||||
|
|
Loading…
Reference in New Issue