X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/93b43a8a877213fd5973504dd4aa083a657d5aa0..9970ba972084ebf8e70b5e33e48d7181ac86ee35:/web/index.php diff --git a/web/index.php b/web/index.php index d513251..37251e6 100644 --- a/web/index.php +++ b/web/index.php @@ -2,14 +2,28 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="GENERATOR" content="Mozilla/4.72 [cp1251] (X11; U; Linux 2.2.12-20smp i686) [Netscape]"> + <meta http-equiv="Refresh" content="60"> + <meta name="GENERATOR" content="Mozilla/4.72 (X11; U; Linux 2.2.12-20smp i686) [Netscape]"> <title>WeatherMon (ÐоÑледние 24 ÑаÑа)</title> <link rel="icon" href="favicon.png" /> + <style type="text/css"> + a:visited { text-decoration: none; color:darkblue; } + a:link { text-decoration: none; color:blue; } + a:hover { text-decoration: none; color:navy; } + .header { font-size: 16; float: left; margin: 10px;} + .timestamp { font-size: 16; margin: 10px;} + .value { font-size: 60; margin: 10px; } + .block { float: left; margin: 20px; } + .container { clear: both; } + .footer { clear: both; margin: 20px; font-size: 20; } + </style> </head> -<body text="black" bgcolor="silver" link="blue" vlink="#000080" alink="#FF0000"> +<body> +<div class="container"> <?php include('config_local.php'); +include('units.php'); if (! ($db = new PDO("mysql:host=$mysql_host;port=$mysql_port;dbname=$mysql_schema",$mysql_user,$mysql_pwd,array( PDO::ATTR_PERSISTENT => false)))) { die($err); @@ -25,22 +39,65 @@ $q = $db -> prepare( where v.timestamp>adddate(now(), -1) and v.sensor_id=s.id - and s.st_id=p.st_id' + and s.st_id=p.st_id + and p.id>=0 + order by s_description,st_description' ); $q -> execute(); while ($row = $q -> fetch(PDO::FETCH_ASSOC)) { - echo '<h3 align="center">'.$row['s_description'].'/'.$row['st_description'].'</h3>'; + echo '<div class="block">'; + echo '<div class="header">'.$row['s_description'].'/'.$row['st_description'].'</div>'; + +$ql = $db -> prepare( + ' + SELECT unix_timestamp(timestamp) timestamp,DATE_FORMAT(timestamp,"%H:%i") printable,value + FROM + meteo.sensor_values + WHERE + sensor_id='.$row['sensor_id'].' and parameter_id='.$row['param_id'].' and timestamp>addtime(now(), -3600) + ORDER BY + timestamp desc + ' + ); + +$ql -> execute(); + +$printable_ts = "?"; +$value = "?"; + +if ($rowl = $ql -> fetch(PDO::FETCH_ASSOC)) { + + $timestamp = $rowl['timestamp']; + $printable_ts = $rowl['printable']; + $value = $rowl['value']; + + $units = get_unit($db,$row['param_id']); + $from_unit = $units['from']; + $to_unit = $units['to']; + $param_unit = $units['name']; + + $val = convert_unit($db,$value,$from_unit,$to_unit); + +} + +echo '<div class="timestamp">'.$printable_ts.'</div>'; +echo '<div class="value">'.$val.' '.$param_unit.'</div>'; ?> -<center><img src="image.php?sensor=<?php echo $row['sensor_id']; ?>¶m=<?php echo $row['param_id']?>&type=last24"></center> +<div class="graph"><img src="image.php?sensor=<?php echo $row['sensor_id']; ?>¶m=<?php echo $row['param_id']?>&type=last24small"></div> <?php +echo "</div>"; + } ?> +</div> +<div class="footer"> <a href="archive.php">ÐÑÑ Ð¸Ð²Ð½Ñе даннÑе</a> -<br> +<a href="graphs.php">ÐодÑобнÑе гÑаÑики</a> <a href="setup.php">ÐаÑÑÑойки</a> +</div> </body> \ No newline at end of file