ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further refinements to zooming etc. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1546 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-11-04 17:16:22 +00:00
parent 107c930732
commit b1f17c365a
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/zm_html_view_timeline.php
View File

@ -162,12 +162,28 @@ elseif ( isset($min_time) && isset($max_time) )
$mid_time = date( "Y-m-d H:i:s", $mid_time_t ); $mid_time = date( "Y-m-d H:i:s", $mid_time_t );
} }
if ( !isset($min_time) || !isset($max_time) ) if ( isset($min_time) && isset($max_time) )
{
$temp_min_time = $temp_max_time = $temp_expandable = false;
extractDatetimeRange( $tree, $temp_min_time, $temp_max_time, $temp_expandable );
$filter_sql = parseTreeToSQL( $tree );
//echo $filter_sql;
//echo '<br>';
if ( $filter_sql )
{
$filter_sql = " and $filter_sql";
$events_sql .= $filter_sql;
}
}
else
{ {
//$filter_query = parseTreeToQuery( $tree ); //$filter_query = parseTreeToQuery( $tree );
//echo $filter_query; //echo $filter_query;
//echo '<br>'; //echo '<br>';
$filter_sql = parseTreeToSQL( $tree ); $filter_sql = parseTreeToSQL( $tree );
$temp_min_time = $temp_max_time = $temp_expandable = false;
extractDatetimeRange( $tree, $temp_min_time, $temp_max_time, $temp_expandable );
//echo $filter_sql; //echo $filter_sql;
//echo '<br>'; //echo '<br>';
@ -200,8 +216,6 @@ if ( !isset($min_time) || !isset($max_time) )
$mid_time = date( "Y-m-d H:i:s", $mid_time_t ); $mid_time = date( "Y-m-d H:i:s", $mid_time_t );
} }
$temp_min_time = $temp_max_time = $temp_expandable = false;
extractDatetimeRange( $tree, $temp_min_time, $temp_max_time, $temp_expandable );
//echo "MnT: $temp_min_time, MxT: $temp_max_time, ExP: $temp_expandable<br>"; //echo "MnT: $temp_min_time, MxT: $temp_max_time, ExP: $temp_expandable<br>";
appendDatetimeRange( $tree, $min_time, $max_time ); appendDatetimeRange( $tree, $min_time, $max_time );
@ -1146,9 +1160,9 @@ div.zoom {
<div id="ImageNav"> <div id="ImageNav">
<div id="Image"><img id="ImageSrc" src="graphics/spacer.gif" height="<?= $chart['image']['height'] ?>"/></div> <div id="Image"><img id="ImageSrc" src="graphics/spacer.gif" height="<?= $chart['image']['height'] ?>"/></div>
<div id="RightNav"> <div id="RightNav">
<a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&mid_time=<?= $min_time ?>&range=<?= $range ?>">&lt;&lt;</a>&nbsp;&nbsp; <a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&mid_time=<?= urlencode($min_time) ?>&range=<?= $range ?>">&lt;&lt;</a>&nbsp;&nbsp;
<a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&mid_time=<?= $mid_time ?>&range=<?= (int)($range*$maj_x_scale['zoomout']) ?>">-</a>&nbsp;&nbsp; <a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&mid_time=<?= urlencode($mid_time) ?>&range=<?= (int)($range*$maj_x_scale['zoomout']) ?>">-</a>&nbsp;&nbsp;
<a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&min_time=<?= $mid_time ?>&range=<?= $range ?>">&gt;&gt;</a> <a href="<?= $PHP_SELF ?>?view=<?= $view ?><?= $filter_query ?>&min_time=<?= urlencode($mid_time) ?>&range=<?= $range ?>">&gt;&gt;</a>
</div> </div>
<div id="ImageText">No Event</div> <div id="ImageText">No Event</div>
<div id="Key"> <div id="Key">