"All time low" implementeren #535

dennissiemensma · dennissiemensma · commit e59ba5d52b66 · 2018-10-24T20:39:00.000+02:00
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -23,6 +23,7 @@ v1.26.0 - 2018-xx-xx
 **Tickets resolved in this release:**
 
 - [`#xxxxxxxxxxxxxxxxxx <https://github.com/dennissiemensma/dsmr-reader/issues/xxxxxxxxxxxxxx>`_] yyyyyyyyyyyyyyyyyyyy
+- [`#535 <https://github.com/dennissiemensma/dsmr-reader/issues/535>`_] "All time low" implementeren
 - [`#536 <https://github.com/dennissiemensma/dsmr-reader/issues/536>`_] Retentie-verbeteringen
 
 
diff --git a/dsmr_backend/mixins.py b/dsmr_backend/mixins.py
@@ -140,11 +140,8 @@ def __init__(self, *args, **kwargs):
         super(ReadOnlyAdminModel, self).__init__(*args, **kwargs)
         self.readonly_fields = [x.name for x in self.model._meta.get_fields()]
 
-    def has_view_permission(self, request, obj=None):
-        return True
-
     def has_change_permission(self, request, obj=None):
-        return False
+        return True
 
     def has_add_permission(self, request, obj=None):
         return False
diff --git a/dsmr_frontend/templates/dsmr_frontend/statistics.html b/dsmr_frontend/templates/dsmr_frontend/statistics.html
@@ -198,6 +198,40 @@
                             </td>
                         </tr>
                         {% endif %}
+
+                        {% if electricity_statistics.lowest_usage_l1_value %}
+                        <tr>
+                            <td class="col-md-6">{% trans "Lowest usage (L1+)" %}</td>
+                            <td class="col-md-6">
+                                <span class="badge bg-red">
+                                   <i class="fas fa-bolt"></i> &nbsp; {{ electricity_statistics.lowest_usage_l1_value }} &nbsp; 
+                                   {% trans "Watt" %} &nbsp; - &nbsp; {{ electricity_statistics.lowest_usage_l1_timestamp }}
+                                </span>
+                            </td>
+                        </tr>
+                        {% endif %}
+                        {% if electricity_statistics.lowest_usage_l2_value %}
+                        <tr>
+                            <td class="col-md-6">{% trans "Lowest usage (L2+)" %}</td>
+                            <td class="col-md-6">
+                                <span class="badge bg-red">
+                                   <i class="fas fa-bolt"></i> &nbsp; {{ electricity_statistics.lowest_usage_l2_value }} &nbsp; 
+                                   {% trans "Watt" %} &nbsp; - &nbsp; {{ electricity_statistics.lowest_usage_l2_timestamp }}
+                                </span>
+                            </td>
+                        </tr>
+                        {% endif %}
+                        {% if electricity_statistics.lowest_usage_l3_value %}
+                        <tr>
+                            <td class="col-md-6">{% trans "Lowest usage (L3+)" %}</td>
+                            <td class="col-md-6">
+                                <span class="badge bg-red">
+                                   <i class="fas fa-bolt"></i> &nbsp; {{ electricity_statistics.lowest_usage_l3_value }} &nbsp; 
+                                   {% trans "Watt" %} &nbsp; - &nbsp; {{ electricity_statistics.lowest_usage_l3_timestamp }}
+                                </span>
+                            </td>
+                        </tr>
+                        {% endif %}
                         
                         {% if electricity_statistics.highest_return_l1_value %}
                         <tr>
