diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-08-23 10:57:29 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-08-23 10:57:29 -0400 |
| commit | 9e8c42bdc35231b5adfcd37a2cb2bf71fc5c5243 (patch) | |
| tree | d408a6740c43d3ad85defa93cfc489d1b3ddb8f5 /www/js/NVR.js | |
| parent | f43779328a21e50acf4b716b77cbae1dd6bba812 (diff) | |
#848 fix time filter logic, also make object detection filter selectable in timeline, just like in Events
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index b86c4676..3f11869b 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -3265,9 +3265,9 @@ angular.module('zmApp.controllers') if (monitorId != 0) myurl = myurl + "/MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/StartTime >=:" + startTime; + myurl = myurl + "/StartTime <=:" + endTime; if (endTime) - myurl = myurl + "/EndTime <=:" + endTime; + myurl = myurl + "/EndTime >=:" + startTime; myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); @@ -3354,9 +3354,9 @@ angular.module('zmApp.controllers') if (monitorId != 0) myurl = myurl + "/MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/StartTime >=:" + startTime; + myurl = myurl + "/StartTime <=:" + endTime; if (endTime) - myurl = myurl + "/EndTime <=:" + endTime; + myurl = myurl + "/EndTime >=:" + startTime; myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); @@ -3374,6 +3374,7 @@ angular.module('zmApp.controllers') debug("getEvents:" + myurl); + //console.log ("LOG: "+myurl); // Simulated data // myurl = "https://api.myjson.com/bins/4jx44.json"; @@ -3388,6 +3389,7 @@ angular.module('zmApp.controllers') myevents = data; + console.log (myevents); d.resolve(myevents); |