From 3832eafc4f7ef2e5944971f09d2e865a5e2b30f4 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 7 Jan 2018 08:40:22 -0500 Subject: #499 - load previously saved mon and intlist after registration as "on registration" happens every time --- www/js/EventServer.js | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) (limited to 'www/js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index eba9fc05..18dd482e 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -512,15 +512,31 @@ angular.module('zmApp.controllers') NVRDataModel.getMonitors() .then (function(succ) { var mon = succ; - for (var i = 0; i < mon.length; i++) { - monstring = monstring + mon[i].Monitor.Id + ","; - intstring = intstring + '0,'; + + if (ld.eventServerMonitors !='' ) { + // load previous monlist and intlist + // so we don't overwrite + monstring = ld.eventServerMonitors; + intlist = ld.eventServerInterval; + NVRDataModel.debug ("loading saved monitor list and interval of "+monstring+">>"+intlist); + + } + + else { // build new list + + for (var i = 0; i < mon.length; i++) { + monstring = monstring + mon[i].Monitor.Id + ","; + intstring = intstring + '0,'; + } + if (monstring.charAt(monstring.length - 1) == ',') + monstring = monstring.substr(0, monstring.length - 1); + + if (intstring.charAt(intstring.length - 1) == ',') + intstring = intstring.substr(0, intstring.length - 1); + } - if (monstring.charAt(monstring.length - 1) == ',') - monstring = monstring.substr(0, monstring.length - 1); - if (intstring.charAt(intstring.length - 1) == ',') - intstring = intstring.substr(0, intstring.length - 1); + //console.log ("WUTPUT SENDING REG WITH "+monstring); -- cgit v1.2.3