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

@@ -260,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",
@@ -283,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",
@@ -306,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",
@@ -329,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",