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

Merge pull request #22 from digital-gnome/storageareas-navigation 

Storageareas navigation
This commit is contained in:
Isaac Connor 2017-10-03 10:18:44 -04:00 committed by GitHub
parent e8cc0d8256 9b241ee370
commit c46769495b
7 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/ajax/status.php
View File

@ -367,7 +367,7 @@ function getNearEvents() {
else else
$midSql = ''; $midSql = '';
$sql = "select E.Id as Id from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'<=':'>=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn ".($sortOrder=='asc'?'desc':'asc'); $sql = "select E.Id as Id, E.StartTime as StartTime from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'<=':'>=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn ".($sortOrder=='asc'?'desc':'asc');
$result = dbQuery( $sql ); $result = dbQuery( $sql );
while ( $id = dbFetchNext( $result, 'Id' ) ) { while ( $id = dbFetchNext( $result, 'Id' ) ) {
if ( $id == $eventId ) { if ( $id == $eventId ) {
@ -376,7 +376,7 @@ function getNearEvents() {
} }
} }
$sql = "select E.Id as Id from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'>=':'<=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn $sortOrder"; $sql = "select E.Id as Id, E.StartTime as StartTime from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'>=':'<=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn $sortOrder";
$result = dbQuery( $sql ); $result = dbQuery( $sql );
while ( $id = dbFetchNext( $result, 'Id' ) ) { while ( $id = dbFetchNext( $result, 'Id' ) ) {
if ( $id == $eventId ) { if ( $id == $eventId ) {
@ -388,6 +388,8 @@ function getNearEvents() {
$result = array( 'EventId'=>$eventId ); $result = array( 'EventId'=>$eventId );
$result['PrevEventId'] = empty($prevEvent)?0:$prevEvent['Id']; $result['PrevEventId'] = empty($prevEvent)?0:$prevEvent['Id'];
$result['NextEventId'] = empty($nextEvent)?0:$nextEvent['Id']; $result['NextEventId'] = empty($nextEvent)?0:$nextEvent['Id'];
$result['PrevEventStartTime'] = empty($prevEvent)?0:$prevEvent['StartTime'];
$result['NextEventStartTime'] = empty($nextEvent)?0:$nextEvent['StartTime'];
$result['PrevEventDefVideoPath'] = empty($prevEvent)?0:(getEventDefaultVideoPath($prevEvent)); $result['PrevEventDefVideoPath'] = empty($prevEvent)?0:(getEventDefaultVideoPath($prevEvent));
$result['NextEventDefVideoPath'] = empty($nextEvent)?0:(getEventDefaultVideoPath($nextEvent)); $result['NextEventDefVideoPath'] = empty($nextEvent)?0:(getEventDefaultVideoPath($nextEvent));
return( $result ); return( $result );

12
web/skins/classic/css/classic/views/event.css
View File

@ -106,32 +106,32 @@
#monitorStatus #monitorState { #monitorStatus #monitorState {
} }
#dvrControls { .dvrControls {
margin-top: 3px; margin-top: 3px;
margin-bottom: 2px; margin-bottom: 2px;
text-align: center; text-align: center;
} }
#dvrControls input { .dvrControls input {
height: 20px; height: 20px;
width: 28px; width: 28px;
padding-bottom: 3px; padding-bottom: 3px;
margin: 0 3px; margin: 0 3px;
} }
#dvrControls input[disabled=disabled] { .dvrControls input[disabled=disabled] {
color: #aaaaaa; color: #aaaaaa;
} }
#dvrControls input.active { .dvrControls input.active {
border: 1px solid blue; border: 1px solid blue;
} }
#dvrControls input.inactive { .dvrControls input.inactive {
border: 1px solid green; border: 1px solid green;
} }
#dvrControls input.unavail { .dvrControls input.unavail {
border: 1px solid red; border: 1px solid red;
} }

12
web/skins/classic/css/dark/views/event.css
View File

