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

fixes issue #5: remove links to pages in the future, keep those to future days in the current month anyways

highcharts
agp8x 2014-11-29 12:16:49 +01:00
parent 4eebfe79ff
commit 5661298dc5
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.default.php
View File

@ -7,3 +7,5 @@ $database = array(
'database' => "temp", 'database' => "temp",
); );
$start_year_of_recordings=2012;

53
function.php
View File

@ -314,9 +314,13 @@ function drawChart($myData,$target,$date,$type){
$myPicture->Render($target); $myPicture->Render($target);
} }
function calendarDay($day,$year,$month,$selection){ function calendarDay($day,$year,$month,$selection, $future){
$baselink="&year=".$year."&month=".$month."&day=".$day."'"; $baselink="&year=".$year."&month=".$month."&day=".$day."'";
return tempLink($baselink,$day,($selection=="temp")).humiLink($baselink,($selection=="humi")).ambiLink($baselink,($selection=="ambi")).baroLink($baselink,($selection=="baro")); if($future){
return $day." (H A B)";
}else{
return tempLink($baselink,$day,($selection=="temp")).humiLink($baselink,($selection=="humi")).ambiLink($baselink,($selection=="ambi")).baroLink($baselink,($selection=="baro"));
}
} }
function tempLink($baselink,$day,$selected=false){ function tempLink($baselink,$day,$selected=false){
$link="<a href='?type=temp".$baselink; $link="<a href='?type=temp".$baselink;
@ -347,6 +351,8 @@ function baroLink($baselink,$selected=false){
return $link." >B</a>)"; return $link." >B</a>)";
} }
function calendarNav($month,$year){ function calendarNav($month,$year){
global $start_year_of_recordings;
$prevMonth=$prevYear=$nextMonth=$nextYear=0; $prevMonth=$prevYear=$nextMonth=$nextYear=0;
if($month==12){ if($month==12){
$prevMonth=$month-1; $prevMonth=$month-1;
@ -364,7 +370,27 @@ function calendarNav($month,$year){
$nextMonth=$month+1; $nextMonth=$month+1;
$nextYear=$year; $nextYear=$year;
} }
return "<div id='calendarNav'>\n\t<a href='?mode=month&amp;year=".$prevYear."&amp;month=".$prevMonth."'>&lt;&lt;</a>&nbsp; <a href='?mode=month&amp;year=".$year."&amp;month=".$month."'>".$month."</a> &nbsp; <a href='?mode=month&amp;year=".$nextYear."&amp;month=".$nextMonth."'>&gt;&gt;</a>\n</div>\n"; $show['prev']=$prevYear >= $start_year_of_recordings;
$show['next']=! isFuture(array(date("j"),date("n"),date("Y")), 0, $nextMonth, $nextYear);
$links="<div id='calendarNav'>\n\t";
if ($show['prev']){
$links.="<a href='?mode=month&amp;year=".$prevYear."&amp;month=".$prevMonth."'>&lt;&lt; (".monthToName($prevMonth).")</a>";
}else{
$links.=monthToName($prevMonth);
}
$links.="&nbsp; <a href='?mode=month&amp;year=".$year."&amp;month=".$month."'>".monthToName($month)."</a> &nbsp; ";
if ($show['next']){
$links.="<a href='?mode=month&amp;year=".$nextYear."&amp;month=".$nextMonth."'>&gt;&gt; (".monthToName($nextMonth).")</a>";
}else{
$links.=monthToName($nextMonth);
}
$links.="\n</div>\n";
return $links;
}
function monthToName($month){
$dateObj = DateTime::createFromFormat('!m', $month);
$monthName = $dateObj->format('F');
return $monthName;
} }
function prependZero($number){ function prependZero($number){
return ($number<10)? "0".$number : $number; return ($number<10)? "0".$number : $number;
@ -393,7 +419,8 @@ function drawCalendar($date,$type){
}else{ }else{
$calendar.="\t\t<td>"; $calendar.="\t\t<td>";
} }
$calendar.=calendarDay($day,$year,$month,($day==$selectedDay)? $type : false); $future=isFuture($today, $day, $month, $year, false);
$calendar.=calendarDay($day,$year,$month,($day==$selectedDay)? $type : false, $future);
$day++; $day++;
}else{ }else{
$calendar.="\t\t<td> &nbsp;"; $calendar.="\t\t<td> &nbsp;";
@ -406,6 +433,24 @@ function drawCalendar($date,$type){
Letzte: <a href='?mode=last&amp;num=24&amp;type=temp'>24h</a> <a href='?mode=last&amp;num=48&amp;type=temp'>48h</a> <a href='?mode=last&amp;num=96&amp;type=temp'>96h</a> &nbsp;&nbsp;&nbsp;<a href='?'>Temperatur Heute</a></div>"; Letzte: <a href='?mode=last&amp;num=24&amp;type=temp'>24h</a> <a href='?mode=last&amp;num=48&amp;type=temp'>48h</a> <a href='?mode=last&amp;num=96&amp;type=temp'>96h</a> &nbsp;&nbsp;&nbsp;<a href='?'>Temperatur Heute</a></div>";
return $calendar; return $calendar;
} }
function isFuture($today, $day, $month, $year, $overwriteDay=true){
# check year
if ($today[2] < $year){
return true;
}
if ($today[2] == $year){
# check month
if ($today[1] < $month){
return true;
}
if($today[1] == $month){
# check day
return $today[0] < $day && $overwriteDay;
}
}
# base case
return false;
}
function typeToSensorCount($type){ function typeToSensorCount($type){
switch($type){ switch($type){