Aflezen gegevens over voltages #518

Author: dennissiemensma

dsmr_backend/services/backend.py

@@ -40,6 +40,9 @@ def get_capabilities(capability=None):
                 phase_currently_delivered_l2__isnull=False,
                 phase_currently_delivered_l3__isnull=False
             ).exists(),
+            'voltage': ElectricityConsumption.objects.filter(
+                phase_voltage_l1__isnull=False,
+            ).exists(),
             'gas': GasConsumption.objects.exists(),
             'weather': WeatherSettings.get_solo().track and TemperatureReading.objects.exists()
         }

dsmr_consumption/migrations/0012_add_voltage_indexes.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.5 on 2019-09-26 17:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dsmr_consumption', '0011_track_phase_voltages'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='electricityconsumption',
+            name='phase_voltage_l1',
+            field=models.DecimalField(db_index=True, decimal_places=1, default=None, help_text='Current voltage for phase L1 (in V)', max_digits=4, null=True),
+        ),
+        migrations.AlterField(
+            model_name='electricityconsumption',
+            name='phase_voltage_l2',
+            field=models.DecimalField(db_index=True, decimal_places=1, default=None, help_text='Current voltage for phase L2 (in V)', max_digits=4, null=True),
+        ),
+        migrations.AlterField(
+            model_name='electricityconsumption',
+            name='phase_voltage_l3',
+            field=models.DecimalField(db_index=True, decimal_places=1, default=None, help_text='Current voltage for phase L3 (in V)', max_digits=4, null=True),
+        ),
+    ]

dsmr_consumption/models/consumption.py

@@ -87,21 +87,24 @@ class ElectricityConsumption(models.Model):
         default=None,
         max_digits=4,
         decimal_places=1,
-        help_text=_("Current voltage for phase L1 (in V)")
+        help_text=_("Current voltage for phase L1 (in V)"),
+        db_index=True
     )
     phase_voltage_l2 = models.DecimalField(
         null=True,
         default=None,
         max_digits=4,
         decimal_places=1,
-        help_text=_("Current voltage for phase L2 (in V)")
+        help_text=_("Current voltage for phase L2 (in V)"),
+        db_index=True
     )
     phase_voltage_l3 = models.DecimalField(
         null=True,
         default=None,
         max_digits=4,
         decimal_places=1,
-        help_text=_("Current voltage for phase L3 (in V)")
+        help_text=_("Current voltage for phase L3 (in V)"),
+        db_index=True
     )
 
     def __sub__(self, other):

dsmr_frontend/forms.py

@@ -28,6 +28,7 @@ class DashboardElectricityConsumptionForm(forms.Form):
     delivered = forms.BooleanField(required=False, initial=False)
     returned = forms.BooleanField(required=False, initial=False)
     phases = forms.BooleanField(required=False, initial=False)
+    voltage = forms.BooleanField(required=False, initial=False)
     latest_delta_id = forms.IntegerField(required=False, initial=None)
 
     def __init__(self, *args, **kwargs):
@@ -51,6 +52,9 @@ def clean_returned(self):
     def clean_phases(self):
         return self._clean_type('phases', 'multi_phases')
 
+    def clean_voltage(self):
+        return self._clean_type('voltage', 'voltage')
+
 
 class DashboardNotificationReadForm(forms.Form):
     notification_id = forms.IntegerField()

dsmr_frontend/static/dsmr_frontend/js/dsmr-reader/dashboard/voltage.js