@ -89,32 +89,32 @@
#monitorStatus #monitorState { #monitorStatus #monitorState {
} }
#dvrControls { .dvrControls {
margin-top: 3px; margin-top: 3px;
margin-bottom: 2px; margin-bottom: 2px;
text-align: center; text-align: center;
} }
#dvrControls input { .dvrControls input {
height: 20px; height: 20px;
width: 28px; width: 28px;
padding-bottom: 3px; padding-bottom: 3px;
margin: 0 3px; margin: 0 3px;
} }
#dvrControls input[disabled=disabled] { .dvrControls input[disabled=disabled] {
color: #aaaaaa; color: #aaaaaa;
} }
#dvrControls input.active { .dvrControls input.active {
border: 1px solid blue; border: 1px solid blue;
} }
#dvrControls input.inactive { .dvrControls input.inactive {
border: 1px solid green; border: 1px solid green;
} }
#dvrControls input.unavail { .dvrControls input.unavail {
border: 1px solid red; border: 1px solid red;
} }

12
web/skins/classic/css/flat/views/event.css
View File

@ -98,36 +98,36 @@
#monitorStatus #monitorState { #monitorStatus #monitorState {
} }
#dvrControls { .dvrControls {
margin-top: 3px; margin-top: 3px;
margin-bottom: 2px; margin-bottom: 2px;
text-align: center; text-align: center;
} }
#dvrControls input { .dvrControls input {
padding: 10px 10px; padding: 10px 10px;
width: 50px; width: 50px;
margin: 0 3px; margin: 0 3px;
font-weight: 900; font-weight: 900;
} }
#dvrControls input[disabled=disabled] { .dvrControls input[disabled=disabled] {
color: #aaaaaa; color: #aaaaaa;
} }
#dvrControls input.active { .dvrControls input.active {
border: 0; border: 0;
background-color: #2ecc71; background-color: #2ecc71;
color: #fff; color: #fff;
} }
#dvrControls input.inactive { .dvrControls input.inactive {
border: 0; border: 0;
background-color: #e67e22; background-color: #e67e22;
color: #fff; color: #fff;
} }
#dvrControls input.unavail { .dvrControls input.unavail {
background-color: #ccc; background-color: #ccc;
border: 0; border: 0;
cursor: default; cursor: default;

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

@ -167,7 +167,17 @@ if ( $Event->DefaultVideo() ) {
var duration = <?php echo $Event->Length() ?>, startTime = '<?php echo $Event->StartTime() ?>'; var duration = <?php echo $Event->Length() ?>, startTime = '<?php echo $Event->StartTime() ?>';
addVideoTimingTrack(document.getElementById('videoobj'), LabelFormat, monitorName, duration, startTime); addVideoTimingTrack(document.getElementById('videoobj'), LabelFormat, monitorName, duration, startTime);
nearEventsQuery( eventData.Id );
vjsReplay(<?php echo (strtotime($Event->StartTime()) + $Event->Length())*1000 ?>);
</script> </script>
<p id="replayAllCountDown"></p>
<p id="dvrControlsVjs" class="dvrControls">
<input type="button" value="&lt;+" id="prevBtnVjs" title="<?php echo translate('Prev') ?>" class="active" onclick="streamPrev( true );"/>
<input type="button" value="+&gt;" id="nextBtnVjs" title="<?php echo translate('Next') ?>" class="active" onclick="streamNext( true );"/>
</p>
<?php <?php
} // end if DefaultVideo } // end if DefaultVideo
?> ?>
@ -186,7 +196,7 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
} }
} // end if stream method } // end if stream method
?> ?>
<p id="dvrControls"> <p id="dvrControls" class="dvrControls">
<input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" onclick="streamPrev( true );"/> <input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" onclick="streamPrev( true );"/>
<input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true );"/> <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true );"/>
<input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true );"/> <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true );"/>

53
web/skins/classic/views/js/event.js
View File