diff --git a/dsmr_stats/migrations/0013_all_time_low.py b/dsmr_stats/migrations/0013_all_time_low.py
@@ -0,0 +1,43 @@
+# Generated by Django 2.0.9 on 2018-10-24 17:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dsmr_stats', '0012_electricity_statistics'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l1_timestamp',
+            field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='Timestamp of lowest usage on L1+'),
+        ),
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l1_value',
+            field=models.DecimalField(blank=True, decimal_places=3, default=None, max_digits=9, null=True, verbose_name='Lowest usage on L1+ (in kWh)'),
+        ),
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l2_timestamp',
+            field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='Timestamp of lowest usage on L2+'),
+        ),
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l2_value',
+            field=models.DecimalField(blank=True, decimal_places=3, default=None, max_digits=9, null=True, verbose_name='Lowest usage on L2+ (in kWh)'),
+        ),
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l3_timestamp',
+            field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='Timestamp of lowest usage on L3+'),
+        ),
+        migrations.AddField(
+            model_name='electricitystatistics',
+            name='lowest_usage_l3_value',
+            field=models.DecimalField(blank=True, decimal_places=3, default=None, max_digits=9, null=True, verbose_name='Lowest usage on L3+ (in kWh)'),
+        ),
+    ]
diff --git a/dsmr_stats/models/statistics.py b/dsmr_stats/models/statistics.py
@@ -126,6 +126,15 @@ class ElectricityStatistics(SingletonModel):
     highest_return_l3_timestamp = models.DateTimeField(
         null=True, blank=True, default=None, verbose_name=_('Timestamp of highest return on L3-')
     )
+    lowest_usage_l1_timestamp = models.DateTimeField(
+        null=True, blank=True, default=None, verbose_name=_('Timestamp of lowest usage on L1+')
+    )
+    lowest_usage_l2_timestamp = models.DateTimeField(
+        null=True, blank=True, default=None, verbose_name=_('Timestamp of lowest usage on L2+')
+    )
+    lowest_usage_l3_timestamp = models.DateTimeField(
+        null=True, blank=True, default=None, verbose_name=_('Timestamp of lowest usage on L3+')
+    )
 
     highest_usage_l1_value = models.DecimalField(
         max_digits=9, decimal_places=3, null=True, blank=True, default=None,
@@ -151,6 +160,18 @@ class ElectricityStatistics(SingletonModel):
         max_digits=9, decimal_places=3, null=True, blank=True, default=None,
         verbose_name=_('Highest return on L3- (in kWh)')
     )
+    lowest_usage_l1_value = models.DecimalField(
+        max_digits=9, decimal_places=3, null=True, blank=True, default=None,
+        verbose_name=_('Lowest usage on L1+ (in kWh)')
+    )
+    lowest_usage_l2_value = models.DecimalField(
+        max_digits=9, decimal_places=3, null=True, blank=True, default=None,
+        verbose_name=_('Lowest usage on L2+ (in kWh)')
+    )
+    lowest_usage_l3_value = models.DecimalField(
+        max_digits=9, decimal_places=3, null=True, blank=True, default=None,
+        verbose_name=_('Lowest usage on L3+ (in kWh)')
+    )
 
     def export(self):
         """ Converts the data in to ready to use format. """
diff --git a/dsmr_stats/services.py b/dsmr_stats/services.py
@@ -269,23 +269,38 @@ def year_statistics(target_date):
 
 def update_electricity_statistics(reading):
     """ Updates the ElectricityStatistics records. """
