Merge branch 'master' of git.2li.ch:Nebucatnetzer/environment_sensors

sensors/collector/collector.py

@@ -6,7 +6,7 @@ if os.uname()[4].startswith("arm"):
 else:
     from sense_emu import SenseHat
 
-from .models import Time, Temperature, Humidity, Pressure
+from .models import Temperature, Humidity, Pressure
 
 sense = SenseHat()
 
@@ -27,7 +27,7 @@ def get_humidity():
 
 
 def values_to_db():
-    time = Time.objects.create(value=timezone.now())
+    time = timezone.now()
     Temperature.objects.create(value=get_temperature(), time=time)
     Humidity.objects.create(value=get_humidity(), time=time)
     Pressure.objects.create(value=get_pressure(), time=time)

sensors/collector/models.py

@@ -1,21 +1,17 @@
 from django.db import models
 
 
-class Time(models.Model):
-    value = models.DateTimeField()
-
-
 class Temperature(models.Model):
-    time = models.ForeignKey(Time, on_delete=models.CASCADE)
+    time = models.DateTimeField()
     value = models.FloatField()
 
 
 class Humidity(models.Model):
-    time = models.ForeignKey(Time, on_delete=models.CASCADE)
+    time = models.DateTimeField()
     value = models.FloatField()
 
 
 class Pressure(models.Model):
-    time = models.ForeignKey(Time, on_delete=models.CASCADE)
+    time = models.DateTimeField()
     value = models.FloatField()
 

sensors/collector/plot.py

@@ -1,6 +1,6 @@
 from plotly.offline import plot
 from plotly.graph_objs import Scatter
-from collector.models import Time, Temperature, Humidity, Pressure
+from collector.models import Temperature, Humidity, Pressure
 
 
 def temperature():
@@ -9,7 +9,7 @@ def temperature():
     y_axis = []
     for point in data:
         y_axis.append(point.value)
-        x_axis.append(point.time.value)
+        x_axis.append(point.time)
 
     plot_div = plot([Scatter(x=x_axis , y=y_axis,
                              mode='lines', name='temperature',
@@ -25,7 +25,7 @@ def humidity():
     y_axis = []
     for point in data:
         y_axis.append(point.value)
-        x_axis.append(point.time.value)
+        x_axis.append(point.time)
 
     plot_div = plot([Scatter(x=x_axis , y=y_axis,
                              mode='lines', name='humidity',
@@ -41,7 +41,7 @@ def pressure():
     y_axis = []
     for point in data:
         y_axis.append(point.value)
-        x_axis.append(point.time.value)
+        x_axis.append(point.time)
 
     plot_div = plot([Scatter(x=x_axis , y=y_axis,
                              mode='lines', name='pressure',

sensors/collector/tests/test_collector.py

@@ -1,4 +1,3 @@
-import datetime
 import pytest
 
 from collector import collector

sensors/collector/tests/test_db.py

@@ -1,14 +1,14 @@
-import datetime
 import pytest
 from mixer.backend.django import mixer
+from django.utils import timezone
 
-from collector.models import Time, Temperature, Humidity
+from collector.models import Temperature, Humidity
 
 pytestmark=pytest.mark.django_db
 
 
 def test_db_objects():
-    time = mixer.blend('collector.Time')
+    time = timezone.now()
     temp = mixer.blend('collector.Temperature', time=time)
     humidity = mixer.blend('collector.Humidity', time=time)
     assert time and temp and humidity