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

move more eventcounting stuff to console.php.

This commit is contained in:
Isaac Connor 2016-05-06 14:38:08 -04:00
parent 297f27af8c
commit 829202b42a
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,20 +177,6 @@ $cycleHeight = $maxHeight;
$eventsView = ZM_WEB_EVENTS_VIEW; $eventsView = ZM_WEB_EVENTS_VIEW;
$eventsWindow = 'zm'.ucfirst(ZM_WEB_EVENTS_VIEW); $eventsWindow = 'zm'.ucfirst(ZM_WEB_EVENTS_VIEW);
$eventCount = 0;
for ( $i = 0; $i < count($eventCounts); $i++ )
{
$eventCounts[$i]['total'] = 0;
}
$zoneCount = 0;
foreach( $displayMonitors as $monitor )
{
for ( $i = 0; $i < count($eventCounts); $i++ )
{
$eventCounts[$i]['total'] += $monitor['EventCount'.$i];
}
$zoneCount += $monitor['ZoneCount'];
}
$versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':''; $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';

11
web/skins/classic/views/console.php
View File

@ -27,6 +27,7 @@ $eventCounts = array(
"terms" => array( "terms" => array(
) )
), ),
"total" => 0,
), ),
array( array(
"title" => translate('Hour'), "title" => translate('Hour'),
@ -35,6 +36,7 @@ $eventCounts = array(
array( "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ), array( "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
) )
), ),
"total" => 0,
), ),
array( array(
"title" => translate('Day'), "title" => translate('Day'),
@ -43,6 +45,7 @@ $eventCounts = array(
array( "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ), array( "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
) )
), ),
"total" => 0,
), ),
array( array(
"title" => translate('Week'), "title" => translate('Week'),
@ -51,6 +54,7 @@ $eventCounts = array(
array( "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ), array( "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
) )
), ),
"total" => 0,
), ),
array( array(
"title" => translate('Month'), "title" => translate('Month'),
@ -59,6 +63,7 @@ $eventCounts = array(
array( "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ), array( "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
) )
), ),
"total" => 0,
), ),
array( array(
"title" => translate('Archived'), "title" => translate('Archived'),
@ -67,6 +72,7 @@ $eventCounts = array(
array( "attr" => "Archived", "op" => "=", "val" => "1" ), array( "attr" => "Archived", "op" => "=", "val" => "1" ),
) )
), ),
"total" => 0,
), ),
); );
@ -74,6 +80,7 @@ $displayMonitors = NULL;
# Also populates displayMonitors # Also populates displayMonitors
$navbar = getNavBarHTML(); $navbar = getNavBarHTML();
$zoneCount = 0;
foreach( $displayMonitors as $monitor ) { foreach( $displayMonitors as $monitor ) {
$monitor['zmc'] = zmcStatus( $monitor ); $monitor['zmc'] = zmcStatus( $monitor );
@ -89,6 +96,10 @@ foreach( $displayMonitors as $monitor ) {
$sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?"; $sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?";
$counts = dbFetchOne( $sql, NULL, array($monitor['Id']) ); $counts = dbFetchOne( $sql, NULL, array($monitor['Id']) );
if ( $counts ) $monitor = array_merge( $monitor, $counts ); if ( $counts ) $monitor = array_merge( $monitor, $counts );
for ( $i = 0; $i < count($eventCounts); $i++ ) {
$eventCounts[$i]['total'] += $monitor['EventCount'.$i];
}
$zoneCount += $monitor['ZoneCount'];
} }
noCacheHeaders(); noCacheHeaders();