diff --git a/README.md b/README.md index 73c89a5..892fa6d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ #WeatherstationServer ##Overview PHP, CSS, psChart, pChart, DBLib + +# TODO + +* http://www.clemensklug.de/temp/new/?mode=month&year=2014&month=5 + * wrong min_temp | 04.05.14 diff --git a/function.php b/function.php index e0ce184..1d5259a 100644 --- a/function.php +++ b/function.php @@ -57,6 +57,7 @@ function logStats($datas,$type,$alt=false,$outlineAlt=0,$mode=1){ $left=80; $max=getMax($type); for($num=0;$num<=$max;$num++){ + $printValues=true; if($num>0){ $left+=300; } @@ -64,23 +65,32 @@ function logStats($datas,$type,$alt=false,$outlineAlt=0,$mode=1){ $unit=getUnit($type); $stat=$timePoints=array(); if($alt===false){ - $stat=dataStat($datas[$num],$type); - $timePoints=outLinedLogPoints($datas[$num]); + if(is_array($data[$num])){ + $stat=dataStat($datas[$num],$type); + $timePoints=outLinedLogPoints($datas[$num]); + }else{ + $printValues=false; + } }else{ $stat=$alt[$num]; $timePoints=$outlineAlt[$num]; + $printValues = $stat['min'][1]!=0; } $output.="
\n"; $output.=$type.($num+1)."
\n"; - $output.="minimum: ".$stat['min'][0]." @ ".ttdls((int) $stat['min'][1],$mode)."
\n"; - $output.="maximum: ".$stat['max'][0]." @ ".ttdls((int) $stat['max'][1],$mode)."
\n"; - $output.="average: ".$stat['avg']." @ ".ttdls2($stat['min'][1],$mode)."
\n"; - $output.="Logpoints: ".$stat['size']."      ".ttdls3((int) $stat['min'][1],$mode); - $output.="


"; - if($mode==1){ - foreach($timePoints as $point){ - $output.=date("H:i:s",(int) $point[1])." - ".$point[0]/$div.$unit."
\n"; + if($printValues){ + $output.="minimum: ".$stat['min'][0]." @ ".ttdls((int) $stat['min'][1],$mode)."
\n"; + $output.="maximum: ".$stat['max'][0]." @ ".ttdls((int) $stat['max'][1],$mode)."
\n"; + $output.="average: ".$stat['avg']." @ ".ttdls2($stat['min'][1],$mode)."
\n"; + $output.="Logpoints: ".$stat['size']."      ".ttdls3((int) $stat['min'][1],$mode); + $output.="


"; + if($mode==1){ + foreach($timePoints as $point){ + $output.=date("H:i:s",(int) $point[1])." - ".$point[0]/$div.$unit."
\n"; + } } + }else{ + $output.="Keine Daten
"; } $output.="\n"; } diff --git a/index.php b/index.php index d71e5b5..657fc0a 100644 --- a/index.php +++ b/index.php @@ -51,7 +51,7 @@ if(isset($_GET['mode']) && $_GET['mode']=='last'){ //mode: day $mode=1; }else{ - $html.="No/invalid type, default to temperature/today"; + $html.="Keine weiteren Angaben: Heutige Temperatur wird angezeigt"; $mode=1; $type="temp"; }