From 2c5bac292addbf85363aef3266cd16788b739ea2 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 21 Oct 2019 19:42:03 +0200 Subject: [PATCH] replace timezone with datetime Since the plots are not really part of django they aren't returning timezone objects which django can convert to the correct timezone. Therefore they are always UTC. However we can disable the timezone support in django. The're might be a more elegant solution to this but since this is just a small project I'll leave it at that. --- sensors/collector/collector.py | 4 ++-- sensors/collector/plot.py | 4 ++-- sensors/sensors/settings/base.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sensors/collector/collector.py b/sensors/collector/collector.py index 93e020f..cb99add 100644 --- a/sensors/collector/collector.py +++ b/sensors/collector/collector.py @@ -1,5 +1,5 @@ import os -from django.utils import timezone +from datetime import datetime if os.uname()[4].startswith("arm"): from sense_hat import SenseHat @@ -27,7 +27,7 @@ def get_humidity(): def values_to_db(): - time = timezone.now() + time = datetime.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) diff --git a/sensors/collector/plot.py b/sensors/collector/plot.py index fff778b..2527477 100644 --- a/sensors/collector/plot.py +++ b/sensors/collector/plot.py @@ -1,11 +1,11 @@ from datetime import timedelta -from django.utils import timezone +from datetime import datetime from plotly.offline import plot from plotly.graph_objs import Scatter from collector.models import Temperature, Humidity, Pressure -start_time = timezone.now() - timedelta(hours=12) +start_time = datetime.now() - timedelta(hours=12) def temperature(): data = Temperature.objects.filter(time__gt=start_time) diff --git a/sensors/sensors/settings/base.py b/sensors/sensors/settings/base.py index f4cbfbd..4dc8b28 100644 --- a/sensors/sensors/settings/base.py +++ b/sensors/sensors/settings/base.py @@ -95,7 +95,7 @@ USE_I18N = True USE_L10N = True -USE_TZ = True +USE_TZ = False # Static files (CSS, JavaScript, Images)