Kanäle addieren
auto reload (5s)
@@ -394,16 +364,12 @@ function getData() {
$('#debug').append('
json');
// load json data with given time window
- $.getJSON("../backend/index.php/data/" + myUUID, function(j){
+ $.getJSON("../backend/index.php/data/" + myUUID + '/format/json/from/'+myWindowStart+'/to/'+myWindowEnd, function(j){
data = j;
$('#debug').empty().append(data.toSource());
// then show/reload the chart
//if(data.channels.length > 0 && data.channels[0].pulses.length > 0)
- if(f.info.value == 'infos')
- showInfos()
- else
showChart();
-
$('#loading').empty();
});
@@ -448,83 +414,19 @@ function showChart() {
jqOptions.series.push({label:data.channels[i]['description']});
}
- // different formatStrings for different grouping times
- switch(f.grouping.value) {
- case 'year':
- EformatString = '%Y';
- break;
- case 'month':
- EformatString = '%m/%Y';
- break;
- case 'day':
- EformatString = '%d.%m.%y';
- break;
- case 'hour':
- EformatString = '%d.%m.%y %H:%M';
- break;
- case 'minute':
- EformatString = '%d.%m.%y %H:%M';
- break;
- default:
- EformatString = '%d.%m.%y %H:%M:%S';
- }
+ EformatString = '%d.%m.%y %H:%M';
- // power
- if(f.info.value == 'power') {
-
- // for each channel in json response
- for(var i=0;i
');
- switch(f.grouping.value) {
- case 'year':
- iteratorDate.setYear(iteratorDate.getYear()+1);
- break;
- case 'month':
- iteratorDate.setMonth(iteratorDate.getMonth()+1);
- break;
- case 'day':
- iteratorDate.setDate(iteratorDate.getDate()+1);
- break;
- case 'hour':
- iteratorDate.setHours(iteratorDate.getHours()+1);
- break;
- case 'minute':
- iteratorDate.setMinutes(iteratorDate.getMinutes()+1);
- break;
- default:
- return empty_array;
- }
+ iteratorDate.setDate(iteratorDate.getDate()+1);
// very bad bug: infinity loop for summer winter change
if(i==750) return empty_array;
@@ -74,26 +56,12 @@ function calcMyWindowStart() {
var hours = myWindowStart.getHours();
var minutes = myWindowStart.getMinutes();
- var windowSize = f.window.value.substring(0,1);
- var windowInterval = f.window.value.substring(1);
+ //var windowSize = f.window.value.substring(0,1);
+ var windowSize = "1";
+ //var windowInterval = f.window.value.substring(1);
+ var windowInterval = "MONTH"; // we want to display 1 day (for now)
- switch(windowInterval) {
- case 'YEAR':
- myWindowStart.setYear(myWindowStart.getFullYear()-windowSize);
- break;
- case 'MONTH':
myWindowStart.setMonth(myWindowStart.getMonth()-windowSize);
- break;
- case 'DAY':
- myWindowStart.setDate(myWindowStart.getDate()-windowSize);
- break;
- case 'HOUR':
- myWindowStart.setHours(myWindowStart.getHours()-windowSize);
- break;
- case 'MINUTE':
- myWindowStart.setMinutes(myWindowStart.getMinutes()-windowSize);
- break;
- }
return myWindowStart.getTime();
}
@@ -108,109 +76,8 @@ function getGroupedTimestamp(timestamp) {
var hours = time.getHours();
var minutes = time.getMinutes();
- // hint: its correct without break;
- switch(f.grouping.value) {
- case 'year':
- month = 1;
- case 'month':
- day = 1;
- case 'day':
hours = 0;
- case 'hour':
- minutes = 0;
- }
return (new Date(year,month,day,hours,minutes)).getTime();
}
-
-function raw2Energy(raw) {
-
- var data_grouped_time = getEmptyGroupArray();
- var data_grouped = new Array();
-
- if(f.grouping.value == '')
- return;
-
- if(raw.data.length == 0) {
- return [[0,0]];
- }
-
- // for each timestamp in json response
- for(var i=0;i=0;i--) {
- if(data_grouped[i][1]==0 && i>0 && i raw.data[0][0]*1000)
- data_grouped[i][1] = data_grouped[i+1][1];
- }
- }
-
- return data_grouped;
-}
-
-
-function raw2Power(raw,moving_average) {
-
- var last_timestamp = 0;
- var last_power = 0;
- var power = 0;
- var data_line = new Array();
-
- if(typeof raw == 'undefined' || raw.data.length == 0) {
- return [[0,0]];
- }
-
- // for each timestamp in json response
- for(var i=0;i0) {
-
- // difference between this and last timestamp
- difference = raw.data[i][0] - last_timestamp;
-
- // power = 3600*1000/difference/resolution*count
- 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)
- power = (power + last_power)/2;
-
- // additional value for last_power > power*1.25
- if(last_power > power*1.25 && last_timestamp) {
- data_line.push([last_timestamp,power]);
- }
-
- // array with timestamp and power
- data_line.push([raw.data[i][0],power]);
- }
-
- last_timestamp = raw.data[i][0];
- last_power = power;
- }
-
- // return array with power@timestamps
- return data_line;
-}
\ No newline at end of file