From 0ef63fe2b663646731a28f09186d9e2497c1225a Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Wed, 7 Mar 2018 17:46:35 +0200 Subject: [PATCH] New Stations should default to testing --- .../migrations/0035_auto_20180307_1527.py | 20 ++++++++++++++++ network/base/models.py | 2 +- network/base/views.py | 10 ++++++++ network/static/css/_common.scss | 24 ------------------- network/templates/includes/station_edit.html | 2 +- 5 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 network/base/migrations/0035_auto_20180307_1527.py diff --git a/network/base/migrations/0035_auto_20180307_1527.py b/network/base/migrations/0035_auto_20180307_1527.py new file mode 100644 index 0000000..e9bf367 --- /dev/null +++ b/network/base/migrations/0035_auto_20180307_1527.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.11 on 2018-03-07 15:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0034_auto_20180202_1358'), + ] + + operations = [ + migrations.AlterField( + model_name='station', + name='testing', + field=models.BooleanField(default=True), + ), + ] diff --git a/network/base/models.py b/network/base/models.py index 731edc0..9b65e9d 100644 --- a/network/base/models.py +++ b/network/base/models.py @@ -138,7 +138,7 @@ class Station(models.Model): 'target="_blank">SatNOGS Team')) featured_date = models.DateField(null=True, blank=True) created = models.DateTimeField(auto_now_add=True) - testing = models.BooleanField(default=False) + testing = models.BooleanField(default=True) last_seen = models.DateTimeField(null=True, blank=True) status = models.IntegerField(choices=STATION_STATUSES, default=0) horizon = models.PositiveIntegerField(help_text='In degrees above 0', default=10) diff --git a/network/base/views.py b/network/base/views.py index ab69a19..a05fbc3 100644 --- a/network/base/views.py +++ b/network/base/views.py @@ -540,6 +540,13 @@ def station_view(request, id): can_schedule = schedule_perms(request.user, station) + if station.is_offline: + messages.error(request, ('Your Station is offline. You should make ' + 'sure it can successfully connect to the Network API.')) + if station.is_testing: + messages.warning(request, ('Your Station is in Testing mode. Once you are ' + 'sure it returns good observations you can put it online.')) + return render(request, 'base/station_view.html', {'station': station, 'form': form, 'antennas': antennas, 'mapbox_id': settings.MAPBOX_MAP_ID, @@ -675,9 +682,12 @@ def station_edit(request): station = get_object_or_404(Station, id=pk, owner=request.user) form = StationForm(request.POST, request.FILES, instance=station) else: + pk = False form = StationForm(request.POST, request.FILES) if form.is_valid(): f = form.save(commit=False) + if not pk: + f.testing = True f.owner = request.user f.save() form.save_m2m() diff --git a/network/static/css/_common.scss b/network/static/css/_common.scss index 66ba121..f73d66f 100644 --- a/network/static/css/_common.scss +++ b/network/static/css/_common.scss @@ -8,30 +8,6 @@ a:hover { text-decoration: none; } -.alert-debug { - color: black; - background-color: white; - border-color: #d6e9c6; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-warning { - color: black; - background-color: orange; - border-color: #d6e9c6; -} - .alert-error { color: #b94a48; background-color: #f2dede; diff --git a/network/templates/includes/station_edit.html b/network/templates/includes/station_edit.html index 678f549..519ed36 100644 --- a/network/templates/includes/station_edit.html +++ b/network/templates/includes/station_edit.html @@ -101,7 +101,7 @@
- + Testing?