Layout verbeteren #912

Author: dennissiemensma

dsmr_frontend/templates/dsmr_frontend/dashboard.html

@@ -94,18 +94,23 @@
     <br>
     {% endif %}
 
-    {% if month_statistics and capabilities.any %}
+    {% if capabilities.any %}
     <div class="row consumption-block">
         <div class="col-sm-12">
             <div class="panel">
                 <header class="panel-heading">
+                    {% if month_statistics.electricity_merged or month_statistics.gas %}
                     {% trans "Current month" %} <small>({% trans "until yesterday" %})</small>
+                    {% else %}
+                    {% trans "Current month" %}
+                    {% endif %}
 
                     <div class="pull-right">
                         <a class="btn btn-sm btn-primary" href="{% url 'frontend:archive' %}"><i class="fas fa-chart-line"></i></a>
                     </div>
                 </header>
                 <div class="panel-body">
+                    {% if month_statistics.electricity_merged or month_statistics.gas %}
                     <table class="table table-hover">
                         <tr>
                             <th class="col-sm-6"></th>
@@ -149,6 +154,9 @@
                             <td><span class="badge bg-black">{{ month_statistics.total_cost|default:'-' }}</span></td>
                         </tr>
                     </table>
+                    {% else %}
+                        <div class="graph_controls_help">{% blocktrans %}The totals for the current month are currently not (yet) available. Check again tomorrow.{% endblocktrans %}</div>
+                    {% endif %}
                 </div>
             </div>
         </div>

dsmr_frontend/views/dashboard.py

@@ -30,8 +30,8 @@ def get_context_data(self, **kwargs):
         context_data['consumption'] = dsmr_consumption.services.day_consumption(
             day=timezone.localtime(latest_electricity.read_at).date()
         )
-
-        today = timezone.localtime(timezone.now()).date()
-        context_data['month_statistics'] = dsmr_stats.services.month_statistics(target_date=today)
+        context_data['month_statistics'] = dsmr_stats.services.month_statistics(
+            target_date=timezone.localtime(timezone.now()).date()
+        )
 
         return context_data

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -1189,6 +1189,9 @@ msgstr "Huidige maand"
 msgid "until yesterday"
 msgstr "tot en met gisteren"
 
+msgid "The totals for the current month are currently not (yet) available. Check again tomorrow."
+msgstr "De totalen voor de huidige maand zijn momenteel (nog) niet beschikbaar. Probeer het morgen nogmaals."
+
 msgid "/hour"
 msgstr "/uur"