From 042dc423b3a2b652c0248d4be07ca2b8527bd9b9 Mon Sep 17 00:00:00 2001
From: wez3 <wez3@users.noreply.github.com>
Date: Sun, 8 Jan 2017 16:30:38 +0100
Subject: [PATCH] Bar charts to use device name from config, issue #50

---
 static/js/domoboard.js    |  7 ++++++-
 templates/bar_charts.html | 28 +++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/static/js/domoboard.js b/static/js/domoboard.js
index 6fec00a..804da71 100644
--- a/static/js/domoboard.js
+++ b/static/js/domoboard.js
@@ -181,10 +181,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);
   });
 }
diff --git a/templates/bar_charts.html b/templates/bar_charts.html
index 1b2da23..b01d4f3 100644
--- a/templates/bar_charts.html
+++ b/templates/bar_charts.html
@@ -15,22 +15,28 @@
 </div>
 <script type="text/javascript" charset="utf-8">
 
-var bar_chart_block_{{count}} = Morris.Bar({
-  element: 'morris-bar-chart-{{count}}',
-  data: [],
-  xkey: 'y',
-  ykeys: ['a'],
-  labels: ['y'],
-  smooth: true,
-  resize: true
-});
+
 
 $(document).ready(function() {
   var barChartElements=[];
+  var barChartElementsNames=[];
+
   {% for k, v in blockArray[count]["bar_charts"].iteritems() %}
   barChartElements.push("{{v[0]}}");
+  barChartElementsNames.push("{{k}}");
   {% endfor %}
-  redrawBarChart(barChartElements, bar_chart_block_{{count}});
-  setInterval(redrawBarChart,9000,barChartElements,bar_chart_block_{{count}});
+  console.log(barChartElementsNames);
+  var bar_chart_block_{{count}} = Morris.Bar({
+    element: 'morris-bar-chart-{{count}}',
+    data: [],
+    xkey: 'l',
+    ykeys: ['a'],
+    labels: ['y'],
+    smooth: true,
+    resize: true
+  });
+
+  redrawBarChart(barChartElements, bar_chart_block_{{count}}, barChartElementsNames);
+  setInterval(redrawBarChart,9000,barChartElements,bar_chart_block_{{count}}, barChartElementsNames);
 });
 </script>