-    MAP = {
-        # Reading field: Stats record field.
-        'phase_currently_delivered_l1': 'highest_usage_l1',
-        'phase_currently_delivered_l2': 'highest_usage_l2',
-        'phase_currently_delivered_l3': 'highest_usage_l3',
-        'phase_currently_returned_l1': 'highest_return_l1',
-        'phase_currently_returned_l2': 'highest_return_l2',
-        'phase_currently_returned_l3': 'highest_return_l3',
+    MAPPING = {
+        # Stats record field: Reading field.
+        'highest_usage_l1': 'phase_currently_delivered_l1',
+        'highest_usage_l2': 'phase_currently_delivered_l2',
+        'highest_usage_l3': 'phase_currently_delivered_l3',
+        'highest_return_l1': 'phase_currently_returned_l1',
+        'highest_return_l2': 'phase_currently_returned_l2',
+        'highest_return_l3': 'phase_currently_returned_l3',
+
+        'lowest_usage_l1': 'phase_currently_delivered_l1',
+        'lowest_usage_l2': 'phase_currently_delivered_l2',
+        'lowest_usage_l3': 'phase_currently_delivered_l3',
     }
     stats = ElectricityStatistics.get_solo()
     dirty = False
 
-    for reading_field, stat_field in MAP.items():
+    for stat_field, reading_field in MAPPING.items():
         reading_value = getattr(reading, reading_field) or 0
-        highest_value = getattr(stats, '{}_value'.format(stat_field)) or 0
+        top_value = getattr(stats, '{}_value'.format(stat_field)) or 0
 
-        if reading_value and Decimal(reading_value) > Decimal(highest_value):
+        if top_value == 0 and stat_field.startswith('lowest'):
+            top_value = 9999999
+
+        reading_value = Decimal(str(reading_value))
+        top_value = Decimal(str(top_value))
+
+        if not reading_value:
+            continue
+
+        # Depending on what we track, compare to the current high (or low).
+        if (stat_field.startswith('lowest') and reading_value < top_value) or \
+                (stat_field.startswith('highest') and reading_value > top_value):
             dirty = True
             setattr(stats, '{}_value'.format(stat_field), reading_value)
             setattr(stats, '{}_timestamp'.format(stat_field), reading.timestamp)
diff --git a/dsmr_stats/tests/test_services.py b/dsmr_stats/tests/test_services.py
@@ -11,6 +11,7 @@
 from dsmr_datalogger.models.reading import DsmrReading
 import dsmr_backend.services
 import dsmr_stats.services
+from dsmr_consumption.models.settings import ConsumptionSettings
 
 
 class TestServices(InterceptStdoutMixin, TestCase):
@@ -41,12 +42,8 @@ def test_analyze_service(self, now_mock):
         now_mock.return_value = timezone.make_aware(timezone.datetime(2015, 12, 12, hour=1, minute=5))
         dsmr_stats.services.analyze()
 
-        if dsmr_backend.services.get_capabilities(capability='gas'):
-            self.assertEqual(DayStatistics.objects.count(), 0)
-            self.assertEqual(HourStatistics.objects.count(), 0)
-        else:
-            self.assertEqual(DayStatistics.objects.count(), 0)
-            self.assertEqual(HourStatistics.objects.count(), 0)
+        self.assertEqual(DayStatistics.objects.count(), 0)
+        self.assertEqual(HourStatistics.objects.count(), 0)
 
         # Still too soon.
         now_mock.return_value = timezone.make_aware(timezone.datetime(2015, 12, 13, hour=1, minute=5))
@@ -471,6 +468,8 @@ def test_update_electricity_statistics(self, now_mock):
 
     @mock.patch('django.utils.timezone.now')
     def test_update_electricity_statistics_single_phase(self, now_mock):
+        ConsumptionSettings.objects.update(compactor_grouping_type=ConsumptionSettings.COMPACTOR_GROUPING_BY_READING)
+
         now_mock.return_value = timezone.make_aware(timezone.datetime(2018, 1, 1, hour=0))
         stats = ElectricityStatistics.get_solo()
         self.assertIsNone(stats.highest_usage_l1_value)
@@ -479,6 +478,9 @@ def test_update_electricity_statistics_single_phase(self, now_mock):
         self.assertIsNone(stats.highest_return_l1_value)
         self.assertIsNone(stats.highest_return_l2_value)
         self.assertIsNone(stats.highest_return_l3_value)
+        self.assertIsNone(stats.lowest_usage_l1_value)
+        self.assertIsNone(stats.lowest_usage_l2_value)
+        self.assertIsNone(stats.lowest_usage_l3_value)
 
         # This has to differ, to make sure the right timestamp is used.
         reading_timestamp = timezone.now()
@@ -504,16 +506,46 @@ def test_update_electricity_statistics_single_phase(self, now_mock):
         self.assertEqual(stats.highest_usage_l1_value, Decimal('0.100'))
         self.assertEqual(stats.highest_usage_l2_value, None)
         self.assertEqual(stats.highest_usage_l3_value, None)
-        self.assertEqual(stats.highest_return_l1_value, Decimal('1.100'))
-        self.assertEqual(stats.highest_return_l2_value, None)
-        self.assertEqual(stats.highest_return_l3_value, None)
         self.assertEqual(stats.highest_usage_l1_timestamp, reading_timestamp)
         self.assertEqual(stats.highest_usage_l2_timestamp, None)
         self.assertEqual(stats.highest_usage_l3_timestamp, None)
+
+        self.assertEqual(stats.highest_return_l1_value, Decimal('1.100'))
+        self.assertEqual(stats.highest_return_l2_value, None)
+        self.assertEqual(stats.highest_return_l3_value, None)
         self.assertEqual(stats.highest_return_l1_timestamp, reading_timestamp)
         self.assertEqual(stats.highest_return_l2_timestamp, None)
         self.assertEqual(stats.highest_return_l3_timestamp, None)
 
+        self.assertEqual(stats.lowest_usage_l1_value, Decimal('0.100'))
+        self.assertEqual(stats.lowest_usage_l2_value, None)
+        self.assertEqual(stats.lowest_usage_l3_value, None)
+        self.assertEqual(stats.lowest_usage_l1_timestamp, reading_timestamp)
+        self.assertEqual(stats.lowest_usage_l2_timestamp, None)
+        self.assertEqual(stats.lowest_usage_l3_timestamp, None)
+
+        # Test a new low.
+        reading2 = DsmrReading.objects.create(
+            timestamp=reading_timestamp + timezone.timedelta(seconds=10),
+            electricity_delivered_1=0,
+            electricity_returned_1=0,
+            electricity_delivered_2=0,
+            electricity_returned_2=0,
+            electricity_currently_delivered=0.6,
+            electricity_currently_returned=1.6,
+            phase_currently_delivered_l1=0.05,
+            phase_currently_returned_l1=1.0,
+        )
+        dsmr_stats.services.update_electricity_statistics(reading=reading2)
+
+        stats = ElectricityStatistics.get_solo()
+        self.assertEqual(stats.highest_usage_l1_value, Decimal('0.100'))
+        self.assertEqual(stats.highest_usage_l1_timestamp, reading_timestamp)
+        self.assertEqual(stats.highest_return_l1_value, Decimal('1.100'))
+        self.assertEqual(stats.highest_return_l1_timestamp, reading_timestamp)
+        self.assertEqual(stats.lowest_usage_l1_value, Decimal('0.050'))
+        self.assertEqual(stats.lowest_usage_l1_timestamp, reading2.timestamp)
+
 
 class TestServicesWithoutGas(TestServices):
     fixtures = ['dsmr_stats/electricity-consumption.json']
diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 26, 0, 'beta', 1)
+VERSION = (1, 26, 0, 'beta', 2)
 
 __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/locales/nl/LC_MESSAGES/django.po b/dsmrreader/locales/nl/LC_MESSAGES/django.po