@@ -0,0 +1,131 @@
+$(document).ready(function(){
+	
+	var echarts_voltage_graph = echarts.init(document.getElementById('echarts-voltage-graph'));
+    var echarts_voltage_initial_options = {
+        color: [
+        	voltage_l1_color,
+        	voltage_l2_color,
+        	voltage_l3_color
+        ],
+    	tooltip : {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow',
+                label: {
+                    show: true
+                }
+            }
+        },
+        calculable : true,
+        grid: {
+            top: '12%',
+            left: '1%',
+            right: '2%',
+            containLabel: true
+        },
+        xAxis: [
+            {
+                type : 'category',
+                boundaryGap: false,
+                data : null
+            }
+        ],
+        yAxis: [
+            {
+                type : 'value'
+            }
+        ],
+        dataZoom: [
+            {
+                show: true,
+                start: 0,
+                end: 100
+            },
+            {
+                type: 'inside',
+                start: 0,
+                end: 100
+            }
+        ],
+    };
+
+    /* These settings should not affect the updates and reset the zoom on each update. */
+    var echarts_voltage_update_options = {
+        xAxis: [
+            {
+                type : 'category',
+                boundaryGap: false,
+                data : null
+            }
+        ],
+        series : [
+            {
+            	smooth: true,
+                name: 'Volt (L1)',
+                type: 'line',
+                data: null
+            },
+            {
+            	smooth: true,
+                name: 'Volt (L2)',
+                type: 'line',
+                data: null
+            },
+            {
+            	smooth: true,
+                name: 'Volt (L3)',
+                type: 'line',
+                data: null
+            },
+        ]
+    };
+	
+	echarts_voltage_graph.showLoading('default', echarts_loading_options);
+	
+	/* Init graph. */
+	$.get(echarts_voltage_graph_url, function (xhr_data) {
+	    echarts_voltage_graph.hideLoading();
+	    
+	    /* Adjust default zooming to the number of default items we want to display. */
+	    var zoom_percent = 100 - (dashboard_graph_width / xhr_data.read_at.length * 100);
+	    echarts_voltage_initial_options.dataZoom[0].start = zoom_percent;
+	    echarts_voltage_graph.setOption(echarts_voltage_initial_options);
+
+	    /* Different set of options, to prevent the dataZoom being reset on each update. */
+	    echarts_voltage_update_options.xAxis[0].data = xhr_data.read_at;
+	    echarts_voltage_update_options.series[0].data = xhr_data.phase_voltage.l1;
+	    echarts_voltage_update_options.series[1].data = xhr_data.phase_voltage.l2;
+	    echarts_voltage_update_options.series[2].data = xhr_data.phase_voltage.l3;
+	    echarts_voltage_graph.setOption(echarts_voltage_update_options);
+	    
+	    var latest_delta_id = xhr_data.latest_delta_id;
+
+		/* Update graph data from now on. */
+	    setInterval(function () {
+			$.get(echarts_voltage_graph_url + "&latest_delta_id=" + latest_delta_id, function (xhr_data) {
+				/* Ignore empty sets. */
+				if (xhr_data.read_at.length == 0)
+				{
+					return;
+				}
+
+				/* Delta update. */
+				for (var i = 0 ; i < xhr_data.read_at.length ; i++)
+				{
+					echarts_voltage_update_options.xAxis[0].data.push(xhr_data.read_at[i]);
+					echarts_voltage_update_options.series[0].data.push(xhr_data.phase_voltage.l1[i]);
+					echarts_voltage_update_options.series[1].data.push(xhr_data.phase_voltage.l2[i]);
+					echarts_voltage_update_options.series[2].data.push(xhr_data.phase_voltage.l3[i]);
+				}
+				
+				latest_delta_id = xhr_data.latest_delta_id;
+	    		echarts_voltage_graph.setOption(echarts_voltage_update_options);
+	    	});
+	    }, echarts_voltage_graph_interval * 1000);
+	});
+	
+	/* Responsiveness. */
+	$(window).resize(function() {
+		echarts_voltage_graph.resize();
+	});
+});

dsmr_frontend/templates/dsmr_frontend/dashboard.html

@@ -177,6 +177,22 @@
     </div>
     {% endif %}   
 
+    {% if capabilities.voltage %}
+    <div class="row" id="voltage_holder">
+        <div class="col-md-12">
+            <div class="panel">
+                <header class="panel-heading">
+                    {% trans "Phase voltages in the past 24 hours" %}
+                </header>
+                <div class="panel-body">
+                    <small>{% blocktrans %}Scroll or pinch the graph to zoom in and out. Drag the graph left or right, or use the horizontal scrollbar below the graph.{% endblocktrans %}</small>
+                    <div id="echarts-voltage-graph" style="width: 100%; height: 300px;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+    {% endif %}
+
     {% if capabilities.gas %}
     <div class="row">
         <div class="col-md-12">
@@ -255,6 +271,18 @@
     <script type="text/javascript" src="{% static 'dsmr_frontend/js/dsmr-reader/dashboard/phases.js' %}?r=v{{ dsmr_version }}"></script>
 {% endif %}
 
