diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
| commit | d8953a069365e51000aa0e86e38bdd6bd251f2f4 (patch) | |
| tree | bc94c4e174e08d9462cdb99f5cd922e3fe948f8f /www/js/TimelineCtrl.js | |
| parent | f13ae545e81fee9663a9a06177602efab5cfbdf0 (diff) | |
#933 add back spaces, 1.32 breaks. Make encoding optional in dev settings
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 9de37c18..82db8b59 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -783,9 +783,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // FIXME: totally ignoring event pages - hoping it wont be more than 100 or 150 whatever // the events per page limit is. Why? laziness. // - var completedEvents = ld.apiurl + '/events/index/'+'EndTime>=:' + from; + var completedEvents = ld.apiurl + '/events/index/'+'EndTime >=:' + from; // we can add alarmCount as this is really for completed events - completedEvents = completedEvents + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + completedEvents = completedEvents + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); if (ld.objectDetectionFilter) { completedEvents = completedEvents + '/'+ 'Notes REGEXP:"detected:"'; @@ -800,7 +800,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var st = moment(lastTimeForEvent).tz(NVR.getTimeZoneNow()); st = st.subtract(10, 'minutes').locale('en').format("YYYY-MM-DD HH:mm:ss"); - var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime>=:' + st + '/EndTime=:.json'+'?'+$rootScope.authSession; + var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime >=:' + st + '/EndTime =:.json'+'?'+$rootScope.authSession; //NVR.debug("Getting incremental events using: " + completedEvents); NVR.debug("Completed events API:" + completedEvents); |