Add CPU temperature graph to analysis

modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag

@@ -75,6 +75,7 @@ if (result) {
 
 function getFireAlarmData(user, deviceId, from, to) {
     result = new Object();
+    result['cpuTemperatureData'] = getSensorData("DEVICE_CPU_TEMPERATURE_SUMMARY", "TEMPERATURE", user, deviceId, from, to);
     result['temperatureData'] = getSensorData("DEVICE_TEMPERATURE_SUMMARY", "TEMPERATURE", user, deviceId, from, to);
     result['fanData'] = getSensorData("DEVICE_FAN_USAGE_SUMMARY", "status", user, deviceId, from, to);
     result['bulbData'] = getSensorData("DEVICE_BULB_USAGE_SUMMARY", "status", user, deviceId, from, to);
@@ -96,14 +97,6 @@ function getArduinoData(user, deviceId, from, to){
     return result;
 }
 
-function getDigitalDisplayData(user, deviceId, from, to){
-	result = new Object();
-	result['ramData'] = getSensorData("RAM_USAGE_SUMMARY","motion",user, deviceId, from, to);
-	result['cpuData'] = getSensorData("CPU_LOAD_SUMMARY","light",user, deviceId, from, to);
-	result['temperatureData'] = getSensorData("DEVICE_TEMPERATURE_SUMMARY","TEMPERATURE",user, deviceId, from, to);
-	return result;
-}
-
 function getAndroidSenseData(user, deviceId, from, to) {
     result = new Object();
     result['ramData'] = getSensorData("RAM_USAGE_SUMMARY", "motion", user, deviceId, from, to);
@@ -117,7 +110,7 @@ function getDigitalDisplayData(user, deviceId, from, to){
     result = new Object();
     result['ramData'] = getSensorData("RAM_USAGE_SUMMARY", "motion", user, deviceId, from, to);
     result['cpuData'] = getSensorData("CPU_LOAD_SUMMARY", "light", user, deviceId, from, to);
-	result['temperatureData'] = getSensorData("DEVICE_TEMPERATURE_SUMMARY","TEMPERATURE",user, deviceId, from, to);
+    result['cpuTemperatureData'] = getSensorData("DEVICE_CPU_TEMPERATURE_SUMMARY", "TEMPERATURE", user, deviceId, from, to);
     return result;
 }
 

modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs

@@ -48,6 +48,8 @@
             </div>
             <div id="div-bulbData">
             </div>
+            <div id="div-cpuTemperatureData">
+            </div>
             <div id="div-CPUData">
             </div>
             <div id="div-RAMData">
@@ -70,4 +72,5 @@
     <script src="{{self.publicURL}}/js/graphs/sonar_graph.js"></script>
     <script src="{{self.publicURL}}/js/graphs/cpu_graph.js"></script>
     <script src="{{self.publicURL}}/js/graphs/ram_graph.js"></script>
+    <script src="{{self.publicURL}}/js/graphs/cpu_temperature_graph.js"></script>
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graph_util.js

@@ -67,12 +67,12 @@ $('#today-btn').on('click', function () {
 //hour picker
 $('#hour-btn').on('click', function () {
     getDateTime(currentDay.getTime() - 3600000, currentDay.getTime());
-})
+});
 
 //week picker
 $('#week-btn').on('click', function () {
     getDateTime(currentDay.getTime() - 604800000, currentDay.getTime());
-})
+});
 
 //month picker
 $('#month-btn').on('click', function () {
@@ -211,6 +211,14 @@ function updateGraphs(stats) {
         $('#div-RAMData').html("");
     }
 
+    var cpuTemperatureData = stats['cpuTemperatureData'];
+    if (typeof cpuTemperatureData != 'undefined') {
+        $('#div-cpuTemperatureData').html("").html("<div class='row margin-double'><div><h2 class='grey'>CPU Temperature</h2><hr><div id='canvas-wrapper9'></div></div><hr></div>");
+        updateCPUTemperatureGraph(convertStatsToGraphData(cpuTemperatureData));
+    } else {
+        $('#div-cpuTemperatureData').html("");
+    }
+
     scaleGraphs();
 }
 
@@ -219,8 +227,18 @@ function scaleGraphs() {
     if (sliders.length == 0) {
         return;
     }
+    var graphWidth = 0;
+    for (var i = 1; i < 10; i++){
+        if ($('#canvas-wrapper' + i).length){
+            graphWidth = $('#canvas-wrapper' + i).width() - 50;
+            break;
+        }
+    }
+
+    if (graphWidth <= 0){
+        return;
+    }
 
-    var graphWidth = $('#canvas-wrapper1').width() - 50;
     //Scale graphs
     var sliderX = graphWidth * 60 * 60 / (toDate - fromDate);
     if (sliderX < graphWidth) {

modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/public/js/graphs/cpu_temperature_graph.js

@@ -0,0 +1,70 @@
+function updateCPUTemperatureGraph(temperatureData) {
+    console.log("cpuTemperatureData");
+    renderCPUTemperatureChart(temperatureData);
+}
+
+function renderCPUTemperatureChart(chartDataRaw) {
+    var chartWrapperElmId = "#canvas-wrapper9";
+    var graphWidth = $(chartWrapperElmId).width() - 50;
+    if (chartDataRaw.length == 0) {
+        $(chartWrapperElmId).html("No data available...");
+        return;
+    }
+
+    var chartData = [];
+    for (var i = 0; i < chartDataRaw.length; i++) {
+        chartData.push({x: parseInt(chartDataRaw[i].x), y: parseInt(chartDataRaw[i].y)});
+    }
+
+    //var i = parseInt(fromDate);
+    //while (i < parseInt(toDate)){
+    //    var rnd = Math.random() * (30 - 20) + 20;
+    //    chartData.push({x:i * 1000, y:rnd});
+    //    i += 60 * 5;
+    //}
+
+    var chartDiv = "chart9";
+    var sliderDiv = "slider9";
+    var x_axis = "x_axis9";
+    var y_axis = "y_axis9";
+    $(chartWrapperElmId).html("").html('<div id="' + y_axis + '" class="custom_y_axis"></div><div id="' + chartDiv + '" class="custom_rickshaw_graph"></div><div id="' + x_axis + '" class="custom_x_axis"></div><div id="' + sliderDiv + '" class="custom_slider"></div>');
+
+    var graph = new Rickshaw.Graph({
+        element: document.getElementById(chartDiv),
+        width: graphWidth,
+        height: 400,
+        strokeWidth: 1,
+        renderer: 'line',
+        xScale: d3.time.scale(),
+        padding: {top: 0.2, left: 0.02, right: 0.02, bottom: 0},
+        series: [
+            {color: '#FF4000', data: chartData}
+        ]
+    });
+
+    graph.render();
+
+    var xAxis = new Rickshaw.Graph.Axis.X({
+        graph: graph,
+        orientation: 'bottom',
+        element: document.getElementById(x_axis),
+        tickFormat: graph.x.tickFormat()
+    });
+
+    xAxis.render();
+
+    var yAxis = new Rickshaw.Graph.Axis.Y({
+        graph: graph,
+        orientation: 'left',
+        element: document.getElementById(y_axis),
+        width: 40,
+        height: 410
+    });
+
+    yAxis.render();
+
+    var slider = new Rickshaw.Graph.RangeSlider.Preview({
+        graph: graph,
+        element: document.getElementById(sliderDiv)
+    });
+}