Skip to content

Commit 667c2de

Browse files
Meter statistieken weergeven wanneer leeg #625
1 parent c6117ba commit 667c2de

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

docs/changelog.rst

+2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ v2.4.0 - 2019-xx-xx
2121
**Tickets resolved in this release:**
2222

2323
- [`#699 <https://github.com/dennissiemensma/dsmr-reader/issues/699>`_] Hergenereren dagtotalen verbeteren
24+
- [`#625 <https://github.com/dennissiemensma/dsmr-reader/issues/625>`_] Meter statistieken weergeven wanneer leeg
2425
- [`#xxxxx <https://github.com/dennissiemensma/dsmr-reader/issues/xxxxx>`_] xxxxxxxxxxxx
2526

27+
2628
----
2729

2830

dsmr_frontend/templates/dsmr_frontend/statistics.html

-16
Original file line numberDiff line numberDiff line change
@@ -68,54 +68,38 @@
6868
</header>
6969
<div class="panel-body">
7070
<table class="table table-condensed">
71-
{% if meter_statistics.power_failure_count %}
7271
<tr>
7372
<td class="col-md-6">{% trans "Number of power failures in any phases" %}</td>
7473
<td class="col-md-6"><span class="badge bg-black">{{ meter_statistics.power_failure_count|default:'-' }}</span></td>
7574
</tr>
76-
{% endif %}
77-
{% if meter_statistics.long_power_failure_count %}
7875
<tr>
7976
<td>{% trans "Number of long power failures in any phase" %}</td>
8077
<td><span class="badge bg-black">{{ meter_statistics.long_power_failure_count|default:'-' }}</span></td>
8178
</tr>
82-
{% endif %}
83-
{% if meter_statistics.voltage_sag_count_l1 %}
8479
<tr>
8580
<td>{% trans "Number of voltage sags/dips in phase L1" %}</td>
8681
<td><span class="badge bg-olive">{{ meter_statistics.voltage_sag_count_l1|default:'-' }}</span></td>
8782
</tr>
88-
{% endif %}
89-
{% if meter_statistics.voltage_sag_count_l2 %}
9083
<tr>
9184
<td>{% trans "Number of voltage sags/dips in phase L2 (polyphase meters only)" %}</td>
9285
<td><span class="badge bg-olive">{{ meter_statistics.voltage_sag_count_l2|default:'-' }}</span></td>
9386
</tr>
94-
{% endif %}
95-
{% if meter_statistics.voltage_sag_count_l3 %}
9687
<tr>
9788
<td>{% trans "Number of voltage sags/dips in phase L3 (polyphase meters only)" %}</td>
9889
<td><span class="badge bg-olive">{{ meter_statistics.voltage_sag_count_l3|default:'-' }}</span></td>
9990
</tr>
100-
{% endif %}
101-
{% if meter_statistics.voltage_swell_count_l1 %}
10291
<tr>
10392
<td>{% trans "Number of voltage swells in phase L1" %}</td>
10493
<td><span class="badge bg-olive">{{ meter_statistics.voltage_swell_count_l1|default:'-' }}</span></td>
10594
</tr>
106-
{% endif %}
107-
{% if meter_statistics.voltage_swell_count_l2 %}
10895
<tr>
10996
<td>{% trans "Number of voltage swells in phase L2 (polyphase meters only)" %}</td>
11097
<td><span class="badge bg-olive">{{ meter_statistics.voltage_swell_count_l2|default:'-' }}</span></td>
11198
</tr>
112-
{% endif %}
113-
{% if meter_statistics.voltage_swell_count_l3 %}
11499
<tr>
115100
<td>{% trans "Number of voltage swells in phase L3 (polyphase meters only)" %}</td>
116101
<td><span class="badge bg-olive">{{ meter_statistics.voltage_swell_count_l3|default:'-' }}</span></td>
117102
</tr>
118-
{% endif %}
119103
</table>
120104
</div>
121105
</div>

dsmrreader/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"""
1717
from django.utils.version import get_version
1818

19-
VERSION = (2, 4, 0, 'beta', 2)
19+
VERSION = (2, 4, 0, 'beta', 3)
2020

2121
__version__ = get_version(VERSION)

0 commit comments

Comments
 (0)