Merge pull request #2 from pyobs/develop

thusser · web-flow · commit 534516a7f45c · 2020-11-24T10:41:09.000+01:00
v1.1
diff --git a/README.md b/README.md
@@ -130,4 +130,16 @@ Probably you want to exclude the actual sensor readings and only backup the conf
 
 In a fresh setup, you can restore the data via the 'loaddata' command:
 
-    ./manage.py loaddata weather.json
+    ./manage.py loaddata weather.json
+    
+    
+## Changelog
+
+#### version 1.0 (2020-11-23)
+- Initial release
+
+#### version 1.1 (2020-11-24)
+- Added footer to page 
+- Exclude average station from status evaluation
+- Logging current good/bad weather status
+- Added plot for solar elevation and good weather for last 24h
diff --git a/pyobs_weather/api/urls.py b/pyobs_weather/api/urls.py
@@ -10,6 +10,7 @@
     path('stations/<str:station_code>/', views.station_detail, name='station_detail'),
     path('stations/<str:station_code>/<str:sensor_code>/', views.sensor_detail, name='sensor_detail'),
     path('history/', views.history_types, name='history_types'),
+    path('history/goodweather/', views.good_weather, name='good_weather'),
     path('history/<str:sensor_type>/', views.history, name='history'),
     path('sensors/', views.sensors, name='sensor_status'),
     path('timeline/', views.timeline, name='timeline'),
diff --git a/pyobs_weather/api/views.py b/pyobs_weather/api/views.py
@@ -2,14 +2,15 @@
 import dateutil.parser
 from astroplan import Observer
 from astropy.coordinates import EarthLocation
-from astropy.time import Time
+from astropy.time import Time, TimeDelta
 import astropy.units as u
 from django.conf import settings
 from django.db.models import F
 from django.http import JsonResponse, HttpResponseNotFound
+import numpy as np
 
 from pyobs_weather.weather import evaluators
-from pyobs_weather.weather.models import Station, Sensor, Value, SensorType
+from pyobs_weather.weather.models import Station, Sensor, Value, SensorType, GoodWeather
 from pyobs_weather.weather.tasks import create_evaluator
 
 
@@ -232,3 +233,25 @@ def timeline(request):
 
     # return all
     return JsonResponse({'time': now.isot, 'events': events})
+
+
+def good_weather(request):
+    # get changes in status from last 24 hours
+    changes = [{'time': g.time, 'good': g.good}
+               for g in GoodWeather.objects.filter(time__gt=datetime.utcnow() - timedelta(days=1)).all()]
+
+    # get location
+    location = EarthLocation(lon=settings.OBSERVER_LOCATION['longitude'] * u.deg,
+                             lat=settings.OBSERVER_LOCATION['latitude'] * u.deg,
+                             height=settings.OBSERVER_LOCATION['elevation'] * u.m)
+
+    # get observer and now
+    now = Time.now()
+    observer = Observer(location=location)
+
+    # get solar elevation for last 12 hours
+    times = [now - TimeDelta((1. - x) * u.day) for x in np.linspace(0, 1, 100)]
+    sun = [s.alt.degree for s in observer.sun_altaz(times)]
+
+    # return all
+    return JsonResponse({'changes': changes, 'sun': {'time': [t.isot for t in times], 'alt': sun}})
diff --git a/pyobs_weather/frontend/static/frontend/css/styles.css b/pyobs_weather/frontend/static/frontend/css/styles.css
@@ -52,8 +52,14 @@ table#current td {
     padding: 0;
 }
 
+#wrap {
+    min-height: 100%;
+}
+
 #main {
+    overflow: auto;
     margin-top: 70px;
+    padding-bottom: 50px; /* this needs to be bigger than footer height*/
 }
 
 #header {
@@ -96,4 +102,15 @@ p.sensorUnit {
 #timeline_plot {
     border: 1px solid black;
     display: block;
+}
+
+footer {
+    background-color: black;
+    color: grey;
+    text-align: center;
+    position: relative;
+    margin-top: -40px; /* negative value of footer height */
+    height: 40px;
+    clear: both;
+    padding-top: 0.5em
 }
