From d04f8a22b7b3a586eb64d9c1315ea6982727d34d Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Mon, 6 Jul 2015 13:18:39 +0530
Subject: [PATCH] Filter analytics according to device types

---
 .../iotserver/units/analytics/analytics.hbs   | 72 +++++++++++--------
 .../units/analytics/public/js/graph_util.js   | 42 +++++++++--
 2 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs
index 52feb7ae..557d1a9c 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs
@@ -36,53 +36,65 @@
                 </div>
             </div>
             <div class="clear"></div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Temperature</h2>
+            <div id="div-temperatureData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Temperature</h2>
+                        <hr>
+                        <div id="canvas-wrapper1">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper1">No data available...</div>
                 </div>
-                <hr>
             </div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Light</h2>
+            <div id="div-lightData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Light</h2>
+                        <hr>
+                        <div id="canvas-wrapper2">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper2">No data available...</div>
                 </div>
-                <hr>
             </div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Motion</h2>
+            <div id="div-motionData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Motion</h2>
+                        <hr>
+                        <div id="canvas-wrapper3">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper3">No data available...</div>
                 </div>
-                <hr>
             </div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Sonar</h2>
+            <div id="div-sonarData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Sonar</h2>
+                        <hr>
+                        <div id="canvas-wrapper4">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper4">No data available...</div>
                 </div>
-                <hr>
             </div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Fan Status</h2>
+            <div id="div-fanData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Fan Status</h2>
+                        <hr>
+                        <div id="canvas-wrapper5">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper5">No data available...</div>
                 </div>
-                <hr>
             </div>
-            <div class="row margin-double">
-                <div>
-                    <h2 class="grey ">Bulb Status</h2>
+            <div id="div-bulbData">
+                <div class="row margin-double">
+                    <div>
+                        <h2 class="grey ">Bulb Status</h2>
+                        <hr>
+                        <div id="canvas-wrapper6">No data available...</div>
+                    </div>
                     <hr>
-                    <div id="canvas-wrapper6">No data available...</div>
                 </div>
-                <hr>
             </div>
         </div>
     </div>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
index c159c1ba..c49d5843 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js
@@ -148,22 +148,52 @@ function updateGraphs(stats) {
     console.log(stats);
 
     var temperatureData = stats['temperatureData'];
-    updateTemperatureGraph(convertStatsToGraphData(temperatureData));
+    if (typeof temperatureData != 'undefined'){
+        $('#div-temperatureData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Temperature</h2><hr><div id='canvas-wrapper1'></div></div><hr></div>");
+        updateTemperatureGraph(convertStatsToGraphData(temperatureData));
+    }else{
+        $('#div-temperatureData').html("");
+    }
 
     var lightData = stats['lightData'];
-    updateLightGraph(convertStatsToGraphData(lightData));
+    if (typeof lightData != 'undefined'){
+        $('#div-lightData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Light</h2><hr><div id='canvas-wrapper2'></div></div><hr></div>");
+        updateLightGraph(convertStatsToGraphData(lightData));
+    }else{
+        $('#div-lightData').html("");
+    }
 
     var motionData = stats['motionData'];
-    updateMotionGraph(convertStatsToGraphData(motionData));
+    if (typeof motionData != 'undefined'){
+        $('#div-motionData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Motion</h2><hr><div id='canvas-wrapper3'></div></div><hr></div>");
+        updateMotionGraph(convertStatsToGraphData(motionData));
+    }else{
+        $('#div-motionData').html("");
+    }
 
     var sonarData = stats['sonarData'];
-    updateSonarGraph(convertStatsToGraphData(sonarData));
+    if (typeof sonarData != 'undefined'){
+        $('#div-sonarData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Sonar</h2><hr><div id='canvas-wrapper4'></div></div><hr></div>");
+        updateSonarGraph(convertStatsToGraphData(sonarData));
+    }else{
+        $('#div-sonarData').html("");
+    }
 
     var fanData = stats['fanData'];
-    updateFanGraph(convertStateStatsToGraphData(fanData));
+    if (typeof fanData != 'undefined'){
+        $('#div-fanData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Fan Status</h2><hr><div id='canvas-wrapper5'></div></div><hr></div>");
+        updateFanGraph(convertStateStatsToGraphData(fanData));
+    }else{
+        $('#div-fanData').html("");
+    }
 
     var bulbData = stats['bulbData'];
-    updateBulbGraph(convertStateStatsToGraphData(bulbData));
+    if (typeof bulbData != 'undefined'){
+        $('#div-bulbData').html("").html("<div class='row margin-double'><div><h2 class='grey'>Bulb Status</h2><hr><div id='canvas-wrapper6'></div></div><hr></div>");
+        updateBulbGraph(convertStateStatsToGraphData(bulbData));
+    }else{
+        $('#div-bulbData').html("");
+    }
 
     scaleGraphs();
 }