Skip to content

Commit 27c28cc

Browse files
dennissiemensmadennissiemensma
committed
Support for both single and high/low tariff #130 
1 parent 71e039b commit 27c28cc

File tree

4 files changed

+61
-135
lines changed

4 files changed

+61
-135
lines changed

‎dsmr_frontend/templates/dsmr_frontend/archive.html

-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
}).done(function(response) {
250250
$("#chart-loader").hide();
251251

252-
var data = response.data;
253252
var charts = response.charts;
254253

255254
if (charts.electricity)

‎dsmr_frontend/templates/dsmr_frontend/compare.html

+45-118
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,15 @@
156156
legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li style=\"display: inline; margin-right: 24px; font-weight: bold;\"><span style=\"color:<%=datasets[i].strokeColor%>\"><%if(datasets[i].label){%><%=datasets[i].label%><%}%></span></li><%}%></ul>"
157157
{% endverbatim %}
158158
}
159-
var g_electricity_chart_instance1 = undefined;
160-
var g_electricity_chart_instance2 = undefined;
161-
var g_electricity_returned_chart_instance1 = undefined;
162-
var g_electricity_returned_chart_instance2 = undefined;
163-
var g_gas_chart_instance1 = undefined;
164-
var g_gas_chart_instance2 = undefined;
159+
160+
var g_chart_instances = {
161+
electricity_1: undefined,
162+
electricity_2: undefined,
163+
electricity_returned_1: undefined,
164+
electricity_returned_2: undefined,
165+
gas_1: undefined,
166+
gas_2: undefined,
167+
}
165168

166169
var g_datepicker_view_mode = 'months';
167170

@@ -277,142 +280,66 @@
277280
'level': g_datepicker_view_mode
278281
},
279282
}).done(function(response) {
280-
var capabilities = response.capabilities;
281-
var data = response.data;
283+
var charts = response.charts;
282284

283-
if (capabilities.electricity)
285+
if (charts.electricity)
284286
{
285-
render_electricity_chart(
286-
data.x,
287-
data.electricity1,
288-
data.electricity2,
289-
id_postfix
287+
render_chart(
288+
'electricity_' + id_postfix,
289+
"#electricity-chart-holder",
290+
"#electricity-chart" + id_postfix,
291+
"#electricity-chart-legend" + id_postfix,
292+
charts.electricity
290293
);
291294
}
292295

293-
if (capabilities.electricity)
296+
if (charts.electricity_returned)
294297
{
295-
render_electricity_returned_chart(
296-
data.x,
297-
data.electricity1,
298-
data.electricity2,
299-
id_postfix
300-
);
298+
render_chart(
299+
'electricity_returned_' + id_postfix,
300+
"#electricity-returned-chart-holder",
301+
"#electricity-returned-chart" + id_postfix,
302+
"#electricity-returned-chart-legend" + id_postfix,
303+
charts.electricity_returned
304+
);
301305
}
302-
303-
if (capabilities.gas)
306+
307+
if (charts.gas)
304308
{
305-
render_gas_chart(
306-
data.x,
307-
data.gas,
308-
id_postfix
309+
render_chart(
310+
'gas_' + id_postfix,
311+
"#gas-chart-holder",
312+
"#gas-chart" + id_postfix,
313+
null,
314+
charts.gas
309315
);
310316
}
311317
});
312318
}
313319

314-
function render_electricity_chart(labels, electricity1, electricity2, id_postfix)
320+
function render_chart(global_instance_key, holder_id, chart_id, legend_id, chart_info)
315321
{
316322
var data = {
317-
labels: labels,
318-
datasets: [{
319-
data: electricity1,
320-
label: "{% trans 'Electricity 1 (low tariff)' %}",
321-
fillColor: "rgba({{frontend_settings.electricity_delivered_alternate_color|hex_to_rgb}},0.1)",
322-
strokeColor: "rgba({{frontend_settings.electricity_delivered_alternate_color|hex_to_rgb}},1)",
323-
pointColor: "rgba({{frontend_settings.electricity_delivered_alternate_color|hex_to_rgb}},1)",
324-
pointStrokeColor: "#fff",
325-
pointHighlightFill: "#fff",
326-
pointHighlightStroke: "rgba(255,0,0,1)"
327-
}, {
328-
data: electricity2,
329-
label: "{% trans 'Electricity 2 (high tariff)' %}",
330-
fillColor: "rgba({{frontend_settings.electricity_delivered_color|hex_to_rgb}},0.1)",
331-
strokeColor: "rgba({{frontend_settings.electricity_delivered_color|hex_to_rgb}},1)",
332-
pointColor: "rgba({{frontend_settings.electricity_delivered_color|hex_to_rgb}},1)",
333-
pointStrokeColor: "#fff",
334-
pointHighlightFill: "#fff",
335-
pointHighlightStroke: "rgba(255,0,0,1)"
336-
}]
323+
labels: chart_info.labels,
324+
datasets: chart_info.datasets
337325
};
338326

339-
if (window['g_electricity_chart_instance' + id_postfix])
327+
if (g_chart_instances[global_instance_key])
340328
{
341-
window['g_electricity_chart_instance' + id_postfix].destroy();
329+
g_chart_instances[global_instance_key].destroy();
342330
}
343331

344-
$("#electricity-chart-holder").show();
345-
346-
var ctx = $("#electricity-chart" + id_postfix).get(0).getContext("2d");
347-
ctx.canvas.height = $("#electricity-chart" + id_postfix).parent().height();
348-
window['g_electricity_chart_instance' + id_postfix] = new Chart(ctx).Line(data, line_options);
349-
$("#electricity-chart-legend" + id_postfix).html(window['g_electricity_chart_instance' + id_postfix].generateLegend());
350-
}
351-
352-
function render_electricity_returned_chart(labels, electricity1_returned, electricity2_returned, id_postfix)
353-
{
354-
var data = {
355-
labels: labels,
356-
datasets: [{
357-
data: electricity1_returned,
358-
label: "{% trans 'Electricity 1 returned (low tariff)' %}",
359-
fillColor: "rgba({{frontend_settings.electricity_returned_alternate_color|hex_to_rgb}},0.1)",
360-
strokeColor: "rgba({{frontend_settings.electricity_returned_alternate_color|hex_to_rgb}},1)",
361-
pointColor: "rgba({{frontend_settings.electricity_returned_alternate_color|hex_to_rgb}},1)",
362-
pointStrokeColor: "#fff",
363-
pointHighlightFill: "#fff",
364-
pointHighlightStroke: "rgba(200,200,100,1)"
365-
}, {
366-
data: electricity2_returned,
367-
label: "{% trans 'Electricity 1 returned (high tariff)' %}",
368-
fillColor: "rgba({{frontend_settings.electricity_returned_color|hex_to_rgb}},0.1)",
369-
strokeColor: "rgba({{frontend_settings.electricity_returned_color|hex_to_rgb}},1)",
370-
pointColor: "rgba({{frontend_settings.electricity_returned_color|hex_to_rgb}},1)",
371-
pointStrokeColor: "#fff",
372-
pointHighlightFill: "#fff",
373-
pointHighlightStroke: "rgba(39,194,76,1)"
374-
}]
375-
};
376-
377-
if (window['g_electricity_returned_chart_instance' + id_postfix])
378-
{
379-
window['g_electricity_returned_chart_instance' + id_postfix].destroy();
380-
}
381-
382-
$("#electricity-returned-chart-holder").show();
332+
$(holder_id).show();
383333

384-
var ctx = $("#electricity-returned-chart" + id_postfix).get(0).getContext("2d");
385-
ctx.canvas.height = $("#electricity-returned-chart" + id_postfix).parent().height();
386-
window['g_electricity_returned_chart_instance' + id_postfix] = new Chart(ctx).Line(data, line_options);
387-
$("#electricity-returned-chart-legend" + id_postfix).html(window['g_electricity_returned_chart_instance' + id_postfix].generateLegend());
388-
}
389-
390-
function render_gas_chart(labels, gas, id_postfix)
391-
{
392-
var data = {
393-
labels: labels,
394-
datasets: [{
395-
data: gas,
396-
label: "{% trans 'Gas' %}",
397-
fillColor: "rgba({{frontend_settings.gas_delivered_color|hex_to_rgb}},0.1)",
398-
strokeColor: "rgba({{frontend_settings.gas_delivered_color|hex_to_rgb}},1)",
399-
pointColor: "rgba({{frontend_settings.gas_delivered_color|hex_to_rgb}},1)",
400-
pointStrokeColor: "#fff",
401-
pointHighlightFill: "#fff",
402-
pointHighlightStroke: "rgba(150,150,150,1)"
403-
}]
404-
};
334+
var ctx = $(chart_id).get(0).getContext("2d");
335+
ctx.canvas.height = $(chart_id).parent().height();
336+
g_chart_instances[global_instance_key] = new Chart(ctx).Line(data, line_options);
405337

406-
if (window['g_gas_chart_instance' + id_postfix])
338+
if (legend_id)
407339
{
408-
window['g_gas_chart_instance' + id_postfix].destroy();
340+
$(legend_id).html(g_chart_instances[global_instance_key].generateLegend());
409341
}
410-
411-
$("#gas-chart-holder").show();
412-
413-
var ctx = $("#gas-chart" + id_postfix).show().get(0).getContext("2d");
414-
ctx.canvas.height = $("#gas-chart" + id_postfix).parent().height();
415-
window['g_gas_chart_instance' + id_postfix] = new Chart(ctx).Line(data, line_options);
416342
}
343+
417344
</script>
418345
{% endblock %}

‎dsmrreader/locales/nl/LC_MESSAGES/django.mo

-96 Bytes
Binary file not shown.

‎dsmrreader/locales/nl/LC_MESSAGES/django.po

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DSMR Reader\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2016-11-19 03:16+0100\n"
10+
"POT-Creation-Date: 2016-11-19 03:28+0100\n"
1111
"PO-Revision-Date: 2016-11-19 03:08+0100\n"
1212
"Last-Translator: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
1313
"Language-Team: Dennis Siemensma <dsmr@dennissiemensma.nl>\n"
@@ -444,21 +444,6 @@ msgstr "Basisselectie"
444444
msgid "Compare with selection"
445445
msgstr "Te vergelijken selectie"
446446

447-
msgid "Electricity 1 (low tariff)"
448-
msgstr "Elektriciteit 1 (daltarief)"
449-
450-
msgid "Electricity 2 (high tariff)"
451-
msgstr "Elektriciteit 2 (piektarief)"
452-
453-
msgid "Electricity 1 returned (low tariff)"
454-
msgstr "Elektriciteit 1 teruggeleverd (daltarief)"
455-
456-
msgid "Electricity 1 returned (high tariff)"
457-
msgstr "Elektriciteit 2 teruggeleverd (piektarief)"
458-
459-
msgid "Gas"
460-
msgstr "Gas"
461-
462447
msgid "View all settings"
463448
msgstr "Bekijk alle instellingen"
464449

@@ -507,6 +492,15 @@ msgstr "Teruggeleverd"
507492
msgid "Cost"
508493
msgstr "Kosten"
509494

495+
msgid "Electricity 1 (low tariff)"
496+
msgstr "Elektriciteit 1 (daltarief)"
497+
498+
msgid "Electricity 2 (high tariff)"
499+
msgstr "Elektriciteit 2 (piektarief)"
500+
501+
msgid "Gas"
502+
msgstr "Gas"
503+
510504
msgid "Total"
511505
msgstr "Totaal"
512506

@@ -739,6 +733,9 @@ msgstr "Elektriciteitsverbruik piek- en daltarief (afgelopen maand)"
739733
msgid "Electricity returned (single tariff)"
740734
msgstr "Elektriciteit teruggeleverd (enkel tarief)"
741735

736+
msgid "Electricity 1 returned (low tariff)"
737+
msgstr "Elektriciteit 1 teruggeleverd (daltarief)"
738+
742739
msgid "Electricity 2 returned (high tariff)"
743740
msgstr "Elektriciteit 2 teruggeleverd (piektarief)"
744741

@@ -985,5 +982,8 @@ msgstr "Nederlands"
985982
msgid "English"
986983
msgstr "Engels"
987984

985+
#~ msgid "Electricity 1 returned (high tariff)"
986+
#~ msgstr "Elektriciteit 2 teruggeleverd (piektarief)"
987+
988988
#~ msgid "Test"
989989
#~ msgstr "Banaaa"

0 commit comments

Comments
 (0)