diff --git a/pyobs_weather/frontend/static/frontend/js/app.js b/pyobs_weather/frontend/static/frontend/js/app.js
@@ -76,7 +76,9 @@ function plot(canvas) {
             },
             options: {
                 scales: {
+                    bounds: 'ticks',
                     xAxes: [{
+                        source: 'auto',
                         type: 'time',
                         time: {
                             tooltipFormat: 'YYYY-MM-DD HH:mm.ss',
@@ -87,6 +89,10 @@ function plot(canvas) {
                                 hour: 'HH:mm'
                             }
                         },
+                        ticks: {
+                            min: moment.utc().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss'),
+                            max: moment.utc().format('YYYY-MM-DD HH:mm:ss')
+                        },
                         distribution: 'linear',
                         scaleLabel: {
                             display: true,
@@ -97,6 +103,11 @@ function plot(canvas) {
                         scaleLabel: {
                             display: true,
                             labelString: label
+                        },
+                        ticks: {
+                            callback: function (value) {
+                                return value.toFixed(1);
+                            }
                         }
                     }]
                 },
@@ -250,11 +261,134 @@ function update_timeline() {
     setTimeout(update_timeline, 60000);
 }
 
+function create_good_annotation(good) {
+    return {
+        type: 'box',
+        display: true,
+        xScaleID: 'x-axis-0',
+        yScaleID: 'y-axis-0',
+        drawTime: 'beforeDatasetsDraw',
+        borderWidth: 0,
+        backgroundColor: good ? 'rgba(0, 255, 0, 0.5)' : 'rgba(255, 0, 0, 0.5)'
+    }
+}
+
+function plot_good_history() {
+    // do AJAX request
+    $.ajax({
+        url: rootURL + 'api/history/goodweather/',
+        dataType: 'json',
+    }).done(function (results) {
+        // format data
+        let data = [];
+        results.sun.time.forEach(function (value, index) {
+            data.push({t: new moment.utc(value).format('YYYY-MM-DD HH:mm:ss'), y: results.sun.alt[index]})
+        });
+
+        // annotations
+        let annotations = [];
+        for (let i = 0; i < results.changes.length; i++) {
+            // get change
+            let change = results.changes[i];
+
+            // first one needs an additional annotation
+            if (i === 0) {
+                let ann = create_good_annotation(!change.good);
+                ann.xMax = moment.utc(change.time).format('YYYY-MM-DD HH:mm:ss');
+                annotations.push(ann);
+            }
+
+            // min/max depends on first/last
+            let ann = create_good_annotation(change.good);
+            ann.xMin = moment.utc(change.time).format('YYYY-MM-DD HH:mm:ss');
+            if (results.changes.length > i + 1) {
+                ann.xMax = moment.utc(results.changes[i + 1].time).format('YYYY-MM-DD HH:mm:ss');
+            }
+            annotations.push(ann);
+        }
+
+        // add annotation for line at 0
+        annotations.push({
+            type: 'line',
+            mode: 'horizontal',
+            scaleID: 'y-axis-0',
+            value: 0,
+            borderColor: 'rgb(0, 0, 0, 0.5)',
+            borderWidth: 1
+        })
+
+        // create plot
+        new Chart($('#goodhistory')[0].getContext('2d'), {
+            type: 'line',
+            data: {
+                datasets: [{
+                    label: undefined,
+                    data: data,
+                    backgroundColor: 'rgb(255, 255, 100, 0.5)',
+                    borderColor: 'rgb(255, 255, 100, 1)',
+                    pointRadius: 0,
+                    fill: false,
+                    lineTension: 0.2
+                }]
+            },
+            options: {
+                animation: {
+                    duration: 0
+                },
+                legend: {
+                    display: false
+                },
+                scales: {
+                    bounds: 'ticks',
+                    xAxes: [{
+                        type: 'time',
+                        source: 'auto',
+                        distribution: 'linear',
+                        time: {
+                            tooltipFormat: 'YYYY-MM-DD HH:mm.ss',
+                            displayFormats: {
+                                millisecond: 'HH:mm',
+                                second: 'HH:mm',
+                                minute: 'HH:mm',
+                                hour: 'HH:mm'
+                            }
+                        },
+                        ticks: {
+                            min: moment.utc().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss'),
+                            max: moment.utc().format('YYYY-MM-DD HH:mm:ss')
+                        },
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Time [UT]',
+                        }
+                    }],
+                    yAxes: [{
+                        scaleLabel: {
+                            display: true,
+                            labelString: 'Sun/good'
+                        },
+                    }]
+                },
+                annotation: {
+                    annotations: annotations
+                }
+            }
+        });
+
+    });
+}
+
+function update_good_history() {
+    plot_good_history();
+    setTimeout(update_good_history, 60000);
+}
+
 $(function () {
     Chart.defaults.global.defaultFontFamily = 'Alegreya';
 
     $(window).on('resize', draw_timeline);
     update_timeline();
     update_plots();
+    update_good_history();
     update_values();
 });
diff --git a/pyobs_weather/frontend/static/frontend/js/vendor/Chart.min.js b/pyobs_weather/frontend/static/frontend/js/vendor/Chart.min.js
diff --git a/pyobs_weather/frontend/templates/base.html b/pyobs_weather/frontend/templates/base.html
@@ -1,5 +1,5 @@
 <!doctype html>
-{% load static %}
+{% load static version %}
 <html>
 <head>
     <title>{{ title }}</title>
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "frontend/css/vendor/bootstrap.min.css" %}">
     <link rel="stylesheet" href="{% static "frontend/css/vendor/Chart.min.css" %}">
     <link rel="stylesheet" href="{% static "frontend/css/styles.css" %}">
-    <script>let rootURL='{{ root_url|safe }}';</script>
+    <script>let rootURL = '{{ root_url|safe }}';</script>
 </head>
 <body>
 
@@ -52,12 +52,19 @@
     </div>
 </nav>
 
-<div id="main" class="container">
-    <div id="alert-error"></div>
-    {% block content %}
-    {% endblock %}
+<div id="wrap">
+    <div id="main" class="container">
+        <div id="alert-error"></div>
+        {% block content %}
+        {% endblock %}
+    </div>
 </div>
 
+<footer>
+    pyobs-weather v{% version %} (<a href="https://github.com/pyobs/pyobs-weather">GitHub</a>)
+    by <a href="mailto:thusser@uni-goettingen.de">Tim-Oliver Husser</a>
+</footer>
+
 <script src="{% static "frontend/js/vendor/jquery.min.js" %}"></script>
 <script src="{% static "frontend/js/vendor/moment.min.js" %}"></script>
 <script src="{% static "frontend/js/app.js" %}"></script>
diff --git a/pyobs_weather/frontend/templates/index.html b/pyobs_weather/frontend/templates/index.html
@@ -41,6 +41,7 @@ <h2>{{ site }}</h2>
             </div>
 
             <h3>Plots for last 24h</h3>
+            <canvas id="goodhistory" width="600" height="100"></canvas>
             {% for type in plot_types %}
                 <canvas data-sensor-type="{{ type.code }}" data-sensor-label="{{ type.name }}"
                         class="plot" width="600" height="150"></canvas>
diff --git a/pyobs_weather/frontend/templatetags/__init__.py b/pyobs_weather/frontend/templatetags/__init__.py
diff --git a/pyobs_weather/frontend/templatetags/version.py b/pyobs_weather/frontend/templatetags/version.py
@@ -0,0 +1,9 @@
+from django import template
+from pyobs_weather.version import VERSION
+
+register = template.Library()
+
+
+@register.simple_tag
+def version():
+    return VERSION
diff --git a/pyobs_weather/version.py b/pyobs_weather/version.py
@@ -0,0 +1 @@
+VERSION = '1.1'
diff --git a/pyobs_weather/weather/migrations/0003_goodweather.py b/pyobs_weather/weather/migrations/0003_goodweather.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.0.6 on 2020-11-23 14:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('weather', '0002_auto_20201119_0942'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GoodWeather',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date and time of status change')),
+                ('good', models.BooleanField(verbose_name='Weather now good?')),
+            ],
+        ),
+    ]
diff --git a/pyobs_weather/weather/models.py b/pyobs_weather/weather/models.py
@@ -125,3 +125,9 @@ def save(self, *args, **kwargs):
 
     class Meta:
         unique_together = ('sensor', 'time')
+
+
+class GoodWeather(models.Model):
+    """Times of changes from good to bad weather and vice versa."""
+    time = models.DateTimeField('Date and time of status change', db_index=True, auto_now_add=True)
+    good = models.BooleanField('Weather now good?')
diff --git a/pyobs_weather/weather/stations/observer.py b/pyobs_weather/weather/stations/observer.py
@@ -35,7 +35,11 @@ def _get_latest_value(self, code):
         """
 
         # get sensor
-        sensor = Sensor.objects.get(station__code='current', type__code=code)
+        try:
+            sensor = Sensor.objects.get(station__code='current', type__code=code)
+        except Sensor.DoesNotExist:
+            # sensor doesn't exist
+            return
 
         # get its latest value
         val = Value.objects.filter(sensor=sensor).latest('time')
diff --git a/pyobs_weather/weather/tasks.py b/pyobs_weather/weather/tasks.py
