From 89f69fbbe72fa0895411907568e726ad9c5af9c4 Mon Sep 17 00:00:00 2001 From: Pierros Papadeas Date: Mon, 27 Aug 2018 15:25:27 +0300 Subject: [PATCH] Expose client versions on ground station view and admin --- network/base/admin.py | 6 +++--- .../migrations/0046_station_client_version.py | 20 +++++++++++++++++++ network/base/models.py | 6 ++++++ network/templates/base/station_view.html | 8 ++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 network/base/migrations/0046_station_client_version.py diff --git a/network/base/admin.py b/network/base/admin.py index 4d64f48..6a835d8 100644 --- a/network/base/admin.py +++ b/network/base/admin.py @@ -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') diff --git a/network/base/migrations/0046_station_client_version.py b/network/base/migrations/0046_station_client_version.py new file mode 100644 index 0000000..d63cd82 --- /dev/null +++ b/network/base/migrations/0046_station_client_version.py @@ -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), + ), + ] diff --git a/network/base/models.py b/network/base/models.py index 986921b..8cfbc9a 100644 --- a/network/base/models.py +++ b/network/base/models.py @@ -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'] diff --git a/network/templates/base/station_view.html b/network/templates/base/station_view.html index 6932b11..7c69252 100644 --- a/network/templates/base/station_view.html +++ b/network/templates/base/station_view.html @@ -139,6 +139,14 @@ {{ station.created|timesince }} ago + {% if station.client_version %} +
+ Client version + + {{ station.client_version }} + +
+ {% endif %}
{{ station.get_status_display }}