Fixes gauge off page
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
<div class='col-xs-12' style="padding-top: 1em; margin-bottom: 1em;">
|
||||
<div class="input-daterange input-group" id="datepicker">
|
||||
<input data-chartid="dynamicChart" id="fromDate" data-daysofhistory="30" type="text" class="form-control" name="start">
|
||||
<div class="input-daterange input-group" id="datepicker">
|
||||
<input data-chartid="dynamicChart" id="fromDate" data-daysofhistory="30" type="text" class="form-control" name="start">
|
||||
<span class="input-group-addon">to</span>
|
||||
<input class="form-control" data-chartid="dynamicChart" id="toDate" type="text" name="end">
|
||||
<input class="form-control" data-chartid="dynamicChart" id="toDate" type="text" name="end">
|
||||
<span class='input-group-btn'>
|
||||
<a href="#!" data-chartid="dynamicChart" data-otherchartids="statusTimeline" class="btn chart-update btn-theme">Run</a>
|
||||
<a href="#!" data-chartid="dynamicChart" data-otherchartids="statusTimeline" class="btn chart-update btn-theme">Run</a>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class='clearfix col-xs-12' style='height: 300px' id="dynamicChart" data-chart="dynamicchart" data-daysofhistory="30" data-chartlabel="Data" data-ylabel="" data-xlabel="Date" data-units="" data-channelnames="poc.go_kwh,poc.go_electricity_cost,poc.go_peak_load,poc.go_min_load,poc.go_average_spm,poc.go_production_calculated,poc.go_full_card_production,poc.go_polished_rod_hp,poc.go_lifting_cost,poc.go_fluid_above_pump,poc.go_pump_intake_pressure,poc.go_kwh_regen,poc.go_inflow_rate"></div>
|
||||
|
||||
<div class='col-xs-12' style='margin-top: 2em;'>
|
||||
@@ -15,7 +16,7 @@
|
||||
<thead>
|
||||
<th>Date</th>
|
||||
<th>% Run</th>
|
||||
<th>kWh_Regen</th>
|
||||
<th>kWh</th>
|
||||
<th>Electricity Cost</th>
|
||||
<th>Peak Load</th>
|
||||
<th>Min. Load</th>
|
||||
@@ -32,128 +33,122 @@
|
||||
|
||||
<tbody id="output">
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<!--<%= JSON.stringify(channels['poc.events'].value) %>-->
|
||||
</div>
|
||||
|
||||
|
||||
<style>
|
||||
.dynamic-chart-form {
|
||||
background-color: whiteSmoke;
|
||||
padding: 1em 0.5em;
|
||||
margin-top: 1em;
|
||||
}
|
||||
</style>
|
||||
.dynamic-chart-form {
|
||||
background-color: whiteSmoke;
|
||||
padding: 1em 0.5em;
|
||||
margin-top: 1em;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
/*go_channels = {
|
||||
"percent_run":{"meshifyName":"go_percent_run","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"kWh":{"meshifyName":"go_kwh","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"electricity_cost":{"meshifyName":"go_electricity_cost","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"peak_load":{"meshifyName":"go_peak_load","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"min_load":{"meshifyName":"go_min_load","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"average_SPM":{"meshifyName":"go_average_spm","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"production_calculated":{"meshifyName":"go_production_calculated","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"full_card_production":{"meshifyName":"go_full_card_production","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"polished_rod_HP":{"meshifyName":"go_polished_rod_hp","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"lifting_cost":{"meshifyName":"go_lifting_cost","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"fluid_above_pump":{"meshifyName":"go_fluid_above_pump","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"pump_intake_pressure":{"meshifyName":"go_pump_intake_pressure","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"kWh_regen":{"meshifyName":"go_kwh_regen","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
"inflow_rate":{"meshifyName":"go_inflow_rate","last_value":"","last_send_time":0,"data_type":"float","change_amount":0},
|
||||
}*/
|
||||
var tableData = {};
|
||||
var nodeID = <%= node.nodeId %>;
|
||||
var nodeType = '<%= node.nodetypeName %>';
|
||||
var channelData = {
|
||||
go_percent_run: {name:<%= channels['poc.go_percent_run'].channelId %>, values:[]},
|
||||
go_kwh: {name:<%= channels['poc.go_kwh'].channelId %>, values:[]},
|
||||
go_electricity_cost: {name:<%= channels['poc.go_electricity_cost'].channelId %>, values:[]},
|
||||
go_peak_load: {name:<%= channels['poc.go_peak_load'].channelId %>, values:[]},
|
||||
go_min_load: {name:<%= channels['poc.go_min_load'].channelId %>, values:[]},
|
||||
go_average_spm: {name:<%= channels['poc.go_average_spm'].channelId %>, values:[]},
|
||||
go_production_calculated: {name:<%= channels['poc.go_production_calculated'].channelId %>, values:[]},
|
||||
go_polished_rod_hp: {name:<%= channels['poc.go_polished_rod_hp'].channelId %>, values:[]},
|
||||
go_lifting_cost: {name:<%= channels['poc.go_lifting_cost'].channelId %>, values:[]},
|
||||
go_fluid_above_pump: {name:<%= channels['poc.go_fluid_above_pump'].channelId %>, values:[]},
|
||||
go_pump_intake_pressure: {name:<%= channels['poc.go_pump_intake_pressure'].channelId %>, values:[]},
|
||||
go_kwh_regen: {name:<%= channels['poc.go_kwh_regen'].channelId %>, values:[]},
|
||||
go_inflow_rate: {name:<%= channels['poc.go_inflow_rate'].channelId %>, values:[]}
|
||||
};
|
||||
|
||||
var formatDate = function(str){
|
||||
var c1 = new Date(str);
|
||||
var c2 = (c1.getTime() / 1000);
|
||||
c2 = Math.floor(c2);
|
||||
return c2.toString();
|
||||
};
|
||||
|
||||
|
||||
var nodeID = <%= node.nodeId %>;
|
||||
var nodeType = '<%= node.nodetypeName %>';
|
||||
var channelIDs = {
|
||||
go_percent_run: <%= channels['poc.go_percent_run'].channelId %>,
|
||||
go_kwh: <%= channels['poc.go_kwh'].channelId %>,
|
||||
go_electricity_cost: <%= channels['poc.go_electricity_cost'].channelId %>,
|
||||
go_peak_load: <%= channels['poc.go_peak_load'].channelId %>,
|
||||
go_min_load: <%= channels['poc.go_min_load'].channelId %>,
|
||||
go_average_spm: <%= channels['poc.go_average_spm'].channelId %>,
|
||||
go_production_calculated: <%= channels['poc.go_production_calculated'].channelId %>,
|
||||
go_full_card_production: <%= channels['poc.go_full_card_production'].channelId %>,
|
||||
go_polished_rod_hp: <%= channels['poc.go_polished_rod_hp'].channelId %>,
|
||||
go_lifting_cost: <%= channels['poc.go_lifting_cost'].channelId %>,
|
||||
go_fluid_above_pump: <%= channels['poc.go_fluid_above_pump'].channelId %>,
|
||||
go_pump_intake_pressure: <%= channels['poc.go_pump_intake_pressure'].channelId %>,
|
||||
go_kwh_regen: <%= channels['poc.go_kwh_regen'].channelId %>,
|
||||
go_inflow_rate: <%= channels['poc.go_inflow_rate'].channelId %>
|
||||
};
|
||||
|
||||
|
||||
var go_percent_run = <%= channels['poc.go_percent_run'].channelId %>;
|
||||
var go_kwh = <%= channels['poc.go_kwh'].channelId %>;
|
||||
var go_electricity_cost = <%= channels['poc.go_electricity_cost'].channelId %>;
|
||||
var go_peak_load = <%= channels['poc.go_peak_load'].channelId %>;
|
||||
var go_min_load = <%= channels['poc.go_min_load'].channelId %>;
|
||||
var go_average_spm = <%= channels['poc.go_average_spm'].channelId %>;
|
||||
var go_production_calculated = <%= channels['poc.go_production_calculated'].channelId %>;
|
||||
var go_full_card_production = <%= channels['poc.go_full_card_production'].channelId %>;
|
||||
var go_polished_rod_hp = <%= channels['poc.go_polished_rod_hp'].channelId %>;
|
||||
var go_lifting_cost = <%= channels['poc.go_lifting_cost'].channelId %>;
|
||||
var go_fluid_above_pump = <%= channels['poc.go_fluid_above_pump'].channelId %>;
|
||||
var go_pump_intake_pressure = <%= channels['poc.go_pump_intake_pressure'].channelId %>;
|
||||
var go_kwh_regen = <%= channels['poc.go_kwh_regen'].channelId %>;
|
||||
var go_inflow_rate = <%= channels['poc.go_inflow_rate'].channelId %>;
|
||||
|
||||
var formatDate = function(str){
|
||||
var c1, c2;
|
||||
c1 = new Date(str);
|
||||
c2 = (c1.getTime() / 1000);
|
||||
c2 = Math.floor(c2);
|
||||
return c2.toString();
|
||||
};
|
||||
|
||||
var updateTable = function(chID){
|
||||
var apiData, start, end;
|
||||
var $output = $('#output');
|
||||
start = $('#datePicker').find('#fromDate');
|
||||
dateString = start.val().replace(/-/g, "/");
|
||||
start = formatDate(dateString);
|
||||
end = $('#datePicker').find('#toDate');
|
||||
dateString = end.val().replace(/-/g, "/");
|
||||
end = formatDate(dateString);
|
||||
apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + chID.toString();
|
||||
apiData += "&start=" + start + "&end=" + end;
|
||||
$.ajax({
|
||||
url: "http://henrypump.meshify.com/api2/Nodechannels",
|
||||
data: apiData,
|
||||
dataType: "json",
|
||||
type: "GET",
|
||||
success: function(data) {
|
||||
console.log(channeldata:data);
|
||||
/*var events = data.listofstreams[0];
|
||||
for(var i = events.stream.length-1; i > 0; i--) {
|
||||
var event = events.stream[i];
|
||||
var timestamp = event.x;
|
||||
var jsonBlock = event.y;
|
||||
var ev = JSON.parse(jsonBlock);
|
||||
var row = "<tr>";
|
||||
row += "<td>" + ev.id + "</td>";
|
||||
row += "<td>" + ev.datetime + "</td>";
|
||||
row += "<td>" + ev.type + "</td>";
|
||||
row += "<td>" + ev.cond + "</td>";
|
||||
row += "<td>" + ev.tag + "</td>";
|
||||
row += "<td>" + ev.value + "</td>";
|
||||
row += "<td>" + ev.device_name + "</td>";
|
||||
row += "<td>" + ev.stroke_number + "</td>";
|
||||
row += "</tr>"
|
||||
$output.append(row)
|
||||
//$output.append(JSON.stringify(jsonBlock));*/
|
||||
//}
|
||||
}
|
||||
});
|
||||
}
|
||||
var updateTable = function(chID, chName){
|
||||
|
||||
var start = $('#datepicker').find('#fromDate');
|
||||
//console.log({start:start.val()});
|
||||
dateString = start.val().replace(/-/g, "/");
|
||||
start = formatDate(dateString);
|
||||
|
||||
var end = $('#datepicker').find('#toDate');
|
||||
//console.log({end:end.val()});
|
||||
dateString = end.val().replace(/-/g, "/");
|
||||
end = formatDate(dateString);
|
||||
|
||||
var apiData = "&nodelist[0][nodeId]=" + nodeID.toString() + "&nodelist[0][channelId]=" + chID.toString();
|
||||
apiData += "&start=" + start + "&end=" + end;
|
||||
|
||||
$.ajax({
|
||||
url: '<%= rootURL %>' + '/api2/Nodechannels',
|
||||
data: apiData,
|
||||
dataType: "json",
|
||||
type: "GET",
|
||||
success: function(data) {
|
||||
var dataPoints = data.listofstreams[0];
|
||||
for(var i = dataPoints.stream.length-1; i > 0; i--){
|
||||
var dpt = dataPoints.stream[i];
|
||||
var timestamp = dpt.x;
|
||||
var val = dpt.y;
|
||||
channelData[chName]['values'].push({t:timestamp, val:val});
|
||||
if (!tableData.hasOwnProperty(timestamp)){
|
||||
tableData[timestamp] = {};
|
||||
}
|
||||
tableData[timestamp][chName] = val;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
$(document).ready(function(){
|
||||
for (var channel in channelIDs){
|
||||
if(channelIDs.hasOwnProperty(channel)){
|
||||
updateTable(channelIDs[channel]);
|
||||
var $output = $('#output');
|
||||
for (var channel in channelData){
|
||||
if(channelData.hasOwnProperty(channel)){
|
||||
updateTable(channelData[channel]['name'], channel);
|
||||
}
|
||||
}
|
||||
|
||||
var buildTable = function(){
|
||||
for (var timestp in tableData){
|
||||
if(tableData.hasOwnProperty(timestp)){
|
||||
var date = new Date(parseInt(timestp) * 1000);
|
||||
var dateString = (date.getMonth() +1) + "/" + date.getDate() + "/" + date.getFullYear();
|
||||
|
||||
var row = "<tr><td>" + dateString + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_percent_run']+ "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_kwh'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_electricity_cost'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_peak_load'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_min_load'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_average_spm'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_production_calculated'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_polished_rod_hp'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_lifting_cost'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_fluid_above_pump'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_pump_intake_pressure'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_kwh_regen'] + "</td>";
|
||||
row += "<td>" + tableData[timestp]['go_inflow_rate'] + "</td></tr>";
|
||||
console.log(row);
|
||||
$output.append(row);
|
||||
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
//console.log({tableData:tableData, channelData:channelData});
|
||||
setTimeout(buildTable, 3000);
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user