Merged v1.8.1 into master

dsmrreader · Jul 4, 2017 · 86fd230 · 86fd230
1 parent 89b79be
commit 86fd230
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git 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&timestamp__lte=2017-03-01 00:00:00',
         headers={'X-AUTHKEY': 'YOUR-API-KEY'},
     )
 

diff --git 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 <https://github.com/dennissiemensma/dsmr-reader/issues/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
@@ -198,7 +198,8 @@
                         {% endif %}
                         <tr>
                             <td style="font-weight: bold;">{% trans "Total" %}</td>
-                            <td colspan="2">&nbsp;</td>
+                            <td><span class="badge bg-red">{% if capabilities.electricity %}{{ consumption.electricity_merged|default:'-'|floatformat:2 }}  </span>{% endif %}</td>
+                            <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ consumption.electricity_returned_merged|default:'-'|floatformat:2 }}{% endif %}</span></td>
                             <td><span class="badge bg-black">{{ consumption.total_cost|default:'-' }}</span></td>
                         </tr>
                     </table>

diff --git 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 @@
             </tr>
             <tr>
                 <td style="font-weight: bold;">{% trans "Total" %}</td>
-                <td colspan="3">&nbsp;</td>
+                <td><span class="badge bg-red">{% if capabilities.electricity %}{{ statistics.electricity_merged|default:'-'|floatformat:2 }}  </span>{% endif %}</td>
+                <td><span class="badge bg-green">{% if capabilities.electricity_returned %}{{ statistics.electricity_returned_merged|default:'-'|floatformat:2 }}{% endif %}</span></td>
+                <td>&nbsp;</td>
                 <td><span class="badge bg-black">{{ statistics.total_cost|default:'-' }}</span></td>
             </tr>
             {% if statistics.temperature_avg %}

diff --git 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
diff --git 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