diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-04-27 10:21:37 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-04-27 10:21:37 -0400 |
| commit | a3e25c85ee588304ce1f908bfa1d85b37bf11fe3 (patch) | |
| tree | 6413ecea2c11fe4c454626c1fb50ab99eb0607ca | |
| parent | 12d26ab533c652114008b18d97943dd476b66659 (diff) | |
add object filter to montage (thought it was there before?), also show latest eid
| -rw-r--r-- | www/js/MontageCtrl.js | 3 | ||||
| -rw-r--r-- | www/templates/montage.html | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index f8544f19..0cea06a2 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -587,6 +587,9 @@ angular.module('zmApp.controllers') } apiurl += "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + if (ld.objectDetectionFilter) { + apiurl +='/'+encodeURIComponent('Notes REGEXP:detected:'); + } /*if ( !(monitor.Monitor.Id in ld.lastEventCheckTimes)) { apiurl+= '/1 month'; diff --git a/www/templates/montage.html b/www/templates/montage.html index 72425c45..1ab59efa 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -197,8 +197,7 @@ {{'kMontageEventUnseenCount' | translate}} </div> <div class="row row-no-padding"> - <i class="ion-ios-calendar-outline"></i> {{'kMontageEventLatest' | translate}}: - {{humanizeTime(monitor.Monitor.lastEvent.events[0].Event.StartTime)}}<br /> + <i class="ion-ios-calendar-outline"></i> {{'kMontageEventLatest' | translate}}: eid:{{monitor.Monitor.lastEvent.events[0].Event.Id}} ({{humanizeTime(monitor.Monitor.lastEvent.events[0].Event.StartTime)}}) <br /> </div> <div class="row row-no-padding"> <i class="ion-clipboard"></i> <span ng-class="{'object-notes': monitor.Monitor.lastEvent.object}">{{monitor.Monitor.lastEvent.events[0].Event.Notes}}</span><br /> |