diff --git a/definitions/en_CA.js b/definitions/en_CA.js index 7a553982..008aed06 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -7364,7 +7364,8 @@ module.exports = function(s,config,lang){
- + + @@ -7396,6 +7397,11 @@ module.exports = function(s,config,lang){ "class": "warning toggle-live-grid-monitor-logs", "icon": "exclamation-triangle" }, + "Show Logs": { + "label": lang['Toggle Substream'], + "class": "warning toggle-monitor-substream", + "icon": "eye" + }, "Control": { "label": lang['Control'], "class": "default toggle-live-grid-monitor-ptz-controls", diff --git a/libs/events/utils.js b/libs/events/utils.js index 2277e4d9..0522c0ef 100644 --- a/libs/events/utils.js +++ b/libs/events/utils.js @@ -646,8 +646,7 @@ module.exports = (s,config,lang,app,io) => { }) const eventDetails = d.details const passedEventFilters = checkEventFilters(d,monitorDetails,filter) - if(!passedEventFilters)return - const detailString = JSON.stringify(eventDetails) + if(!passedEventFilters)return; const eventTime = new Date() if( filter.addToMotionCounter && diff --git a/web/assets/js/bs5.liveGrid.js b/web/assets/js/bs5.liveGrid.js index 55dba920..fcbf58b9 100644 --- a/web/assets/js/bs5.liveGrid.js +++ b/web/assets/js/bs5.liveGrid.js @@ -900,6 +900,10 @@ $(document).ready(function(e){ var monitorId = $(this).parents('[data-mid]').attr('data-mid') popOutMonitor(monitorId) }) + .on('click','.toggle-monitor-substream',function(){ + var monitorId = $(this).parents('[data-mid]').attr('data-mid') + toggleSubStream(monitorId) + }) .on('click','.run-live-grid-monitor-ptz',function(){ var el = $(this) var monitorId = el.parents('[data-mid]').attr('data-mid') diff --git a/web/assets/js/bs5.monitorsUtils.js b/web/assets/js/bs5.monitorsUtils.js index fea05406..64efa34d 100644 --- a/web/assets/js/bs5.monitorsUtils.js +++ b/web/assets/js/bs5.monitorsUtils.js @@ -170,7 +170,12 @@ function runTestDetectionTrigger(monitorId,callback){ if(callback)callback() }) } - +function toggleSubStream(monitorId,callback){ + $.getJSON(getApiPrefix() + '/toggleSubstream/'+$user.ke+'/'+monitorId,function(d){ + debugLog(d) + if(callback)callback() + }) +} function playAudioAlert(){ var fileName = $user.details.audio_alert if(fileName && window.soundAlarmed !== true){