Support for both single and high/low tariff #130

Author: dennissiemensma

dsmr_frontend/templates/dsmr_frontend/trends.html

@@ -16,8 +16,7 @@
     </div>
 {% else %}
     <div class="alert alert-info" role="alert">
-    {% blocktrans %}All data below is calculated among all consumption tracked until a day ago. Untracked consumption and any usage of today is not taken into account.{% endblocktrans %}
-    {% blocktrans %}Current data displayed averages {{ hour_statistics_count }} hour(s), among {{ day_statistics_count }} day(s).{% endblocktrans %}
+    {% blocktrans %}Untracked consumption in the past (and today), is not taken into account.{% endblocktrans %}
     </div>
 {% endif %}
 
@@ -26,7 +25,7 @@
         <div class="col-md-12">
             <div class="panel">
                 <header class="panel-heading">
-                    {% blocktrans %}Average hourly electricity consumed (in %){% endblocktrans %}
+                    {% blocktrans %}Average hourly electricity consumed (in %) within the past 4 weeks{% endblocktrans %}
                 </header>
                 <div class="panel-body" style="height: 350px;">
                     <canvas id="average-electricity-consumed-chart"></canvas>
@@ -41,7 +40,7 @@
         <div class="col-md-12">
             <div class="panel">
                 <header class="panel-heading">
-                    {% blocktrans %}Average hourly electricity returned (in %){% endblocktrans %}
+                    {% blocktrans %}Average hourly electricity returned (in %) within the past 4 weeks{% endblocktrans %}
                 </header>
                 <div class="panel-body" style="height: 350px;">
                     <canvas id="average-electricity-returned-chart"></canvas>
@@ -56,7 +55,7 @@
         <div class="col-md-12">
             <div class="panel">
                 <header class="panel-heading">
-                    {% blocktrans %}Average hourly gas consumed (in %){% endblocktrans %}
+                    {% blocktrans %}Average hourly gas consumed (in %) within the past 4 weeks{% endblocktrans %}
                 </header>
                 <div class="panel-body" style="height: 350px;">
                     <canvas id="average-gas-consumed-chart"></canvas>

dsmr_frontend/views/trends.py

@@ -29,7 +29,7 @@ def get_context_data(self, **kwargs):
             return context_data
 
         # Average of real consumption/return per hour.
