agp8x
/
weatherStationServer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

month-view: fixed missing last day

master
agp8x 2015-09-02 11:45:14 +02:00
parent 718552a90e
commit bb0bfa4818
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
draw.php
View File

@ -44,7 +44,7 @@ function generateChart($today,$mode,$hours=0,$dateInput){
}elseif($mode==3){ }elseif($mode==3){
$selectionStart=mktime(0,0,0,$dateInput[1],1,$dateInput[0]); $selectionStart=mktime(0,0,0,$dateInput[1],1,$dateInput[0]);
$days=date("t",$selectionStart); $days=date("t",$selectionStart);
$selectionEnd=$selectionStart+($days*24*60*60); $selectionEnd=$selectionStart+(($days)*24*60*60);
$chartname="month_".$type."_".$month.".".$year; $chartname="month_".$type."_".$month.".".$year;
$chartdistance=60*24; $chartdistance=60*24;
}else{ }else{
@ -87,7 +87,9 @@ function generateChart($today,$mode,$hours=0,$dateInput){
$data_tmp=array(); $data_tmp=array();
$data_tmp1=array(); $data_tmp1=array();
$data_tmp2=array(); $data_tmp2=array();
#var_dump(sizeof($summary));
foreach($summary as $daysum){ foreach($summary as $daysum){
#var_dump($daysum);
$mintmp= (str_replace($unit,'',$daysum[$name.'-min'])); $mintmp= (str_replace($unit,'',$daysum[$name.'-min']));
if($min[0]>$mintmp){ if($min[0]>$mintmp){
$min[0]=$mintmp; $min[0]=$mintmp;
@ -271,18 +273,24 @@ function generateChart($today,$mode,$hours=0,$dateInput){
$selectionStart+=3600; $selectionStart+=3600;
//} //}
} }
if($mode==3){
//$selectionEnd-=2*60*60*24;
}
$labels=getLabels($datas[0],$selectionStart,$selectionEnd,$chartdistance); $labels=getLabels($datas[0],$selectionStart,$selectionEnd,$chartdistance);
if($mode==3){ if($mode==3){
$selectionStart+=60*60*24; $selectionStart+=60*60*24;
$selectionEnd+=60*60*24;
$div=1; $div=1;
} }
foreach($datas as $key=>$dataset){ foreach($datas as $key=>$dataset){
#file_put_contents('data'.$type.($key+1),var_export($dataset,true));
$values=prepareData($dataset,$div,$selectionStart,$selectionEnd,$chartdistance); $values=prepareData($dataset,$div,$selectionStart,$selectionEnd,$chartdistance);
//TODO: replace $type.($key+1) with actual name //TODO: replace $type.($key+1) with actual name
$myData->addPoints($values,$type.($key+1)); $myData->addPoints($values,$type.($key+1));
#file_put_contents('val1',var_export($values,true)); #file_put_contents('val'.$type.($key+1),var_export($values,true));
} }
#file_put_contents('labels',var_export($labels,true));
$myData->addPoints($labels,"Labels"); $myData->addPoints($labels,"Labels");
#file_put_contents('label',var_export($labels,true)); #file_put_contents('label',var_export($labels,true));
$myData->setAxisName(0,typeToFullName($type).getUnit($type)); $myData->setAxisName(0,typeToFullName($type).getUnit($type));

2
recent
View File

@ -1 +1 @@
Temperatur: 13.43 C<br>Luftfeuchtigkeit: 89.5 %<br>Helligkeit: 0.01 Lux<br>Luftdruck: 982.473mbar Temperatur: 22.81 C<br>Luftfeuchtigkeit: 0 %<br>Helligkeit: 0.01 Lux<br>Luftdruck: 0mbar