diff --git a/docs/api.rst b/docs/api.rst index 1dfcc6b75..a7097fd44 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -250,7 +250,7 @@ Client file in ``/home/dsmr/dsmr_datalogger_api_client.py``:: Supervisor config in ``/etc/supervisor/conf.d/dsmr-client.conf``:: [program:dsmr_client_datalogger] - command=/usr/bin/nice -n 5 /home/dsmr/.virtualenvs/dsmrclient/bin/python3 -u /home/dsmr/dsmr_datalogger_api_client.py + command=/usr/bin/nice -n 5 /home/dsmr/.virtualenvs/dsmrreader/bin/python3 -u /home/dsmr/dsmr_datalogger_api_client.py pidfile=/var/tmp/dsmrreader--%(program_name)s.pid user=dsmr group=dsmr @@ -553,7 +553,7 @@ Using **requests** (Python):: import json response = requests.get( - 'http://YOUR-DSMR-URL/api/v2/statistics/day?read_at__gte=2017-02-01 00:00:00&read_at__lte=2017-03-01 00:00:00', + 'http://YOUR-DSMR-URL/api/v2/statistics/day?timestamp__gte=2017-02-01 00:00:00×tamp__lte=2017-03-01 00:00:00', headers={'X-AUTHKEY': 'YOUR-API-KEY'}, ) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4ec3c3f5f..8cb87c6ab 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,15 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin +v1.8.1 - 2017-07-04 +^^^^^^^^^^^^^^^^^^^ + +**Tickets resolved in this release:** + +- [`#339 `_] Upgrade Dropbox-client to v8.x + + + v1.8.0 - 2017-06-14 ^^^^^^^^^^^^^^^^^^^ diff --git a/dsmr_frontend/templates/dsmr_frontend/dashboard.html b/dsmr_frontend/templates/dsmr_frontend/dashboard.html index 0ba20c254..7cdb08d72 100644 --- a/dsmr_frontend/templates/dsmr_frontend/dashboard.html +++ b/dsmr_frontend/templates/dsmr_frontend/dashboard.html @@ -198,7 +198,8 @@ {% endif %} {% trans "Total" %} -   + {% if capabilities.electricity %}{{ consumption.electricity_merged|default:'-'|floatformat:2 }} {% endif %} + {% if capabilities.electricity_returned %}{{ consumption.electricity_returned_merged|default:'-'|floatformat:2 }}{% endif %} {{ consumption.total_cost|default:'-' }} diff --git a/dsmr_frontend/templates/dsmr_frontend/fragments/archive-xhr-statistics.html b/dsmr_frontend/templates/dsmr_frontend/fragments/archive-xhr-statistics.html index e0cf285d8..b6134a4de 100644 --- a/dsmr_frontend/templates/dsmr_frontend/fragments/archive-xhr-statistics.html +++ b/dsmr_frontend/templates/dsmr_frontend/fragments/archive-xhr-statistics.html @@ -56,7 +56,9 @@ {% trans "Total" %} -   + {% if capabilities.electricity %}{{ statistics.electricity_merged|default:'-'|floatformat:2 }} {% endif %} + {% if capabilities.electricity_returned %}{{ statistics.electricity_returned_merged|default:'-'|floatformat:2 }}{% endif %} +   {{ statistics.total_cost|default:'-' }} {% if statistics.temperature_avg %} diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py index dd63aa37c..1f86a3417 100644 --- a/dsmrreader/__init__.py +++ b/dsmrreader/__init__.py @@ -17,6 +17,6 @@ from django.utils.version import get_version -VERSION = (1, 8, 0, 'final', 0) +VERSION = (1, 8, 1, 'final', 0) __version__ = get_version(VERSION) diff --git a/dsmrreader/locales/nl/LC_MESSAGES/django.mo b/dsmrreader/locales/nl/LC_MESSAGES/django.mo index cbed3f8ea..cfc2d9741 100644 Binary files a/dsmrreader/locales/nl/LC_MESSAGES/django.mo and b/dsmrreader/locales/nl/LC_MESSAGES/django.mo differ diff --git a/dsmrreader/provisioning/requirements/base.txt b/dsmrreader/provisioning/requirements/base.txt index 89dd618bb..9abe8588c 100644 --- a/dsmrreader/provisioning/requirements/base.txt +++ b/dsmrreader/provisioning/requirements/base.txt @@ -6,10 +6,12 @@ django-debug-toolbar==1.8 django-filter==1.0.4 djangorestframework==3.6.3 django-solo==1.1.2 -dropbox==7.3.1 +dropbox==8.0.0 gunicorn==19.7.1 paho-mqtt==1.2.3 pyserial==3.3 python-dateutil==2.6.0 pytz==2017.2 raven==6.1.0 +requests==2.18.1 +urllib3==1.21.1 \ No newline at end of file