-        average_consumption_by_hour = dsmr_stats.services.average_consumption_by_hour()
+        average_consumption_by_hour = dsmr_stats.services.average_consumption_by_hour(max_weeks_ago=4)
 
         context_data['avg_consumption_x'] = json.dumps(
             ['{}:00'.format(int(x['hour_start'])) for x in average_consumption_by_hour]

dsmr_stats/services.py

@@ -164,8 +164,8 @@ def electricity_tariff_percentage(start_date):
     return totals
 
 
-def average_consumption_by_hour():
-    """ Calculates the average consumption by hour. Measured over all consumption data. """
+def average_consumption_by_hour(max_weeks_ago):
+    """ Calculates the average consumption by hour. Measured over all consumption data of the past X months. """
     sql_extra = {
         # Ugly engine check, but still beter than iterating over a hundred thousand items in code.
         'postgresql': "date_part('hour', hour_start)",
@@ -179,7 +179,10 @@ def average_consumption_by_hour():
     if set_time_zone_sql:
         connection.connection.cursor().execute(set_time_zone_sql, [settings.TIME_ZONE])  # pragma: no cover
 
-    hour_statistics = HourStatistics.objects.extra({
+    hour_statistics = HourStatistics.objects.filter(
+        # This greatly helps reducing the queryset size, but also makes it more relevant.
+        hour_start__gt=timezone.now() - timezone.timedelta(weeks=max_weeks_ago)
+    ).extra({
         'hour_start': sql_extra
     }).values('hour_start').order_by('hour_start').annotate(
         avg_electricity1=Avg('electricity1'),

dsmr_stats/tests/models/test_statistics.py

@@ -19,5 +19,5 @@ def setUp(self):
 
     def test_hour_statistics_average(self):
         """ #100: Empty gas readings mess up average. """
-        average_consumption = dsmr_stats.services.average_consumption_by_hour()
+        average_consumption = dsmr_stats.services.average_consumption_by_hour(max_weeks_ago=4)
         self.assertEqual(average_consumption[0]['avg_gas'], 0)  # Would have been 'None' before.

dsmr_stats/tests/test_services.py

@@ -180,8 +180,10 @@ def test_analyze_service_clear_cache(self, now_mock, clear_cache_mock):
         dsmr_stats.services.analyze()
         self.assertTrue(clear_cache_mock.called)
 
-    def test_average_consumption_by_hour(self):
+    @mock.patch('django.utils.timezone.now')
+    def test_average_consumption_by_hour(self, now_mock):
         """ Test whether timezones are converted properly when grouping hours. """
+        now_mock.return_value = timezone.make_aware(timezone.datetime(2016, 1, 25, 12))
         HourStatistics.objects.create(
             # This should be stored with local timezone, so +1.
             hour_start=timezone.make_aware(timezone.datetime(2016, 1, 1, 12)),
@@ -190,7 +192,7 @@ def test_average_consumption_by_hour(self):
             electricity1_returned=0,
             electricity2_returned=0,
         )
-        hour_stat = dsmr_stats.services.average_consumption_by_hour()[0]
+        hour_stat = dsmr_stats.services.average_consumption_by_hour(max_weeks_ago=4)[0]
 
         # @see "Trends are always shown in UTC #76", only PostgreSQL can fix this.
         if connection.vendor == 'postgresql':

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR Reader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-20 17:38+0100\n"
+"POT-Creation-Date: 2016-11-20 17:50+0100\n"
 "PO-Revision-Date: 2016-11-20 17:34+0100\n"
 "Last-Translator: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
 "Language-Team: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
@@ -702,23 +702,22 @@ msgstr "Gemeten"
 msgid "Electricity return"
 msgstr "Elektriciteitsteruglevering"
 
-msgid "All data below is calculated among all consumption tracked until a day ago. Untracked consumption and any usage of today is not taken into account."
-msgstr "Alle onderstaande gegevens zijn gebaseerd op al het gemeten verbruik tot en met gisteren. Ongemeten verbruik en het verbruik van vandaag worden hierin niet meegenomen."
-
-#, python-format
-msgid "Current data displayed averages %(hour_statistics_count)s hour(s), among %(day_statistics_count)s day(s)."
-msgstr "Huidige gegevens betreffen gemiddelden over %(hour_statistics_count)s uren, verdeeld over %(day_statistics_count)s dag(en)."
+msgid "Untracked consumption in the past (and today), is not taken into account."
+msgstr ""
 
-#, python-format
-msgid "Average hourly electricity consumed (in %%)"
+#, fuzzy, python-format
+#| msgid "Average hourly electricity consumed (in %%)"
+msgid "Average hourly electricity consumed (in %%) within the past 4 weeks"
 msgstr "Gemiddelde elektriciteitsverbruik per daguur (in %%)"
 
-#, python-format
-msgid "Average hourly electricity returned (in %%)"
+#, fuzzy, python-format
+#| msgid "Average hourly electricity returned (in %%)"
+msgid "Average hourly electricity returned (in %%) within the past 4 weeks"
 msgstr "Gemiddelde elektriciteit teruglevering per daguur (in %%)"
 
-#, python-format
-msgid "Average hourly gas consumed (in %%)"
+#, fuzzy, python-format
+#| msgid "Average hourly gas consumed (in %%)"
+msgid "Average hourly gas consumed (in %%) within the past 4 weeks"
 msgstr "Gemiddeld gasverbruik per daguur (in %%)"
 
 msgid "Electricity tariff ratio (passed week)"
@@ -988,6 +987,12 @@ msgstr "Nederlands"
 msgid "English"
 msgstr "Engels"
 
+#~ msgid "All data below is calculated among all consumption tracked until a day ago. Untracked consumption and any usage of today is not taken into account."
+#~ msgstr "Alle onderstaande gegevens zijn gebaseerd op al het gemeten verbruik tot en met gisteren. Ongemeten verbruik en het verbruik van vandaag worden hierin niet meegenomen."
+
+#~ msgid "Current data displayed averages %(hour_statistics_count)s hour(s), among %(day_statistics_count)s day(s)."
+#~ msgstr "Huidige gegevens betreffen gemiddelden over %(hour_statistics_count)s uren, verdeeld over %(day_statistics_count)s dag(en)."
+
 #~ msgid "Electricity 1 (per kWh)"
 #~ msgstr "Elektriciteit 1 (per kWh)"