Merge branch '125-trends-no-data-error' into development

dsmrreader · May 1, 2016 · fc4592b · fc4592b
2 parents c1c57c2 + f2cbbd9
commit fc4592b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/dennissiemensma/dsmr-reader.svg?branch=master)](https://travis-ci.org/dennissiemensma/dsmr-reader)
 [![Coverage](https://codecov.io/github/dennissiemensma/dsmr-reader/coverage.svg?branch=master)](https://codecov.io/github/dennissiemensma/dsmr-reader?branch=master)
 [![Requirements Status](https://requires.io/github/dennissiemensma/dsmr-reader/requirements.svg?branch=master)](https://requires.io/github/dennissiemensma/dsmr-reader/requirements/?branch=master)
-[![Documentation Status](http://readthedocs.org/projects/dsmr-reader/badge/?version=latest)](http://dsmr-reader.readthedocs.org/en/latest/?badge=latest)
+[![Documentation Status](http://readthedocs.org/projects/dsmr-reader/badge/?version=latest)](http://dsmr-reader.readthedocs.io/en/latest/?badge=latest)
 
 
 # About
@@ -12,15 +12,15 @@ There are plenty of ‘scripts’ and websites available for performing DSMR rea
 
 **English**
 
-See [Read The Docs, in English](http://dsmr-reader.readthedocs.org/en/latest/). Installation guide can be found there as well.
+See [Read The Docs, in English](http://dsmr-reader.readthedocs.io/en/latest/). Installation guide can be found there as well.
 
 **Dutch / Nederlands**
 
-Zie [Read The Docs, in het Nederlands](http://dsmr-reader.readthedocs.org/nl/latest/). Je kunt daar ook alle installatieinstructies vinden.
+Zie [Read The Docs, in het Nederlands](http://dsmr-reader.readthedocs.io/nl/latest/). Je kunt daar ook alle installatieinstructies vinden.
 
 
 # Screenshots
-More screenshots can be found in the documentation at [Read The Docs](http://dsmr-reader.readthedocs.org/en/latest/screenshots.html).
+More screenshots can be found in the documentation at [Read The Docs](http://dsmr-reader.readthedocs.io/en/latest/screenshots.html).
 
 ## Dashboard
 ![Dashboard](docs/_static/screenshots/dashboard.png)

diff --git a/dsmr_frontend/templates/dsmr_frontend/base.html b/dsmr_frontend/templates/dsmr_frontend/base.html
@@ -59,7 +59,7 @@
                         {% block header_right %}{% endblock %}
 
 					    <li>
-					        <a href="http://dsmr-reader.readthedocs.org/{{ LANGUAGE_CODE }}/latest/changelog.html" target="_blank" title="{% trans 'View releases' %}">
+					        <a href="http://dsmr-reader.readthedocs.io/{{ LANGUAGE_CODE }}/latest/changelog.html" target="_blank" title="{% trans 'View releases' %}">
 					            <small>v{{ dsmr_version }}</small>
 					        </a>
 					    </li>

diff --git a/dsmr_frontend/templates/dsmr_frontend/status.html b/dsmr_frontend/templates/dsmr_frontend/status.html
@@ -25,11 +25,11 @@
                     <table class="table table-condensed">
                         <tr>
                             <td class="col-md-6">{% trans "Current version" %} {% trans "DSMR-reader" %}</td>
-                            <td class="col-md-6"><a href="https://github.com/dennissiemensma/dsmr-reader/releases/tag/v{{ dsmr_version }}" target="_blank" title="{% trans 'View current release' %}">v{{ dsmr_version }}</a></td>
+                            <td class="col-md-6"><a href="https://github.com/dennissiemensma/dsmr-reader/releases/" target="_blank" title="{% trans 'View releases' %}">v{{ dsmr_version }}</a></td>
                         </tr>
                         <tr>
                             <td class="col-md-6">{% trans "Changelog" %}</td>
-                            <td class="col-md-6"><a href="http://dsmr-reader.readthedocs.org/{{ LANGUAGE_CODE }}/latest/changelog.html" target="_blank">{% trans 'View all releases' %}</a></td>
+                            <td class="col-md-6"><a href="http://dsmr-reader.readthedocs.io/{{ LANGUAGE_CODE }}/latest/changelog.html" target="_blank">{% trans 'View all releases' %}</a></td>
                         </tr>
                     </table>
                 </div><!-- /.panel-body -->

diff --git a/dsmr_stats/services.py b/dsmr_stats/services.py
@@ -147,6 +147,11 @@ def electricity_tariff_percentage(start_date):
         electricity1=Sum('electricity1'),
         electricity2=Sum('electricity2'),
     )
+
+    # Empty data will crash.
+    if not all(totals.values()):
+        return None
+
     global_total = totals['electricity1'] + totals['electricity2']
     totals['electricity1'] = math.ceil(totals['electricity1'] / global_total * 100)
     totals['electricity2'] = 100 - totals['electricity1']

diff --git a/dsmr_stats/tests/test_services.py b/dsmr_stats/tests/test_services.py
@@ -296,6 +296,10 @@ def test_electricity_tariff_percentage(self):
         self.assertEqual(percentages['electricity1'], 25)
         self.assertEqual(percentages['electricity2'], 75)
 
+        # Now try again without data.
+        DayStatistics.objects.all().delete()
+        percentages = dsmr_stats.services.electricity_tariff_percentage(start_date=target_date.date())
+
 
 class TestServicesWithoutGas(TestServices):
     fixtures = ['dsmr_stats/electricity-consumption.json']