stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

adapt fronted to new backend

Browse source
This commit is contained in:
f10 2010-06-08 21:26:02 +02:00
parent 9dc4986f6d
commit a2ad3b68cc
3 changed files with 62 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/lib/controller/datacontroller.php
View file

@ -34,7 +34,7 @@ class DataController extends Controller {
$from = (isset($this->view->request->get['from'])) ? (int) $this->view->request->get['from'] : NULL;
$to = (isset($this->view->request->get['to'])) ? (int) $this->view->request->get['to'] : NULL;
$groupBy = (isset($this->view->request->get['groupby'])) ? $this->view->request->get['groupby'] : 400; // get all readings by default
$groupBy = (isset($this->view->request->get['groupBy'])) ? $this->view->request->get['groupBy'] : 400; // get all readings by default
$data['from'] = $from; // TODO use min max timestamps from Channel::getData()
$data['to'] = $to; // TODO nescessary?

48
frontend/index.html
View file

@ -11,6 +11,9 @@
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js"></script>
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.dateAxisRenderer.min.js"></script>
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.cursor.min.js"></script>
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"></script>
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.barRenderer.min.js"></script>
<script type="text/javascript" src="javascript/jqplot/plugins/jqplot.highlighter.min.js"></script>
<script type="text/javascript" src="javascript/smartmeter.js"></script>
@ -136,6 +139,7 @@
</div>
</form>
<div id="json"></div>
<div id="debug"></div>
<script language="JavaScript" type="text/javascript">
@ -305,7 +309,7 @@ function showChart() {
jqOptions = {
legend:{show:true},
series:[],
cursor:{zoom:true, showTooltip:false,constrainZoomTo:'x'},
cursor:{zoom:true, showTooltip:true,constrainZoomTo:'x'},
seriesDefaults:{lineWidth:1,showMarker:false}}
// stack plot seiries if add channels is active
@ -351,14 +355,13 @@ function showChart() {
//series_chart.push({showLabel:false,color:'#808080'})
// power
//if(f.grouping.value == '') {
if(f.grouping.value == '') {
jqData.push(raw2Power(data.channels[i],false));
//}
//else {
// jqData.push(raw2Energy(data.channels[i]));
//}
}
else {
jqData.push(raw2Energy(data.channels[i]));
}
}
jqOptions.axes = {
yaxis:{autoscale:true, min:0, label:"Leistung (Watt)", tickOptions:{formatString:'%.3f'},labelRenderer: $.jqplot.CanvasAxisLabelRenderer},
xaxis:{autoscale:true, min:calcMyWindowStart(), max:myWindowEnd, tickOptions:{formatString:EformatString,angle:-30},pad:1, renderer:$.jqplot.DateAxisRenderer,rendererOptions:{tickRenderer:$.jqplot.CanvasAxisTickRenderer}},
@ -379,12 +382,18 @@ function showChart() {
jqOptions.axes={
yaxis:{autoscale:true, min:0, tickOptions:{formatString:'%.3f'},label:"Energie (kWh)",labelRenderer: $.jqplot.CanvasAxisLabelRenderer},
xaxis:{
renderer:$.jqplot.CategoryAxisRenderer,
autoscale:true,
min:calcMyWindowStart(),
max:myWindowEnd,
tickOptions:{formatString:EformatString,angle:-30},pad:1, renderer:$.jqplot.DateAxisRenderer,rendererOptions:{tickRenderer:$.jqplot.CanvasAxisTickRenderer}
tickOptions:{formatString:'%d.%m.%y %H:%M:%S',angle:-30},
pad:1,
rendererOptions:{tickRenderer:$.jqplot.CanvasAxisTickRenderer},
ticks:generateAxisTicks()
}
};
jqOptions.highlighter={sizeAdjust: 7.5};
jqOptions.seriesDefaults.renderer=$.jqplot.BarRenderer;
jqOptions.cursor={show:false,zoom:false,showTooltip:true,showMarker:true}
}
chart = $.jqplot("ChartDIV",jqData,jqOptions);
@ -413,6 +422,25 @@ function showChart() {
});*/
}
function generateAxisTicks() {
var data_grouped_time = getEmptyGroupArray();
var ticks = new Array();
for(var timestamp in data_grouped_time) {
var time = new Date(timestamp*1000);
if(f.grouping.value == 'month')
ticks.push((time.getMonth()+1)+'/'+time.getFullYear());
if(f.grouping.value == 'day')
ticks.push(time.getDate()+'.'+(time.getMonth()+1)+'.');
if(f.grouping.value == 'hour')
ticks.push(time.getDate()+'.'+(time.getMonth()+1)+'.'+' '+time.getHours()+':00');
if(f.grouping.value == 'minute')
ticks.push(time.getDate()+'.'+(time.getMonth()+1));
}
return ticks;
}
</script>

82
frontend/javascript/smartmeter.js
View file

@ -76,7 +76,7 @@ function calcMyWindowStart() {
switch(windowInterval) {
case 'YEAR':
myWindowStart.setYear(myWindowStart.getYear()-windowSize);
myWindowStart.setYear(myWindowStart.getFullYear()-windowSize);
break;
case 'MONTH':
myWindowStart.setMonth(myWindowStart.getMonth()-windowSize);
@ -108,9 +108,9 @@ function getGroupedTimestamp(timestamp) {
// hint: its correct without break;
switch(f.grouping.value) {
case 'year':
month = 0;
month = 1;
case 'month':
day = 0;
day = 1;
case 'day':
hours = 0;
case 'hour':
@ -124,52 +124,18 @@ function getGroupedTimestamp(timestamp) {
function raw2Energy(raw) {
var data_grouped_time = getEmptyGroupArray();
var data_grouped = new Array();
alert('e')
return;
if(f.grouping.value == '')
return;
if(typeof raw == 'undefined') {
return [[]];
if(raw.data.length == 0) {
return [[0,0]];
}
// for each timestamp in json response
for(var i=0;i<raw.pulses.length;i++) {
time = new Date(raw.pulses[i][0]);
var year = time.getFullYear();
var month = time.getMonth();// 0 is january
var day = time.getDate(); // getDay() returns day of week
var hours = time.getHours();
var minutes = time.getMinutes();
// hint: its correct without 'break;'
switch(f.grouping.value) {
case 'year':
month = 0;
case 'month':
day = 0;
case 'day':
hours = 0;
case 'hour':
minutes = 0;
}
// this is a date with e.g. YYYY-MM-DD HH:00 for hour grouping or YYYY-MM-00 00:00 for month grouping
time_grouped = new Date(year,month,day,hours,minutes);
if(!data_grouped_time[time_grouped.getTime()]) {
//alert(time_grouped.getTime());
//return;
}
// add pulse count to this group time
/*
if(data_grouped_time[time_grouped.getTime()] > 0)
data_grouped_time[time_grouped.getTime()] += raw.pulses[i][1];
else
data_grouped_time[time_grouped.getTime()] = raw.pulses[i][1];
*/
data_grouped_time[raw.pulses[i][0]] = raw.pulses[i][1];
for(var i=0;i<raw.data.length;i++) {
data_grouped_time[raw.data[i][0]] = raw.data[i][1];
}
t = 1;
switch(f.grouping.value) {
@ -185,23 +151,21 @@ function raw2Energy(raw) {
// transform to proper array and energy instead of pulse count
for(var timestamp in data_grouped_time) {
if(data_grouped_time[timestamp] == 0 && typeof data_grouped_time[(timestamp*1)+(t*1)] != 'undefined')
data_grouped_time[timestamp] = data_grouped_time[(timestamp*1)+(t*1)];
if(f.info.value == 'energy')
data_grouped.push([timestamp/1000,data_grouped_time[timestamp]/raw.resolution]);
data_grouped.push(data_grouped_time[timestamp]/raw.resolution);
else {
data_grouped.push([timestamp/1000, 3600 * 1000 * data_grouped_time[timestamp] / raw.resolution / t ]);
data_grouped.push([timestamp*1, 3600 * 1000 * data_grouped_time[timestamp] / raw.resolution / t ]);
}
}
for(var i=data_grouped.length-1;i>=0;i--) {
if(data_grouped[i][1]==0 && i>0)
data_grouped[i][1] = data_grouped[i-1][1];
if(f.info.value == 'power') {
for(var i=data_grouped.length-1;i>=0;i--) {
if(data_grouped[i][1]==0 && i>0 && i<data_grouped.length-1 && data_grouped[i][0] > raw.data[0][0]*1000)
data_grouped[i][1] = data_grouped[i+1][1];
}
}
//$('#debug').append(data_grouped.toSource())
return data_grouped;
}
@ -213,19 +177,19 @@ function raw2Power(raw,moving_average) {
var power = 0;
var data_line = new Array();
if(typeof raw == 'undefined' || raw.pulses.length == 0) {
if(typeof raw == 'undefined' || raw.data.length == 0) {
return [[0,0]];
}
// for each timestamp in json response
for(var i=0;i<raw.pulses.length;i++) {
for(var i=0;i<raw.data.length;i++) {
if(last_timestamp>0) {
// difference between this and last timestamp
difference = raw.pulses[i][0] - last_timestamp;
difference = raw.data[i][0] - last_timestamp;
// power = 3600*1000/difference/resolution*count
power = Math.round(3600 * 1000/difference/raw.resolution*raw.pulses[i][1]);
power = Math.round(3600 * 1000/difference/raw.resolution*raw.data[i][1]);
// average with last power value
if(moving_average && last_power>0 && Math.abs(last_power-power)<0.25*power)
@ -237,10 +201,10 @@ function raw2Power(raw,moving_average) {
}
// array with timestamp and power
data_line.push([raw.pulses[i][0]/1000,power]);
data_line.push([raw.data[i][0],power]);
}
last_timestamp = raw.pulses[i][0];
last_timestamp = raw.data[i][0];
last_power = power;
}