X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/e4e1557426f8e5ca10ca616140528939d86426cd..a26fd989812acc9c3b91360a12a2685589acd942:/web/index.php diff --git a/web/index.php b/web/index.php index dfc7450..92a8e8e 100644 --- a/web/index.php +++ b/web/index.php @@ -2,19 +2,42 @@ + WeatherMon (Последние 24 часа) - + +
false)))) { die($err); @@ -22,6 +45,16 @@ if (! ($db = new PDO("mysql:host=$mysql_host;port=$mysql_port;dbname=$mysql_sche $db -> exec('SET CHARACTER SET utf8'); +if (!$local_net) { + + $filter = ' and s.is_public=1'; + +} else { + + $filter = ''; + +} + $q = $db -> prepare( 'select distinct v.sensor_id,s.s_description,p.id as param_id,p.st_description @@ -29,25 +62,69 @@ $q = $db -> prepare( sensor_values v,st_parameters p,sensors s where v.timestamp>adddate(now(), -1) - and v.sensor_id=s.id + and v.sensor_id=s.id + and v.parameter_id=p.id and s.st_id=p.st_id - and p.id>=0 + and p.id>=0'.$filter.' order by s_description,st_description' ); $q -> execute(); while ($row = $q -> fetch(PDO::FETCH_ASSOC)) { - echo '

'.$row['s_description'].'/'.$row['st_description'].'

'; + echo '
'; + echo '
'.$row['s_description'].'/'.$row['st_description'].'
'; + +$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 = "?"; +$val = "?"; + +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); + +} + +if ($printable_ts != '?') { + echo '
'.$printable_ts.'
'; + echo '
'.$val.' '.$param_unit.'
'; +} ?> -
+
"; + } ?> +
+
Архивные данные -
+Подробные графики Настройки +
\ No newline at end of file