Merge pull request #237 from charithag/master

Remove obsolete units and update analytics components
revert-dabc3590
inoshperera 9 years ago
commit dc7615786b

@ -24,7 +24,7 @@
CREATE TEMPORARY TABLE DeviceTemperatureSummaryData USING CarbonAnalytics OPTIONS (tableName "DEVICE_TEMPERATURE_SUMMARY", schema "temperature FLOAT, deviceType STRING -i, deviceId STRING -i, owner STRING -i, time LONG -i",primaryKeys "deviceType, deviceId, owner, time");
insert overwrite table DeviceTemperatureSummaryData select temperature, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceTemperatureData group by temperature, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
insert into table DeviceTemperatureSummaryData select temperature, meta_deviceType as deviceType, meta_deviceId as deviceId, meta_owner as owner, cast(meta_time/1000 as BIGINT)as time from DeviceTemperatureData group by temperature, meta_deviceType, meta_deviceId, meta_owner, cast(meta_time/1000 as BIGINT);
</Script>
<CronExpression>0 * * * * ?</CronExpression>
</Analytics>

@ -1,471 +0,0 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/* graph */
.rickshaw_graph {
position: relative;
}
.rickshaw_graph svg {
display: block;
overflow: hidden;
}
/* ticks */
.rickshaw_graph .x_tick {
position: absolute;
top: 0;
bottom: 0;
width: 0;
border-left: 1px dotted rgba(0, 0, 0, 0.2);
pointer-events: none;
}
.rickshaw_graph .x_tick .title {
position: absolute;
font-size: 12px;
font-family: Arial, sans-serif;
opacity: 0.5;
white-space: nowrap;
margin-left: 3px;
bottom: -20px;
height: auto;
border-bottom: none;
}
/* annotations */
.rickshaw_annotation_timeline {
height: 1px;
border-top: 1px solid #e0e0e0;
margin-top: 10px;
position: relative;
}
.rickshaw_annotation_timeline .annotation {
position: absolute;
height: 6px;
width: 6px;
margin-left: -2px;
top: -3px;
border-radius: 5px;
background-color: rgba(0, 0, 0, 0.25);
}
.rickshaw_graph .annotation_line {
position: absolute;
top: 0;
bottom: -6px;
width: 0;
border-left: 2px solid rgba(0, 0, 0, 0.3);
display: none;
}
.rickshaw_graph .annotation_line.active {
display: block;
}
.rickshaw_graph .annotation_range {
background: rgba(0, 0, 0, 0.1);
display: none;
position: absolute;
top: 0;
bottom: -6px;
}
.rickshaw_graph .annotation_range.active {
display: block;
}
.rickshaw_graph .annotation_range.active.offscreen {
display: none;
}
.rickshaw_annotation_timeline .annotation .content {
background: white;
color: black;
opacity: 0.9;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
border-radius: 3px;
position: relative;
z-index: 20;
font-size: 12px;
padding: 6px 8px 8px;
top: 18px;
left: -11px;
width: 160px;
display: none;
cursor: pointer;
}
.rickshaw_annotation_timeline .annotation .content:before {
content: "\25b2";
position: absolute;
top: -11px;
color: white;
text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
}
.rickshaw_annotation_timeline .annotation.active,
.rickshaw_annotation_timeline .annotation:hover {
background-color: rgba(0, 0, 0, 0.8);
cursor: none;
}
.rickshaw_annotation_timeline .annotation .content:hover {
z-index: 50;
}
.rickshaw_annotation_timeline .annotation.active .content {
display: block;
}
.rickshaw_annotation_timeline .annotation:hover .content {
display: block;
z-index: 50;
}
.rickshaw_graph .y_axis,
.rickshaw_graph .x_axis_d3 {
fill: none;
}
.rickshaw_graph .y_ticks .tick line,
.rickshaw_graph .x_ticks_d3 .tick {
stroke: rgba(0, 0, 0, 0.16);
stroke-width: 2px;
shape-rendering: crisp-edges;
pointer-events: none;
}
.rickshaw_graph .y_grid .tick,
.rickshaw_graph .x_grid_d3 .tick {
z-index: -1;
stroke: rgba(0, 0, 0, 0.20);
stroke-width: 1px;
stroke-dasharray: 1 1;
}
.rickshaw_graph .y_grid .tick[data-y-value="0"] {
stroke-dasharray: 1 0;
}
.rickshaw_graph .y_grid path,
.rickshaw_graph .x_grid_d3 path {
fill: none;
stroke: none;
}
.rickshaw_graph .y_ticks path,
.rickshaw_graph .x_ticks_d3 path {
fill: none;
stroke: #808080;
}
.rickshaw_graph .y_ticks text,
.rickshaw_graph .x_ticks_d3 text {
opacity: 0.5;
font-size: 12px;
pointer-events: none;
}
.rickshaw_graph .x_tick.glow .title,
.rickshaw_graph .y_ticks.glow text {
fill: black;
color: black;
text-shadow: -1px 1px 0 rgba(255, 255, 255, 0.1),
1px -1px 0 rgba(255, 255, 255, 0.1),
1px 1px 0 rgba(255, 255, 255, 0.1),
0 1px 0 rgba(255, 255, 255, 0.1),
0 -1px 0 rgba(255, 255, 255, 0.1),
1px 0 0 rgba(255, 255, 255, 0.1),
-1px 0 0 rgba(255, 255, 255, 0.1),
-1px -1px 0 rgba(255, 255, 255, 0.1);
}
.rickshaw_graph .x_tick.inverse .title,
.rickshaw_graph .y_ticks.inverse text {
fill: white;
color: white;
text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.8),
1px -1px 0 rgba(0, 0, 0, 0.8),
1px 1px 0 rgba(0, 0, 0, 0.8),
0 1px 0 rgba(0, 0, 0, 0.8),
0 -1px 0 rgba(0, 0, 0, 0.8),
1px 0 0 rgba(0, 0, 0, 0.8),
-1px 0 0 rgba(0, 0, 0, 0.8),
-1px -1px 0 rgba(0, 0, 0, 0.8);
}
.custom_rickshaw_graph {
position: relative;
left: 40px;
}
.custom_y_axis {
position: absolute;
width: 40px;
margin-top: -20px;
}
.custom_slider {
left: 40px;
}
.custom_x_axis {
position: relative;
left: 40px;
height: 30px;
width: 97%;
top: 20px;
text-align: right;
}
.chartWrapper {
padding-top: 50px;
}
/*detail*/
.rickshaw_graph .detail {
pointer-events: none;
position: absolute;
top: 0;
z-index: 2;
background: rgba(0, 0, 0, 0.1);
bottom: 0;
width: 1px;
transition: opacity 0.25s linear;
-moz-transition: opacity 0.25s linear;
-o-transition: opacity 0.25s linear;
-webkit-transition: opacity 0.25s linear;
}
.rickshaw_graph .detail.inactive {
opacity: 0;
}
.rickshaw_graph .detail .item.active {
opacity: 1;
}
.rickshaw_graph .detail .x_label {
font-family: Arial, sans-serif;
border-radius: 3px;
padding: 6px;
opacity: 0.5;
border: 1px solid #e0e0e0;
font-size: 12px;
position: absolute;
background: white;
white-space: nowrap;
}
.rickshaw_graph .detail .x_label.left {
left: 0;
}
.rickshaw_graph .detail .x_label.right {
right: 0;
}
.rickshaw_graph .detail .item {
position: absolute;
z-index: 2;
border-radius: 3px;
padding: 0.25em;
font-size: 12px;
font-family: Arial, sans-serif;
opacity: 0;
background: rgba(0, 0, 0, 0.4);
color: white;
border: 1px solid rgba(0, 0, 0, 0.4);
margin-left: 1em;
margin-right: 1em;
margin-top: -1em;
white-space: nowrap;
}
.rickshaw_graph .detail .item.left {
left: 0;
}
.rickshaw_graph .detail .item.right {
right: 0;
}
.rickshaw_graph .detail .item.active {
opacity: 1;
background: rgba(0, 0, 0, 0.8);
}
.rickshaw_graph .detail .item:after {
position: absolute;
display: block;
width: 0;
height: 0;
content: "";
border: 5px solid transparent;
}
.rickshaw_graph .detail .item.left:after {
top: 1em;
left: -5px;
margin-top: -5px;
border-right-color: rgba(0, 0, 0, 0.8);
border-left-width: 0;
}
.rickshaw_graph .detail .item.right:after {
top: 1em;
right: -5px;
margin-top: -5px;
border-left-color: rgba(0, 0, 0, 0.8);
border-right-width: 0;
}
.rickshaw_graph .detail .dot {
width: 4px;
height: 4px;
margin-left: -3px;
margin-top: -3.5px;
border-radius: 5px;
position: absolute;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
box-sizing: content-box;
-moz-box-sizing: content-box;
background: white;
border-width: 2px;
border-style: solid;
display: none;
background-clip: padding-box;
}
.rickshaw_graph .detail .dot.active {
display: block;
}
/*legend*/
.rickshaw_legend {
font-family: Arial;
font-size: 12px;
color: white;
background: #404040;
display: inline-block;
padding: 12px 5px;
border-radius: 2px;
position: relative;
float: right;
}
.rickshaw_legend:hover {
z-index: 10;
}
.rickshaw_legend .swatch {
width: 10px;
height: 10px;
border: 1px solid rgba(0, 0, 0, 0.2);
}
.rickshaw_legend .line {
clear: both;
line-height: 140%;
padding-right: 15px;
}
.rickshaw_legend .line .swatch {
display: inline-block;
margin-right: 3px;
border-radius: 2px;
}
.rickshaw_legend .label {
margin: 0;
white-space: nowrap;
display: inline;
font-size: inherit;
background-color: transparent;
color: inherit;
font-weight: normal;
line-height: normal;
padding: 0;
text-shadow: none;
}
.rickshaw_legend .action:hover {
opacity: 0.6;
}
.rickshaw_legend .action {
margin-right: 0.2em;
opacity: 0.2;
cursor: pointer;
font-size: 14px;
}
.rickshaw_legend .line.disabled {
opacity: 0.4;
}
.rickshaw_legend ul {
list-style-type: none;
padding: 0;
margin: 2px;
cursor: pointer;
}
.rickshaw_legend li {
padding: 0 0 0 2px;
min-width: 80px;
white-space: nowrap;
}
.rickshaw_legend li:hover {
background: rgba(255, 255, 255, 0.08);
border-radius: 3px;
}
.rickshaw_legend li:active {
background: rgba(255, 255, 255, 0.2);
border-radius: 3px;
}
.legend {
display: inline-block;
position: relative;
left: 8px;
}
.legend_container {
float: right;
padding-right: 10px;
width: 0;
z-index: 1;
position: relative;
opacity: 0.7;
}
.spaced {
margin-top: 20px !important;
}

