Layout voor mobiele/kleine schermen verbeteren #901

dsmrreader · Feb 27, 2020 · 84055f2 · 84055f2
1 parent b5133e2
commit 84055f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/dsmr_frontend/templates/dsmr_frontend/statistics.html b/dsmr_frontend/templates/dsmr_frontend/statistics.html
@@ -156,7 +156,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_usage_l1_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_usage_l1_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_usage_l1_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -168,7 +168,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_usage_l2_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_usage_l2_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_usage_l2_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -180,7 +180,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_usage_l3_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_usage_l3_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_usage_l3_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -193,7 +193,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.lowest_usage_l1_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.lowest_usage_l1_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.lowest_usage_l1_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                                 <br>
                         </tr>
@@ -206,7 +206,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.lowest_usage_l2_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.lowest_usage_l2_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.lowest_usage_l2_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -218,7 +218,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.lowest_usage_l3_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.lowest_usage_l3_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.lowest_usage_l3_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -231,7 +231,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_return_l1_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_return_l1_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_return_l1_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -243,7 +243,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_return_l2_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_return_l2_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_return_l2_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}
@@ -255,7 +255,7 @@
                                    <i class="fas fa-bolt"></i> {{ electricity_statistics.highest_return_l3_value }} {% trans "Watt" %}
                                 </span>
                                 <br>
-                                <span class="unit">{{ electricity_statistics.highest_return_l3_timestamp }}</span>
+                                <span class="unit">{{ electricity_statistics.highest_return_l3_timestamp|date:'DSMR_STATISTICS_DATETIME_FORMAT' }}</span>
                             </td>
                         </tr>
                         {% endif %}

diff --git a/dsmrreader/formats/en/formats.py b/dsmrreader/formats/en/formats.py
@@ -10,5 +10,6 @@
 DSMR_DATEPICKER_MONTH = 'F Y'
 
 DSMR_EXPORT_DATETIME_FORMAT = 'Y-m-d H:i:s'
+DSMR_STATISTICS_DATETIME_FORMAT = 'l F jS Y \\a\\t g:i a'
 
 DJANGO_DATE_FORMAT = 'Y-m-d'
diff --git a/dsmrreader/formats/nl/formats.py b/dsmrreader/formats/nl/formats.py
@@ -10,5 +10,6 @@
 DSMR_DATEPICKER_MONTH = 'F Y'
 
 DSMR_EXPORT_DATETIME_FORMAT = 'd-m-Y H:i:s'
+DSMR_STATISTICS_DATETIME_FORMAT = 'l j F Y \o\m G:i'
 
 DJANGO_DATE_FORMAT = 'd-m-Y'