@@ -850,6 +850,15 @@ msgstr "Hoogste verbruik (L2+)"
 msgid "Highest usage (L3+)"
 msgstr "Hoogste verbruik (L3+)"
 
+msgid "Lowest usage (L1+)"
+msgstr "Laagste verbruik (L1+)"
+
+msgid "Lowest usage (L2+)"
+msgstr "Laagste verbruik (L2+)"
+
+msgid "Lowest usage (L3+)"
+msgstr "Laagste verbruik (L3+)"
+
 msgid "Highest return (L1-)"
 msgstr "Hoogste teruglevering (L1-)"
 
@@ -1648,6 +1657,15 @@ msgstr "Moment van hoogste teruglevering op L2-"
 msgid "Timestamp of highest return on L3-"
 msgstr "Moment van hoogste teruglevering op L3-"
 
+msgid "Timestamp of lowest usage on L1+"
+msgstr "Moment van laagste verbruik op L1+"
+
+msgid "Timestamp of lowest usage on L2+"
+msgstr "Moment van laagste verbruik op L2+"
+
+msgid "Timestamp of lowest usage on L3+"
+msgstr "Moment van laagste verbruik op L3+"
+
 msgid "Highest usage on L1+ (in kWh)"
 msgstr "Hoogste verbruik op L1+ (in kWh)"
 
@@ -1666,6 +1684,15 @@ msgstr "Hoogste teruglevering op L2- (in kWh)"
 msgid "Highest return on L3- (in kWh)"
 msgstr "Hoogste teruglevering op L3- (in kWh)"
 
+msgid "Lowest usage on L1+ (in kWh)"
+msgstr "Laagste verbruik op L1+ (in kWh)"
+
+msgid "Lowest usage on L2+ (in kWh)"
+msgstr "Laagste verbruik op L2+ (in kWh)"
+
+msgid "Lowest usage on L3+ (in kWh)"
+msgstr "Laagste verbruik op L3+ (in kWh)"
+
 msgid "Buienradar"
 msgstr "Buienradar"
 
