Merge branch 'develop' of https://github.com/wez3/domoboard into develop

static/css/custom.css

@@ -39,7 +39,7 @@ body.nav-sm .main_container .top_nav {
 }
 
 body.nav-sm .nav.side-menu li a {
-    text-align: left !important;
+    text-align: center !important;
     font-weight: 400;
     font-size: 13px;
     padding: 10px 5px;

static/js/domoboard.js

@@ -200,10 +200,15 @@ function redrawLineChart(sensor, idx, range, block) {
   });
 }
 
-function redrawBarChart(idxs, block) {
+function redrawBarChart(idxs, block, barChartElementsNames) {
   var url = "/api?custom=bar_chart&idxs=" + idxs.join();
+  var i = 0;
   requestAPI(url, function(d){
 	  var data = JSON.parse(d);
+    for (var key in data) {
+      data[key]["l"] = barChartElementsNames[i];
+      i++;
+    }
   block.setData(data);
   });
 }

templates/bar_charts.html

@@ -15,22 +15,27 @@
 </div>
 <script type="text/javascript" charset="utf-8">
 
-var bar_chart_block_{{count}} = Morris.Bar({
+
+
+$(document).ready(function() {
+  var barChartElements=[];
+  var barChartElementsNames=[];
+
+  {% for k, v in blockArray[count]["bar_charts"].iteritems() %}
+  barChartElements.push("{{v[0]}}");
+  barChartElementsNames.push("{{k}}");
+  {% endfor %}
+  var bar_chart_block_{{count}} = Morris.Bar({
     element: 'morris-bar-chart-{{count}}',
     data: [],
-  xkey: 'y',
+    xkey: 'l',
     ykeys: ['a'],
     labels: ['y'],
     smooth: true,
     resize: true
-});
+  });
 
-$(document).ready(function() {
+  redrawBarChart(barChartElements, bar_chart_block_{{count}}, barChartElementsNames);
-  var barChartElements=[];
+  setInterval(redrawBarChart,9000,barChartElements,bar_chart_block_{{count}}, barChartElementsNames);
-  {% for k, v in blockArray[count]["bar_charts"].iteritems() %}
-  barChartElements.push("{{v[0]}}");
-  {% endfor %}
-  redrawBarChart(barChartElements, bar_chart_block_{{count}});
-  setInterval(redrawBarChart,9000,barChartElements,bar_chart_block_{{count}});
 });
 </script>