@ -1,247 +0,0 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
var xAxis;
var deviceType = $("#details").data("devicetype");
var deviceId = $(".device-id").data("deviceid");
var monitorOperations = $("#details").data("monitor");
var appContext = $("#details").data("appcontext");
var marker1 = appContext + "/public/iot.unit.device.stats/images/map-marker-1.png";
var marker2 = appContext + "/public/iot.unit.device.stats/images/map-marker-2.png";
var map, mapPoints = [], mapPaths = [], mapMarkers = [];
var palette = new Rickshaw.Color.Palette({scheme: "classic9"});
function initMap() {
if ($('#map').length) {
map = new google.maps.Map(document.getElementById("map"), {
center: {lat: 6.9344, lng: 79.8428},
zoom: 12
});
}
}
function formatDates() {
$(".formatDate").each(function () {
var timeStamp = $(this).html();
$(this).html(getDateString(timeStamp));
});
}
function getDateString(timeStamp) {
var monthNames = [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"
];
var date = new Date(parseInt(timeStamp));
var day = date.getDate();
var monthIndex = date.getMonth() + 1;
if (monthIndex < 10) {
monthIndex = "0" + monthIndex;
}
var year = date.getFullYear();
var hours = date.getHours();
var amPm = hours < 12 ? "AM" : "PM";
if (hours > 12) {
hours -= 12;
}
if (hours == 0) {
hours = 12;
}
return day + '-' + monthNames[monthIndex - 1] + '-' + year + ' ' + hours + ':' + date.getMinutes() + amPm;
}
$(window).on("resize", function () {
location.reload(false);
});
$(document).ready(function () {
formatDates();
updateGraphs();
});
function updateGraphs() {
var tv = 5000;
var graphs = {};
for (var op in monitorOperations) {
var opName = monitorOperations[op].name;
if (opName == "gps") {
$("#map").removeClass("hidden");
} else {
var xLabel = "", yLabel = "";
if (monitorOperations[op].ui_unit) {
var graph_data = monitorOperations[op].ui_unit.data;
for (var d in graph_data) {
if (graph_data[d].hasOwnProperty("column")) {
if (graph_data[d]["column"]["ui-mapping"] == 'x-axis') {
xLabel = graph_data[d]["column"]["label"];
} else if (graph_data[d]["column"]["ui-mapping"] == 'y-axis') {
yLabel = graph_data[d]["column"]["label"];
}
}
}
}
var graphHtml = '<div class="chartWrapper" id="chartWrapper-' + opName + '">' +
'<div id="y_axis-' + opName + '" class="custom_y_axis">' + yLabel + '</div>' +
'<div class="legend_container">' +
'<div id="smoother-' + opName + '" title="Smoothing"></div>' +
'<div id="legend-' + opName + '"></div>' +
'</div>' +
'<div id="chart-' + opName + '" class="custom_rickshaw_graph"></div>' +
'<div class="custom_x_axis">' + xLabel + '</div>' +
'</div>';
$("#div-chart").append(graphHtml);
var graph = new Rickshaw.Graph({
element: document.getElementById("chart-" + opName),
width: $("#chartWrapper").width() - 50,
height: 300,
renderer: "line",
padding: {top: 0.2, left: 0.0, right: 0.0, bottom: 0.2},
series: new Rickshaw.Series.FixedDuration([{name: monitorOperations[op].name}], undefined, {
timeInterval: 10000,
maxDataPoints: 20,
color: palette.color(),
timeBase: new Date().getTime() / 1000
})
});
graph.render();
xAxis = new Rickshaw.Graph.Axis.Time({
graph: graph
});
xAxis.render();
new Rickshaw.Graph.Axis.Y({
graph: graph,
orientation: 'left',
height: 300,
tickFormat: Rickshaw.Fixtures.Number.formatKMBT,
element: document.getElementById('y_axis-' + opName)
});
new Rickshaw.Graph.Legend({
graph: graph,
element: document.getElementById('legend-' + opName)
});
new Rickshaw.Graph.HoverDetail({
graph: graph,
formatter: function (series, x, y) {
var date = '<span class="date">' + moment(x * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
var swatch = '<span class="detail_swatch" style="background-color: ' + series.color + '"></span>';
return swatch + series.name + ": " + parseInt(y) + '<br>' + date;
}
});
graphs[opName] = graph;
}
}
setInterval(function () {
var getStatsRequest = $.ajax({
url: appContext + "/api/operations/" + deviceType + "/stats?deviceId=" +
deviceId,
method: "get"
});
getStatsRequest.done(function (data) {
var stats = data.data;
var lastUpdate = -1;
for (var s in stats) {
var val = stats[s];
if (!val) {
continue;
}
if (val.time > lastUpdate) {
lastUpdate = val.time;
}
delete val["time"];
if (val.map) {
mapPoints.push(val.map);
var marker = new google.maps.Marker({
position: val.map,
map: map,
icon: marker1,
title: "Seen at " + getDateString(lastUpdate)
});
marker.setMap(map);
map.panTo(val.map);
mapMarkers.push(marker);
if (mapPoints.length > 1) {
var l = mapPoints.length;
var path = new google.maps.Polyline({
path: [mapPoints[l - 1], mapPoints[l - 2]],
geodesic: true,
strokeColor: "#FF0000",
strokeOpacity: 1.0,
strokeWeight: 2
});
path.setMap(map);
mapPaths.push(path);
mapMarkers[l - 2].setIcon(marker2);
}
if (mapPoints.length >= 10) {
mapMarkers[0].setMap(null);
mapMarkers.splice(0, 1);
mapPaths[0].setMap(null);
mapPaths.splice(0, 1);
mapPoints.splice(0, 1);
}
} else {
var graphVals = {};
for (var key in val) {
graphVals[key] = val[key];
graphs[key].series.addData(graphVals);
graphs[key].render();
}
}
}
if (lastUpdate == -1) {
$('#last_seen').text("Not seen recently");
}
var timeDiff = new Date().getTime() - lastUpdate;
if (timeDiff < tv * 2) {
$('#last_seen').text("Last seen: A while ago");
} else if (timeDiff < 60 * 1000) {
$('#last_seen').text("Last seen: Less than a minute ago");
} else if (timeDiff < 60 * 60 * 1000) {
$('#last_seen').text("Last seen: " + Math.round(timeDiff / (60 * 1000))
+ " minutes ago");
} else {
$('#last_seen').text("Last seen: " + getDateString(lastUpdate));
}
});
}, tv);
}

@ -1,29 +0,0 @@
{{#if monitor_operations}}
{{#zone "topCss"}}
{{css "css/graph.css"}}
{{/zone}}
<span id="details" data-devicetype="{{device.type}}" data-deviceid="{{device.deviceIdentifier}}"
data-monitor="{{monitor_operations}}" data-appcontext="{{@app.context}}"></span>
<div id="chartWrapper">
</div>
<div id="div-chart">
</div>
<a class="padding-left"
href="{{@app.context}}/analytics?deviceId={{device.deviceIdentifier}}&deviceType={{device.type}}&deviceName={{device.name}}">
<span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i>
</span> View Device Analytics</a>
<!-- /statistics -->
{{#zone "bottomJs"}}
{{js "js/d3.min.js"}}
{{js "js/rickshaw.min.js"}}
{{js "js/moment.min.js"}}
{{js "js/device-stats.js"}}
{{/zone}}
{{else}}
<div align="center">
<h4 style="color: #D8000C"><i class="icon fw fw-error" style="color: #D8000C"></i>
Stats Loading Failed!</h4>
</div>
{{/if}}

@ -1,32 +0,0 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
function onRequest(context) {
var log = new Log("stats.js");
var operationModule = require("/app/modules/operation.js").operationModule;
var device = context.unit.params.device;
var monitor_operations;
try {
monitor_operations = JSON.stringify(operationModule.getMonitorOperations(device.type));
} catch (e) {
log.error("Monitor operation loading failed.");
monitor_operations = null;
}
return {"monitor_operations": monitor_operations, "device": device};
}

@ -1,15 +1,15 @@
{{#zone "topCss"}}
{{css "css/graph.css"}}
{{/zone}}
<span id="details" data-devicename="{{device.name}}" data-deviceid="{{device.deviceIdentifier}}"
data-appcontext="{{@app.context}}"></span>
<div id="div-chart">
<div class="chartWrapper" id="chartWrapper">
<span id="span-title">Temperature</span>
<div id="y_axis" class="custom_y_axis"></div>
<div class="legend_container">
<div id="smoother'" title="Smoothing"></div>
<div id="legend'"></div>
<div id="smoother" title="Smoothing"></div>
<div id="legend"></div>
</div>
<div id="chart" class="custom_rickshaw_graph" data-backend-api-url = {{backendApiUri}}></div>
<div id="x_axis" class="custom_x_axis"></div>

@ -18,7 +18,7 @@
function onRequest(context) {
var deviceType = context.uriParams.deviceType;
var deviceId = request.getParameter("id");
var deviceId = request.getParameter("deviceId");
if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
var deviceModule = require("/app/modules/device.js").deviceModule;

@ -16,33 +16,22 @@
* under the License.
*/
var palette = new Rickshaw.Color.Palette({scheme: "classic9"});
function drawGraph(from, to) {
var backendApiUrl = $("#chart").data("backend-api-url") + "?from=" + from + "&to=" + to;
var successCallback = function (data) {
if (data) {
data = JSON.parse(data);
for (i =1; i < data.length; i++) {
if (data[i-1].values.time > data[i].values.time) {
alert(i);
alert(data[i-1].values.time + "," + data[i].values.time)
}
}
drawLineGraph(data)
drawLineGraph(JSON.parse(data));
}
};
invokerUtil.get(backendApiUrl, successCallback, function (message) {
console.log(message);
});
}
var isGraphAdded = false;
function drawLineGraph(data) {
$("#chart").empty();
$("#slider").empty();
$("#x_axis").empty();
$("#y_axis").empty();
$("#smoother").empty();
$("#legend").empty();
var chartWrapperElmId = "#div-chart";
var graphWidth = $(chartWrapperElmId).width() - 50;
if (data.length == 0 || data.length == undefined) {
@ -55,23 +44,23 @@ function drawLineGraph(data) {
width: graphWidth,
height: 400,
strokeWidth: 2,
renderer: 'lineplot',
renderer: 'line',
interpolation: "linear",
unstack: true,
stack: false,
xScale: d3.time.scale(),
min :0,
max : 80,
padding: {top: 0.2, left: 0.02, right: 0.02, bottom: 0.2},
series: []
};
var tzOffset = new Date().getTimezoneOffset() * 60;
var min = Number.MAX_VALUE;
var max = Number.MIN_VALUE;
var range_min = 99999, range_max = 0;
var chartData = [];
var max_val = parseInt(data[0].values.temperature);
var min_val = max_val;
var chartData = [];
for (var i = 0; i < data.length; i++) {
var y_val = parseInt(data[i].values.temperature);
if (y_val > max_val) {
@ -79,10 +68,12 @@ function drawLineGraph(data) {
} else if (y_val < min_val) {
min_val = y_val;
}
chartData.push({
x: parseInt(data[i].values.time),
chartData.push(
{
x: parseInt(data[i].values.time) - tzOffset,
y: y_val
});
}
);
}
if (range_max < max_val) {
range_max = max_val;
@ -90,14 +81,18 @@ function drawLineGraph(data) {
if (range_min > min_val) {
range_min = min_val;
}
graphConfig['series'].push({
'color': "steelblue",
'data': summerizeLine(chartData),
'name': "temperature"
});
graphConfig['series'].push(
{
'color': palette.color(),
'data': chartData,
'name': $("#details").data("devicename"),
'scale': d3.scale.linear().domain([Math.min(min, min_val), Math.max(max, max_val)])
.nice()
}
);
if (graphConfig['series'].length == 0) {
$("#chart").html("<br/>No data available...");
$(chartWrapperElmId).html("No data available...");
return;
}
@ -111,12 +106,13 @@ function drawLineGraph(data) {
xAxis.render();
yAxis = new Rickshaw.Graph.Axis.Y({
var yAxis = new Rickshaw.Graph.Axis.Y.Scaled({
graph: graph,
orientation: 'left',
height: 300,
tickFormat: Rickshaw.Fixtures.Number.formatKMBT,
element: document.getElementById('y_axis')
element: document.getElementById("y_axis"),
width: 40,
height: 410,
'scale': d3.scale.linear().domain([Math.min(min, range_min), Math.max(max, range_max)]).nice()
});
yAxis.render();
@ -135,7 +131,7 @@ function drawLineGraph(data) {
graph: graph,
formatter: function (series, x, y) {
var date = '<span class="date">' +
moment((x) * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
moment((x + tzOffset) * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
var swatch = '<span class="detail_swatch" style="background-color: ' +
series.color + '"></span>';
return swatch + series.name + ": " + parseInt(y) + '<br>' + date;
@ -156,21 +152,4 @@ function drawLineGraph(data) {
graph: graph,
legend: legend
});
}
function summerizeLine(data) {
if (data.length > 1500) {
var nData = [];
var i = 1;
while (i < data.length) {
var t_avg = (data[i - 1].x + data[i].x) / 2;
var v_avg = (data[i - 1].y + data[i].y) / 2;
nData.push({x: t_avg, y: v_avg});
i += 2;
}
return summerizeLine(nData);
} else {
return data;
}
}

@ -17,38 +17,32 @@
*/
var ws;
$(window).load(function () {
var websocketUrl = $("#div-chart").data("websocketurl");
connect(websocketUrl)
});
$(window).unload(function() {
disconnect();
});
var graph;
var palette = new Rickshaw.Color.Palette({scheme: "classic9"});
// set up our data series with 150 random data points
var graph = new Rickshaw.Graph({
$(window).load(function () {
graph = new Rickshaw.Graph({
element: document.getElementById("chart"),
width: $("#chartWrapper").width() - 50,
width: $("#div-chart").width() - 50,
height: 300,
renderer: "line",
padding: {top: 0.2, left: 0.0, right: 0.0, bottom: 0.2},
min :0,
max : 80,
series: new Rickshaw.Series.FixedDuration([{
name: 'one', color: 'steelblue'
}], undefined, {
timeInterval: 1000,
maxDataPoints: 10,
series: new Rickshaw.Series.FixedDuration([{name: "Temperature"}], undefined, {
timeInterval: 10000,
maxDataPoints: 20,
color: palette.color(),
timeBase: new Date().getTime() / 1000
})
});
graph.render();
xAxis = new Rickshaw.Graph.Axis.Time({
graph: graph
});
graph.render();
xAxis.render();
new Rickshaw.Graph.Axis.Y({
graph: graph,
@ -65,11 +59,20 @@ new Rickshaw.Graph.Legend({
new Rickshaw.Graph.HoverDetail({
graph: graph,
xFormatter: function(x) { return x + "seconds" },
yFormatter: function(y) { return Math.floor(y) + " C" }
formatter: function (series, x, y) {
var date = '<span class="date">' + moment(x * 1000).format('Do MMM YYYY h:mm:ss a') + '</span>';
var swatch = '<span class="detail_swatch" style="background-color: ' + series.color + '"></span>';
return swatch + series.name + ": " + parseInt(y) + '<br>' + date;
}
});
var websocketUrl = $("#div-chart").data("websocketurl");
connect(websocketUrl)
});
$(window).unload(function() {
disconnect();
});
//websocket connection
function connect(target) {
@ -82,10 +85,9 @@ function connect(target) {
}
if (ws) {
ws.onmessage = function (event) {
console.log('Received: ' + event.data);
var dataPoint = JSON.parse(event.data);
var data = {
one: parseFloat(dataPoint[5])
Temperature: parseFloat(dataPoint[5])
};
graph.series.addData(data);
graph.render();

@ -1,23 +1,19 @@
{{#zone "topCss"}}
{{css "css/graph.css"}}
{{/zone}}
<span id="details" data-devicetype="{{device.type}}" data-deviceid="{{device.deviceIdentifier}}"
data-appcontext="{{@app.context}}"></span>
<div id="chartWrapper">
</div>
<div id="div-chart" data-websocketurl="{{websocketEndpoint}}">
<div class="chartWrapper" id="chartWrapper"><div id="y_axis" class="custom_y_axis">Temperature</div>
<div class="chartWrapper" id="chartWrapper">
<div id="y_axis" class="custom_y_axis">Temperature</div>
<div class="legend_container">
<div id="smoother'" title="Smoothing"></div>
<div id="legend'"></div>
<div id="smoother" title="Smoothing"></div>
<div id="legend"></div>
</div>
<div id="chart" class="custom_rickshaw_graph"></div>
<div class="custom_x_axis">Time</div>
</div>
</div>
<a class="padding-left"
href="{{@app.context}}/device/analytics/{{device.type}}?id={{device.deviceIdentifier}}&deviceName={{device.name}}">
href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
<span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i>

@ -23,7 +23,7 @@ function onRequest(context) {
var constants = require("/app/modules/constants.js");
var websocketEndpoint = devicemgtProps["httpsURL"].replace("https", "wss");
var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);
var token = ""
var token = "";
if (tokenPair) {
token = tokenPair.accessToken;
}

@ -97,9 +97,3 @@
</div>
</div>
{{/zone}}
{{#zone "bottomJs"}}
<script async defer
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCO-8KGLeoFkCeqID9BpY_Gh6GOKfaBPVc&callback=initMap">
</script>
{{/zone}}
Loading…
Cancel
Save