Skip to content

Commit d29abc0

Browse files
dennissiemensmadennissiemensma
committed
Minor GUI adjustments
1 parent a884843 commit d29abc0

File tree

5 files changed

+35
-28
lines changed

5 files changed

+35
-28
lines changed

‎dsmr_frontend/static/dsmr_frontend/css/dsmr-reader/global.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
display: none;
33
}
44

5+
.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
6+
border-top: 1px solid #eee;
7+
}
8+
59
.fa-rotate-45 {
610
-webkit-transform: rotate(45deg);
711
-moz-transform: rotate(45deg);

‎dsmr_frontend/templates/dsmr_frontend/fragments/archive-xhr-statistics.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<td colspan="4">&nbsp;</td>
7575
</tr>
7676
<tr>
77-
<td> {% translate "Temp." %} <span class="unit">°C</span></td>
77+
<td> {% translate "°C" %}</td>
7878
<td>{% if statistics.temperature_min %}<span class="badge bg-blue">{{ statistics.temperature_min|floatformat|default:'-' }}</span> <span class="unit">{% translate "Min" %}</span>{% endif %}</td>
7979
<td>{% if statistics.temperature_max %}<span class="badge bg-blue">{{ statistics.temperature_max|floatformat|default:'-' }}</span> <span class="unit">{% translate "Max" %}</span>{% endif %}</td>
8080
<td>{% if statistics.temperature_avg %}<span class="badge bg-blue">{{ statistics.temperature_avg|floatformat|default:'-' }}</span> <span class="unit">{% translate "Avg" %}</span>{% endif %}</td>

‎dsmr_frontend/templates/dsmr_frontend/fragments/compare-xhr-statistics.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<tr>
1010
<th class="col-sm-3"></th>
1111
<th class="col-sm-3">
12-
{{ base_title|unlocalize }}
12+
{{ base_title|unlocalize|capfirst }}
1313

1414
{% if data_count.base != data_count.comparison %}
1515
<br>
@@ -19,7 +19,7 @@
1919
{% endif %}
2020
</th>
2121
<th class="col-sm-3">
22-
{{ comparison_title|unlocalize }}
22+
{{ comparison_title|unlocalize|capfirst }}
2323

2424
{% if data_count.base != data_count.comparison %}
2525
<br>
@@ -44,8 +44,8 @@
4444
{% if capabilities.electricity and frontend_settings.merge_electricity_tariffs %}
4545
<tr>
4646
<td>{% translate "Electricity (single tariff)" %} <span class="unit">{% translate "kWh" %}</span></td>
47-
<td>{{ base.electricity_merged|default:'-' }}</td>
48-
<td>{{ comparison.electricity_merged|default:'-' }}</td>
47+
<td>{% if base.electricity_merged %}<span class="badge bg-red">{{ base.electricity_merged|default:'-' }}</span>{% endif %}</td>
48+
<td>{% if comparison.electricity_merged %}<span class="badge bg-red">{{ comparison.electricity_merged|default:'-' }}</span>{% endif %}</td>
4949
<td>
5050
{% if not diff.electricity_merged|intdiv:1 %}
5151
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -61,8 +61,8 @@
6161
{% if capabilities.electricity_returned and frontend_settings.merge_electricity_tariffs %}
6262
<tr>
6363
<td>{% translate "Electricity returned (single tariff)" %} <span class="unit">{% translate "kWh" %}</span></td>
64-
<td>{{ base.electricity_returned_merged|default:'-' }}</td>
65-
<td>{{ comparison.electricity_returned_merged|default:'-' }}</td>
64+
<td>{% if base.electricity_returned_merged %}<span class="badge bg-green">{{ base.electricity_returned_merged|default:'-' }}</span>{% endif %}</td>
65+
<td>{% if comparison.electricity_returned_merged %}<span class="badge bg-green">{{ comparison.electricity_returned_merged|default:'-' }}</span>{% endif %}</td>
6666
<td>
6767
{% if not diff.electricity_returned_merged|intdiv:1 %}
6868
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -78,8 +78,8 @@
7878
{% if capabilities.electricity and not frontend_settings.merge_electricity_tariffs %}
7979
<tr>
8080
<td>{{ frontend_settings.tariff_1_delivered_name|capfirst }} <span class="unit">{% translate "kWh" %}</span></td>
81-
<td><span class="badge bg-red">{{ base.electricity1|default:'-' }}</span></td>
82-
<td><span class="badge bg-red">{{ comparison.electricity1|default:'-' }}</span></td>
81+
<td>{% if base.electricity1 %}<span class="badge bg-red">{{ base.electricity1|default:'-' }}</span{% endif %}></td>
82+
<td>{% if comparison.electricity1 %}<span class="badge bg-red">{{ comparison.electricity1|default:'-' }}</span>{% endif %}</td>
8383
<td>
8484
{% if not diff.electricity1|intdiv:1 %}
8585
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -92,8 +92,8 @@
9292
</tr>
9393
<tr>
9494
<td>{{ frontend_settings.tariff_2_delivered_name|capfirst }} <span class="unit">{% translate "kWh" %}</span></td>
95-
<td><span class="badge bg-red">{{ base.electricity2|default:'-' }}</span></td>
96-
<td><span class="badge bg-red">{{ comparison.electricity2|default:'-' }}</span></td>
95+
<td>{% if base.electricity2 %}<span class="badge bg-red">{{ base.electricity2|default:'-' }}</span>{% endif %}</td>
96+
<td>{% if comparison.electricity2 %}<span class="badge bg-red">{{ comparison.electricity2|default:'-' }}</span>{% endif %}</td>
9797
<td>
9898
{% if not diff.electricity2|intdiv:1 %}
9999
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -109,8 +109,8 @@
109109
{% if capabilities.electricity_returned and not frontend_settings.merge_electricity_tariffs %}
110110
<tr>
111111
<td>{{ frontend_settings.tariff_1_returned_name|capfirst }} <span class="unit">{% translate "kWh" %}</span></td>
112-
<td><span class="badge bg-green">{{ base.electricity1_returned|default:'-' }}</span></td>
113-
<td><span class="badge bg-green">{{ comparison.electricity1_returned|default:'-' }}</span></td>
112+
<td>{% if base.electricity1_returned %}<span class="badge bg-green">{{ base.electricity1_returned|default:'-' }}</span>{% endif %}</td>
113+
<td>{% if comparison.electricity1_returned %}<span class="badge bg-green">{{ comparison.electricity1_returned|default:'-' }}</span>{% endif %}</td>
114114
<td>
115115
{% if not diff.electricity1_returned|intdiv:1 %}
116116
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -123,8 +123,8 @@
123123
</tr>
124124
<tr>
125125
<td>{{ frontend_settings.tariff_2_returned_name|capfirst }} <span class="unit">{% translate "kWh" %}</span></td>
126-
<td><span class="badge bg-green">{{ base.electricity2_returned|default:'-' }}</span></td>
127-
<td><span class="badge bg-green">{{ comparison.electricity2_returned|default:'-' }}</span></td>
126+
<td>{% if base.electricity2_returned %}<span class="badge bg-green">{{ base.electricity2_returned|default:'-' }}</span>{% endif %}</td>
127+
<td>{% if comparison.electricity2_returned %}<span class="badge bg-green">{{ comparison.electricity2_returned|default:'-' }}</span>{% endif %}</td>
128128
<td>
129129
{% if not diff.electricity2_returned|intdiv:1 %}
130130
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>
@@ -140,8 +140,8 @@
140140
{% if capabilities.gas %}
141141
<tr>
142142
<td>{% translate "Gas" %} <span class="unit">{% translate "m³" %}</span></td>
143-
<td><span class="badge bg-orange">{{ base.gas|default:'-' }}</span></td>
144-
<td><span class="badge bg-orange">{{ comparison.gas|default:'-' }}</span></td>
143+
<td>{% if base.gas %}<span class="badge bg-orange">{{ base.gas|default:'-' }}</span>{% endif %}</td>
144+
<td>{% if comparison.gas %}<span class="badge bg-orange">{{ comparison.gas|default:'-' }}</span>{% endif %}</td>
145145
<td>
146146
{% if not diff.gas|intdiv:1 %}
147147
<i class="fas fa-compress-alt"></i> &nbsp; ~ <span class="unit">%</span>

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

9 Bytes
Binary file not shown.

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ msgid "Tariff names"
808808
msgstr "Tariefnaamgeving"
809809

810810
msgid "Electricity delivered"
811-
msgstr "Elektriciteitsverbruik"
811+
msgstr "Elektriciteit verbruikt"
812812

813813
msgid "Electricity returned"
814814
msgstr "Elektriciteit teruggeleverd"
@@ -919,13 +919,13 @@ msgid "Whether you are using a single electricity tariff and both (high/low) sho
919919
msgstr "Bepaalt of de elektriciteitstarieven samengevoegd moeten worden (wanneer je voor een enkel tarief betaalt)"
920920

921921
msgid "Electricity delivered color"
922-
msgstr "Kleur elektriciteitsverbruik"
922+
msgstr "Kleur elektriciteit verbruikt"
923923

924924
msgid "Graph color for electricity delivered (default, tariff 2)"
925925
msgstr "Grafiekkleur voor elektriciteitsverbruik (standaard, tarief 2)"
926926

927927
msgid "Electricity delivered color (alternative)"
928-
msgstr "Kleur elektriciteitsverbruik (alternatief)"
928+
msgstr "Kleur elektriciteit verbruikt (alternatief)"
929929

930930
msgid "Graph color for electricity delivered (tariff 1)"
931931
msgstr "Grafiekkleur voor elektriciteitsverbruik (tarief 1)"
@@ -1153,10 +1153,10 @@ msgid "Loading..."
11531153
msgstr "Bezig met laden..."
11541154

11551155
msgid "Electricity consumed"
1156-
msgstr "Elektriciteitsverbruik"
1156+
msgstr "Elektriciteit verbruikt"
11571157

11581158
msgid "Gas consumed"
1159-
msgstr "Gasverbruik"
1159+
msgstr "Gas verbruikt"
11601160

11611161
msgid "Electricity (single tariff)"
11621162
msgstr "Elektriciteit (enkel tarief)"
@@ -1514,8 +1514,8 @@ msgstr "Voeg notitie toe voor deze datum"
15141514
msgid "Total"
15151515
msgstr "Totaal"
15161516

1517-
msgid "Temp."
1518-
msgstr "Temp."
1517+
msgid "°C"
1518+
msgstr "°C"
15191519

15201520
msgid "Min"
15211521
msgstr "Min"
@@ -1572,22 +1572,22 @@ msgid "Delivered"
15721572
msgstr "Verbruikt"
15731573

15741574
msgid "Recent electricity usage"
1575-
msgstr "Recent gebruik elektriciteit"
1575+
msgstr "Recent elektriciteitsvermogen"
15761576

15771577
msgid "in Watt"
15781578
msgstr "in Watt"
15791579

15801580
msgid "Recent phases usage"
1581-
msgstr "Recente gebruik fasen"
1581+
msgstr "Recent (fase)vermogen"
15821582

15831583
msgid "Recent phase voltages"
1584-
msgstr "Recente voltages fasen"
1584+
msgstr "Recente (fase)spanning"
15851585

15861586
msgid "in Volt"
15871587
msgstr "in Volt"
15881588

15891589
msgid "Recent phase currents"
1590-
msgstr "Recente stroomsterktes"
1590+
msgstr "Recente (fase)stroomsterktes"
15911591

15921592
msgid "in Ampere"
15931593
msgstr "in Ampère"
@@ -2617,6 +2617,9 @@ msgstr "Nederlands"
26172617
msgid "English"
26182618
msgstr "Engels"
26192619

2620+
#~ msgid "Temp."
2621+
#~ msgstr "Temp."
2622+
26202623
#~ msgid "Hourly"
26212624
#~ msgstr "Per uur"
26222625

0 commit comments

Comments
 (0)