Allow bar graphs vs line graphs #111

Author: dennissiemensma

dsmr_frontend/templates/dsmr_frontend/archive.html

@@ -269,7 +269,7 @@
                     datasets: [{
                         data: electricity1,
                         label: "{% trans 'Electricity 1 (low tariff)' %}",                        
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(160,0,0,0.1)",
                         strokeColor: "rgba(160,0,0,1)",
                         pointColor: "rgba(160,0,0,1)",
                         pointStrokeColor: "#fff",
@@ -278,7 +278,7 @@
                     }, {
                         data: electricity2,
                         label: "{% trans 'Electricity 2 (high tariff)' %}",                        
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(255,0,0,0.1)",
                         strokeColor: "rgba(255,0,0,1)",
                         pointColor: "rgba(255,0,0,1)",
                         pointStrokeColor: "#fff",
@@ -306,7 +306,7 @@
                     datasets: [{
                         data: electricity1_returned,
                         label: "{% trans 'Electricity 1 returned (low tariff)' %}",                       
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(200,200,100,0.1)",
                         strokeColor: "rgba(200,200,100,1)",
                         pointColor: "rgba(200,200,100,1)",
                         pointStrokeColor: "#fff",
@@ -315,7 +315,7 @@
                     }, {
                         data: electricity2_returned,
                         label: "{% trans 'Electricity 1 returned (high tariff)' %}",                       
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(39,194,76,0.1)",
                         strokeColor: "rgba(39,194,76,1)",
                         pointColor: "rgba(39,194,76,1)",
                         pointStrokeColor: "#fff",
@@ -343,7 +343,7 @@
                     datasets: [{
                         data: gas,
                         label: "{% trans 'Gas' %}",                       
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(250,133,0,0.1)",
                         strokeColor: "rgba(250,133,0,1)",
                         pointColor: "rgba(250,133,0,1)",
                         pointStrokeColor: "#fff",

dsmr_frontend/templates/dsmr_frontend/dashboard.html

@@ -106,6 +106,12 @@
             <div class="panel">
                 <header class="panel-heading">
                     {{ consumption.day }}
+                    
+                    <small class="pull-right">
+                        <a href="{% url 'admin:dsmr_stats_note_add' %}?day={% now 'd-m-Y' %}">
+                            <span class="badge bg-green"><i class="fa fa-plus"></i> &nbsp; {% trans "Add note for today" %}</span>
+                        </a>
+                    </small>
                 </header>
                 <div class="panel-body">
                     <table class="table table-condensed">
@@ -254,7 +260,7 @@
                     datasets: [{
                         data: {{ electricity_y|safe }},
                         label: "{% trans 'Electricity' %}",                     
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(255,0,0,0.1)",
                         strokeColor: "rgba(255,0,0,1)",
                         pointColor: "rgba(255,0,0,1)",
                         pointStrokeColor: "#fff",
@@ -277,7 +283,7 @@
                      datasets: [{
                          data: {{ electricity_returned_y|safe }},
                          label: "{% trans 'Electricity returned' %}",                     
-                         fillColor: "rgba(255,255,255,0.2)",
+                         fillColor: "rgba(0,255,0,0.1)",
                          strokeColor: "rgba(39,194,76,1)",
                          pointColor: "rgba(39,194,76,1)",
                          pointStrokeColor: "#fff",
@@ -300,7 +306,7 @@
                     datasets: [{
                         data: {{ gas_y|safe }},
                         label: "{% trans 'Gas' %}",                     
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(250,133,0,0.1)",
                         strokeColor: "rgba(250,133,0,1)",
                         pointColor: "rgba(250,133,0,1)",
                         pointStrokeColor: "#fff",
@@ -323,7 +329,7 @@
                     datasets: [{
                         data: {{ temperature_y|safe }},
                         label: "{% trans 'Temperature' %}",                       
-                        fillColor: "rgba(255,255,255,0.2)",
+                        fillColor: "rgba(35,183,229,0.1)",
                         strokeColor: "rgba(35,183,229,1)",
                         pointColor: "rgba(35,183,229,1)",
                         pointStrokeColor: "#fff",

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

@@ -5,6 +5,14 @@
 <div class="panel">
     <header class="panel-heading">
         {{ title|unlocalize }}
+        
+        {% if selected_level == 'days' %}
+        <small class="pull-right">
+            <a href="{% url 'admin:dsmr_stats_note_add' %}?day={{ selected_datetime|date:django_date_format }}">
+                <span class="badge bg-green"><i class="fa fa-plus"></i> &nbsp; {% trans "Add note for this date" %}</span>
+            </a>
+        </small>
+        {% endif %}
     </header>
     <div class="panel-body">
         <table class="table table-condensed">

dsmr_frontend/views/archive.py

@@ -72,6 +72,9 @@ def get_context_data(self, **kwargs):
 
             context_data['notes'] = Note.objects.filter(day=selected_datetime.date())
 
+        context_data['selected_level'] = selected_level
+        context_data['selected_datetime'] = selected_datetime
+        context_data['django_date_format'] = 'DJANGO_DATE_FORMAT'
         return context_data
 
 

dsmr_stats/admin.py

@@ -11,3 +11,12 @@ class NoteAdmin(admin.ModelAdmin):
     formfield_overrides = {
         models.CharField: {'widget': widgets.Textarea},
     }
+
+    def get_form(self, request, obj=None, **kwargs):
+        form = super(NoteAdmin, self).get_form(request, obj, **kwargs)
+        day = request.GET.get('day')
+
+        if day:
+            form.base_fields['day'].initial = day
+
+        return form

dsmrreader/formats/en/formats.py

@@ -7,3 +7,5 @@
 DSMR_DATEPICKER_LOCALE_FORMAT = 'mm/dd/yyyy'
 DSMR_DATEPICKER_DATE_FORMAT = 'm/d/Y'
 DSMR_DATEPICKER_MONTH = 'F Y'
+
+DJANGO_DATE_FORMAT = 'Y-m-d'

dsmrreader/formats/nl/formats.py

@@ -7,3 +7,5 @@
 DSMR_DATEPICKER_LOCALE_FORMAT = 'dd-mm-yyyy'
 DSMR_DATEPICKER_DATE_FORMAT = 'd-m-Y'
 DSMR_DATEPICKER_MONTH = 'F Y'
+
+DJANGO_DATE_FORMAT = 'd-m-Y'

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -381,6 +381,9 @@ msgstr "Kosten"
 msgid "Total"
 msgstr "Totaal"
 
+msgid "Add note for today"
+msgstr "Voeg notitie toe voor vandaag"
+
 msgid "Recent electricity consumed (watt)"
 msgstr "Recent elektriciteitsverbruik (Watt)"
 
@@ -399,6 +402,9 @@ msgstr "Elektriciteit"
 msgid "Temperature"
 msgstr "Temperatuur"
 
+msgid "Add note for this date"
+msgstr "Voeg notitie toe voor deze datum"
+
 msgid "Deploy"
 msgstr "Uitrollen"