Merge for v1.3.1

dsmrreader · Aug 16, 2016 · d0ea9fb · d0ea9fb
2 parents c3f0060 + ebc2d06
commit d0ea9fb
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 9,299 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,14 @@ Changelog
 =========
 
 
+v1.3.1 - 2016-08-16
+^^^^^^^^^^^^^^^^^^^
+- CSS large margin-bottom (`#144 <https://github.com/dennissiemensma/dsmr-reader/issues/144>`_).
+- Django security releases issued: 1.8.14 (`#147 <https://github.com/dennissiemensma/dsmr-reader/issues/147>`_).
+- Requirements update (August 2016) (`#148 <https://github.com/dennissiemensma/dsmr-reader/issues/148>`_).
+- Query performance improvements (`#149 <https://github.com/dennissiemensma/dsmr-reader/issues/149>`_).
+
+
 v1.3.0 - 2016-07-15
 ^^^^^^^^^^^^^^^^^^^
 - API endpoint for datalogger (`#140 <https://github.com/dennissiemensma/dsmr-reader/issues/140>`_).

diff --git a/dsmr_consumption/migrations/0003_electricity_consumption_indexes.py b/dsmr_consumption/migrations/0003_electricity_consumption_indexes.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dsmr_consumption', '0002_verbose_text'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='electricityconsumption',
+            name='currently_delivered',
+            field=models.DecimalField(decimal_places=3, help_text='Actual electricity power delivered (+P) in 1 Watt resolution', db_index=True, max_digits=9),
+        ),
+        migrations.AlterField(
+            model_name='electricityconsumption',
+            name='currently_returned',
+            field=models.DecimalField(decimal_places=3, help_text='Actual electricity power received (-P) in 1 Watt resolution', db_index=True, max_digits=9),
+        ),
+    ]
diff --git a/dsmr_consumption/models/consumption.py b/dsmr_consumption/models/consumption.py
@@ -28,12 +28,14 @@ class ElectricityConsumption(models.Model):
     currently_delivered = models.DecimalField(
         max_digits=9,
         decimal_places=3,
-        help_text=_("Actual electricity power delivered (+P) in 1 Watt resolution")
+        help_text=_("Actual electricity power delivered (+P) in 1 Watt resolution"),
+        db_index=True
     )
     currently_returned = models.DecimalField(
         max_digits=9,
         decimal_places=3,
-        help_text=_("Actual electricity power received (-P) in 1 Watt resolution")
+        help_text=_("Actual electricity power received (-P) in 1 Watt resolution"),
+        db_index=True
     )
 
     def __str__(self):