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

Fix MontageReview filters

This commit is contained in:
digital-gnome 2017-12-02 10:09:19 -05:00
parent 1c201b0efe
commit 6d6b4366de
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/skins/classic/includes/functions.php
View File

@ -160,15 +160,18 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
} // end function xhtmlHeaders( $file, $title )
function getNavBarHTML($reload = null) {
parseFilter( $_REQUEST['filter'] );
$filterQuery = $_REQUEST['filter']['query'];
$versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
global $running;
global $user;
global $bandwidth_options;
global $view;
if ($reload === null) {
global $filterQuery;
if (!$filterQuery) {
parseFilter( $_REQUEST['filter'] );
$filterQuery = $_REQUEST['filter']['query'];
}
if ($reload === null) {
ob_start();
if ( $running == null )
$running = daemonCheck();

12
web/skins/classic/views/montagereview.php
View File

@ -59,6 +59,18 @@ include('_monitor_filters.php');
$filter_bar = ob_get_contents();
ob_end_clean();
$filter = array(
'Query' => array(
'terms' => array(
array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST[minTime]),
array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST[maxTime]),
)
),
);
parseFilter( $filter );
$filterQuery = $filter['query'];
// Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
// if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large)
// Note we round up just a bit on the end time as otherwise you get gaps, like 59.78 to 00 in the next second, which can give blank frames when moved through slowly.