From bb0bfa481845b28bd236f33e3f4905da3a258bad Mon Sep 17 00:00:00 2001 From: agp8x Date: Wed, 2 Sep 2015 11:45:14 +0200 Subject: [PATCH] month-view: fixed missing last day --- draw.php | 12 ++++++++++-- recent | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/draw.php b/draw.php index 4bff294..7097458 100644 --- a/draw.php +++ b/draw.php @@ -44,7 +44,7 @@ function generateChart($today,$mode,$hours=0,$dateInput){ }elseif($mode==3){ $selectionStart=mktime(0,0,0,$dateInput[1],1,$dateInput[0]); $days=date("t",$selectionStart); - $selectionEnd=$selectionStart+($days*24*60*60); + $selectionEnd=$selectionStart+(($days)*24*60*60); $chartname="month_".$type."_".$month.".".$year; $chartdistance=60*24; }else{ @@ -87,7 +87,9 @@ function generateChart($today,$mode,$hours=0,$dateInput){ $data_tmp=array(); $data_tmp1=array(); $data_tmp2=array(); + #var_dump(sizeof($summary)); foreach($summary as $daysum){ + #var_dump($daysum); $mintmp= (str_replace($unit,'',$daysum[$name.'-min'])); if($min[0]>$mintmp){ $min[0]=$mintmp; @@ -271,18 +273,24 @@ function generateChart($today,$mode,$hours=0,$dateInput){ $selectionStart+=3600; //} } + if($mode==3){ + //$selectionEnd-=2*60*60*24; + } $labels=getLabels($datas[0],$selectionStart,$selectionEnd,$chartdistance); if($mode==3){ $selectionStart+=60*60*24; + $selectionEnd+=60*60*24; $div=1; } foreach($datas as $key=>$dataset){ + #file_put_contents('data'.$type.($key+1),var_export($dataset,true)); $values=prepareData($dataset,$div,$selectionStart,$selectionEnd,$chartdistance); //TODO: replace $type.($key+1) with actual name $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"); #file_put_contents('label',var_export($labels,true)); $myData->setAxisName(0,typeToFullName($type).getUnit($type)); diff --git a/recent b/recent index b046821..2af717a 100644 --- a/recent +++ b/recent @@ -1 +1 @@ -Temperatur: 13.43 C
Luftfeuchtigkeit: 89.5 %
Helligkeit: 0.01 Lux
Luftdruck: 982.473mbar \ No newline at end of file +Temperatur: 22.81 C
Luftfeuchtigkeit: 0 %
Helligkeit: 0.01 Lux
Luftdruck: 0mbar \ No newline at end of file