@ -1,5 +1,36 @@
var vid = null; var vid = null;
function vjsReplay(endTime) {
var video = videojs('videoobj').ready(function(){
var player = this;
player.on('ended', function() {
switch(replayMode.value) {
case 'none':
break;
case 'single':
player.play();
break;
case 'all':
// nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
var gapDuration = (new Date().getTime()) + (nextEventStartTime.getTime() - endTime);
var x = setInterval(function() {
var now = new Date().getTime();
var remainder = new Date(Math.round(gapDuration - now)).toISOString().substr(11,8);;
$j("#replayAllCountDown").html(remainder + " to next event.");
if (remainder < 0) {
clearInterval(x);
streamNext( true );
}
}, 1000);
break;
case 'gapless':
streamNext( true );
break;
}
});
});
}
function setButtonState( element, butClass ) { function setButtonState( element, butClass ) {
if ( element ) { if ( element ) {
element.className = butClass; element.className = butClass;
@ -164,13 +195,23 @@ function streamFastRev( action ) {
} }
function streamPrev( action ) { function streamPrev( action ) {
if ( action ) if ( action ) {
if ( vid ) {
location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
return;
}
streamReq.send( streamParms+"&command="+CMD_PREV ); streamReq.send( streamParms+"&command="+CMD_PREV );
}
} }
function streamNext( action ) { function streamNext( action ) {
if ( action ) if ( action ) {
if ( vid ) {
location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
return;
}
streamReq.send( streamParms+"&command="+CMD_NEXT ); streamReq.send( streamParms+"&command="+CMD_NEXT );
}
} }
function streamZoomIn( x, y ) { function streamZoomIn( x, y ) {
@ -251,6 +292,8 @@ function eventQuery( eventId ) {
var prevEventId = 0; var prevEventId = 0;
var nextEventId = 0; var nextEventId = 0;
var prevEventStartTime = 0;
var nextEventStartTime = 0;
var PrevEventDefVideoPath = ""; var PrevEventDefVideoPath = "";
var NextEventDefVideoPath = ""; var NextEventDefVideoPath = "";
@ -259,6 +302,8 @@ function getNearEventsResponse( respObj, respText ) {
return; return;
prevEventId = respObj.nearevents.PrevEventId; prevEventId = respObj.nearevents.PrevEventId;
nextEventId = respObj.nearevents.NextEventId; nextEventId = respObj.nearevents.NextEventId;
prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime);
nextEventStartTime = Date.parse(respObj.nearevents.NextEventStartTime);
PrevEventDefVideoPath = respObj.nearevents.PrevEventDefVideoPath; PrevEventDefVideoPath = respObj.nearevents.PrevEventDefVideoPath;
NextEventDefVideoPath = respObj.nearevents.NextEventDefVideoPath; NextEventDefVideoPath = respObj.nearevents.NextEventDefVideoPath;
@ -266,12 +311,14 @@ function getNearEventsResponse( respObj, respText ) {
if ( prevEventBtn ) prevEventBtn.disabled = !prevEventId; if ( prevEventBtn ) prevEventBtn.disabled = !prevEventId;
var nextEventBtn = $('nextEventBtn'); var nextEventBtn = $('nextEventBtn');
if ( nextEventBtn ) nextEventBtn.disabled = !nextEventId; if ( nextEventBtn ) nextEventBtn.disabled = !nextEventId;
if (prevEventId == 0) $j('#prevBtnVjs').prop('disabled', true).attr('class', 'unavail');
if (nextEventId == 0) $j('#nextBtnVjs').prop('disabled', true).attr('class', 'unavail');
} }
var nearEventsReq = new Request.JSON( { url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getNearEventsResponse } ); var nearEventsReq = new Request.JSON( { url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getNearEventsResponse } );
function nearEventsQuery( eventId ) { function nearEventsQuery( eventId ) {
var parms = "view=request&request=status&entity=nearevents&id="+eventId; var parms = "view=request&request=status&entity=nearevents&id="+eventId+filterQuery+sortQuery;
nearEventsReq.send( parms ); nearEventsReq.send( parms );
} }

4
web/skins/classic/views/js/event.js.php
View File

@ -33,8 +33,8 @@ var eventData = {
Length: '<?php echo $Event->Length() ?>' Length: '<?php echo $Event->Length() ?>'
}; };
var filterQuery = '<?php echo isset($filterQuery)?validJsStr($filterQuery):'' ?>'; var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
var sortQuery = '<?php echo isset($sortQuery)?validJsStr($sortQuery):'' ?>'; var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
var scale = <?php echo $scale ?>; var scale = <?php echo $scale ?>;
var canEditEvents = <?php echo canEdit( 'Events' )?'true':'false' ?>; var canEditEvents = <?php echo canEdit( 'Events' )?'true':'false' ?>;