+{% if capabilities.voltage %}
+    <script type="text/javascript">
+        var echarts_voltage_graph_url = "{% url 'frontend:dashboard-xhr-electricity' %}?voltage=True";
+        var voltage_l1_color = "{{ frontend_settings.phase_delivered_l1_color }}";
+        var voltage_l2_color = "{{ frontend_settings.phase_delivered_l2_color }}";
+        var voltage_l3_color = "{{ frontend_settings.phase_delivered_l3_color }}";
+
+        var echarts_voltage_graph_interval = 5;
+    </script>
+    <script type="text/javascript" src="{% static 'dsmr_frontend/js/dsmr-reader/dashboard/voltage.js' %}?r=v{{ dsmr_version }}"></script>
+{% endif %}
+
 {% if capabilities.gas %}
     <script type="text/javascript">
         var echarts_gas_graph_url = "{% url 'frontend:dashboard-xhr-gas' %}";

dsmr_frontend/tests/webinterface/test_dashboard.py

@@ -123,6 +123,7 @@ def test_dashboard_xhr_electricity(self, now_mock):
                 phase_currently_returned_l1=2.5,
                 phase_currently_returned_l2=2.25,
                 phase_currently_returned_l3=2.75,
+                phase_voltage_l1=230,
             )
             ElectricityConsumption.objects.create(
                 read_at=timezone.now() - timezone.timedelta(hours=1),
@@ -138,6 +139,7 @@ def test_dashboard_xhr_electricity(self, now_mock):
                 phase_currently_returned_l1=3.5,
                 phase_currently_returned_l2=3.25,
                 phase_currently_returned_l3=3.75,
+                phase_voltage_l1=230,
             )
 
         response = self.client.get(
@@ -168,7 +170,8 @@ def test_dashboard_xhr_electricity(self, now_mock):
                     'l1': [3500.0, 2500.0],
                     'l2': [3250.0, 2250.0],
                     'l3': [3750.0, 2750.0],
-                }
+                },
+                'phase_voltage': {'l1': [], 'l2': [], 'l3': []},
             }
         )
 
@@ -249,7 +252,36 @@ def test_dashboard_xhr_electricity(self, now_mock):
                     'l1': [3500.0],
                     'l2': [3250.0],
                     'l3': [3750.0],
-                }
+                },
+                'phase_voltage': {'l1': [], 'l2': [], 'l3': []},
+            }
+        )
+
+        # Voltages
+        response = self.client.get(
+            reverse('{}:dashboard-xhr-electricity'.format(self.namespace)),
+            data={'voltage': True, 'latest_delta_id': old_latest_delta_id}
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        json_content = json.loads(response.content.decode("utf8"))
+        self.assertEqual(
+            json_content,
+            {
+                'latest_delta_id': json_content['latest_delta_id'],  # Not hardcoded due to DB backend differences.
+                'read_at': ['Sat 23:00'],
+                'currently_delivered': [],
+                'currently_returned': [],
+                'phases_delivered': {
+                    'l1': [],
+                    'l2': [],
+                    'l3': [],
+                },
+                'phases_returned': {
+                    'l1': [],
+                    'l2': [],
+                    'l3': [],
+                },
+                'phase_voltage': {'l1': [230], 'l2': [0.0], 'l3': [0.0]},
             }
         )
 

dsmr_frontend/views/dashboard.py

@@ -91,6 +91,11 @@ def get(self, request):  # noqa: C901
                 'l2': [],
                 'l3': [],
             },
+            'phase_voltage': {
+                'l1': [],
+                'l2': [],
+                'l3': [],
+            },
         }
 
         # Optional delta.
@@ -126,6 +131,11 @@ def get(self, request):  # noqa: C901
                     data['phases_returned']['l2'].append(float(current.phase_currently_returned_l2 or 0) * 1000)
                     data['phases_returned']['l3'].append(float(current.phase_currently_returned_l3 or 0) * 1000)
 
+            if form.cleaned_data.get('voltage'):
+                data['phase_voltage']['l1'].append(float(current.phase_voltage_l1 or 0))
+                data['phase_voltage']['l2'].append(float(current.phase_voltage_l2 or 0))
+                data['phase_voltage']['l3'].append(float(current.phase_voltage_l3 or 0))
+
             data['latest_delta_id'] = current.id
 
         return JsonResponse(data)

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -871,6 +871,9 @@ msgstr "Scroll of knijp de grafiek om in- en uit te zoomen. Sleep de grafiek naa
 msgid "Recent distribution of electricity phases (Watt) in the past 24 hours"
 msgstr "Recente distributie elektriciteitsfasen (Watt) in de afgelopen 24 uur"
 
+msgid "Phase voltages in the past 24 hours"
+msgstr "Fase voltages in de afgelopen 24 uur"
+
 msgid "Recent gas consumed (m<sup>3</sup>) in the past 24 hours"
 msgstr "Recent gasverbruik (m<sup>3</sup>) in de afgelopen 24 uur"