Skip to content

Commit 1e94c62

Browse files
Live weergave en live teller wijken af #1034
1 parent ac1fc6b commit 1e94c62

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ v3.12.0 - 2020-07-10
1414

1515
- [`#1036 <https://github.com/dennissiemensma/dsmr-reader/issues/1036>`_] Deprecate API support for Status
1616
- [`#1037 <https://github.com/dennissiemensma/dsmr-reader/issues/1037>`_] Laatste v3.x release
17+
- [`#1034 <https://github.com/dennissiemensma/dsmr-reader/issues/1034>`_] Live weergave en live teller wijken af
1718

1819

1920
----

dsmr_frontend/templates/dsmr_frontend/dashboard.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@
4646
<tr class="live-header">
4747
<th class="col-sm-6">
4848
<span id="latest_timestamp"><i class="fas fa-circle-notch fa-spin fa-fw"></i></span> <span class="unit" id="tariff_name"></span>
49+
50+
<span>
51+
<a class="help-trigger" href="#"><small><i class="fas fa-question-circle"></i></small></a>
52+
<small class="xhr-hidden">
53+
{% blocktrans %}Based on the latest telegram received, no matter if it's still unprocessed.{% endblocktrans %}
54+
</small>
55+
</span>
4956
</th>
5057
<th class="col-sm-2">
5158
{% if capabilities.electricity %}
@@ -187,6 +194,12 @@
187194

188195
<script type="text/javascript" src="{% static 'dsmr_frontend/js/dsmr-reader/consumption-header.js' %}?r=v{{ dsmr_version }}"></script>
189196
<script type="text/javascript">
197+
$(".help-trigger").click(function () {
198+
$(this).next().show();
199+
$(this).remove();
200+
return false;
201+
});
202+
190203
var xhr_consumption_header_url = "{% url 'frontend:xhr-consumption-header' %}";
191204

192205
$(document).ready(function(){

dsmr_frontend/templates/dsmr_frontend/live-graphs.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
<tr class="live-header">
2929
<th class="col-sm-6">
3030
<span id="latest_timestamp"><i class="fas fa-circle-notch fa-spin fa-fw"></i></span> <span class="unit" id="tariff_name"></span>
31+
32+
<span>
33+
<a class="help-trigger" href="#"><small><i class="fas fa-question-circle"></i></small></a>
34+
<small class="xhr-hidden">
35+
{% blocktrans %}Based on the latest electricity consumption processed.{% endblocktrans %}
36+
</small>
37+
</span>
3138
</th>
3239
<th class="col-sm-2">
3340
{% if capabilities.electricity %}
@@ -236,6 +243,12 @@
236243
/* Reload entire page after 15 minutes. */
237244
setInterval(function(){ location.reload(); }, 15 * 60 * 1000)
238245
});
246+
247+
$(".help-trigger").click(function () {
248+
$(this).next().show();
249+
$(this).remove();
250+
return false;
251+
});
239252
</script>
240253

241254
{% endblock %}

0 commit comments

Comments
 (0)