From 4f2562397da366f01ef8c654fdab3c664fd11d58 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 16 Oct 2018 08:48:00 -0400
Subject: fix for search lock with text in events

---
 www/js/EventCtrl.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 90b615a2..e350f512 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2745,11 +2745,13 @@ angular.module('zmApp.controllers')
         NVRDataModel.debug("No more - We have a total of " + maxEventsPage + " and are at page=" + currEventsPage);
 
         console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding");
+        $ionicLoading.hide();
         return;
       }
 
       currEventsPage++;
       if (!enableLoadMore) {
+        $ionicLoading.hide();
         moreEvents = false; // Don't ion-scroll till enableLoadMore is true;
         $scope.$broadcast('scroll.infiniteScrollComplete');
 
@@ -2759,11 +2761,15 @@ angular.module('zmApp.controllers')
 
       var loadingStr = "";
       if ($scope.search.text != "") {
-        var toastStr = $translate.instant('kToastSearchingPage') + currEventsPage;
+    
+        var toastStr = $translate.instant('kPleaseWait') +'...'+ currEventsPage;
+        console.log ("SHOW " + toastStr );
         $ionicLoading.show({
           maxwidth: 100,
+          noBackdrop:true,
           scope: $scope,
-          template: '<button class="button button-clear icon-left ion-close-circled button-text-wrap" ng-click="cancelSearch()" >' + toastStr + '</button>'
+          template: toastStr,
+         // template: '<button class="button button-clear icon-left ion-close-circled button-text-wrap" ng-click="cancelSearch()" >' + toastStr + '</button>'
         });
 
         loadingStr = "none";
@@ -2854,6 +2860,7 @@ angular.module('zmApp.controllers')
           function (error) {
             // console.log("*** No More Events to Load, Stop Infinite Scroll ****");
             moreEvents = false;
+            $ionicLoading.hide();
             $scope.$broadcast('scroll.infiniteScrollComplete');
 
           });
-- 
cgit v1.2.3


From a84ed1903f9ebd2d7e0c31543fe90e222126c668 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 16 Oct 2018 14:52:49 -0400
Subject: menu option to toggle event summary (iPhoneX ui interference)

---
 www/js/EventCtrl.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index e350f512..b2caf1d5 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1814,11 +1814,25 @@ angular.module('zmApp.controllers')
     // data for events ranges summaries using the consolveEvents facility of ZM
     //--------------------------------------------------------------------------
 
+
+    $scope.footerToggle = function() {
+
+      if ($scope.footerState == ionPullUpFooterState.EXPANDED)
+        $scope.footerCollapse();
+      else 
+        $scope.footerExpand();
+    };
+
     $scope.footerExpand = function () {
+      $scope.footerState = ionPullUpFooterState.EXPANDED;
       footerExpand();
 
     };
 
+    $scope.footerCollapse = function() {
+      $scope.footerState = ionPullUpFooterState.MINIMIZED;
+    };
+
     function footerExpand() {
       //https://server/zm/api/events/consoleEvents/5%20minute.json
       var ld = NVRDataModel.getLogin();
-- 
cgit v1.2.3


From 89211bbbd526bbc587361085b119a19d296f6a7f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 20 Oct 2018 19:17:21 -0400
Subject: #724 cleanup and making sure we take recordingURL for playback

---
 www/js/EventCtrl.js | 200 +++++++++++++---------------------------------------
 1 file changed, 49 insertions(+), 151 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index b2caf1d5..b2bbca87 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -32,7 +32,7 @@ angular.module('zmApp.controllers')
 
   })
 
-  .controller('zmApp.EventCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', '$ionicSlideBoxDelegate', '$ionicPosition', '$ionicPopover', '$ionicPopup', 'EventServer', '$sce', '$cordovaBadge', '$cordovaLocalNotification', '$q', 'carouselUtils', '$translate', '$cordovaFileTransfer', '$cordovaFile', '$ionicListDelegate', 'ionPullUpFooterState', function ($scope, $rootScope, zm, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPosition, $ionicPopover, $ionicPopup, EventServer, $sce, $cordovaBadge, $cordovaLocalNotification, $q, carouselUtils, $translate, $cordovaFileTransfer, $cordovaFile, $ionicListDelegate, ionPullUpFooterState) {
+  .controller('zmApp.EventCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', '$ionicSlideBoxDelegate', '$ionicPosition', '$ionicPopover', '$ionicPopup', 'EventServer', '$sce', '$cordovaBadge', '$cordovaLocalNotification', '$q', 'carouselUtils', '$translate', '$cordovaFileTransfer', '$cordovaFile', '$ionicListDelegate', 'ionPullUpFooterState', 'SecuredPopups', function ($scope, $rootScope, zm, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPosition, $ionicPopover, $ionicPopup, EventServer, $sce, $cordovaBadge, $cordovaLocalNotification, $q, carouselUtils, $translate, $cordovaFileTransfer, $cordovaFile, $ionicListDelegate, ionPullUpFooterState,SecuredPopups) {
 
     // events in last 5 minutes
     // TODO https://server/zm/api/events/consoleEvents/5%20minute.json
@@ -427,19 +427,18 @@ angular.module('zmApp.controllers')
 
             myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime);
             myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId);
-            myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId);
+            myevents[i].Event.recordingURL = NVRDataModel.getRecordingURL(myevents[i].Event.MonitorId);
             myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
 
             //console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
 
-            // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
+            // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.recordingURL);
 
             myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
             myevents[i].Event.ShowScrub = false;
             myevents[i].Event.height = eventsListDetailsHeight;
             // now construct base path
-            myevents[i].Event.BasePath = computeBasePath(myevents[i]);
-            myevents[i].Event.relativePath = computeRelativePath(myevents[i]);
+        
 
             // get thumbW/H
 
@@ -459,18 +458,11 @@ angular.module('zmApp.controllers')
             // in multiserver BasePath is login url for frames 
             // http://login.url/index.php?view=frame&eid=19696772&fid=21
 
-            //  console.log ("COMPARING "+NVRDataModel.getLogin().url+ " TO " +myevents[i].Event.baseURL);
-            if (NVRDataModel.getLogin().url != myevents[i].Event.baseURL) {
-              //NVRDataModel.debug ("Multi server, changing base");
-              myevents[i].Event.baseURL = NVRDataModel.getLogin().url;
+            //  console.log ("COMPARING "+NVRDataModel.getLogin().url+ " TO " +myevents[i].Event.recordingURL);
+          
 
-            }
-
-            if (myevents[i].Event.imageMode == 'path')
-              //if (1)
-              myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.relativePath + myevents[i].Event.DefaultVideo;
-            else
-              myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id;
+          
+              myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id;
 
             // if (idfound)
             if (idfound) {
@@ -525,7 +517,7 @@ angular.module('zmApp.controllers')
     }
 
 
-    function saveNow(imgsrc, r, f) {
+    function saveNow(imgsrc) {
 
       var fname = "zmninja.jpg";
       var fn = "cordova.plugins.photoLibrary.saveImage";
@@ -874,9 +866,11 @@ angular.module('zmApp.controllers')
       });
     };
 
-    $scope.showImage = function (p, r, f, fid, e, imode, id, parray, ndx) {
+    $scope.showImage = function (p, f, fid, e, imode, id, parray, ndx) {
       var img;
 
+      console.log ("P="+p+" F="+f+" E="+e+" imode="+imode+"  id="+id+" parray="+JSON.stringify(parray)+" ndx="+ndx);
+
       //console.log ("HERE");
       $scope.kFrame = $translate.instant('kFrame');
       $scope.kEvent = $translate.instant('kEvent');
@@ -903,20 +897,11 @@ angular.module('zmApp.controllers')
         NVRDataModel.debug("No index adjustment necessary as we are using all frames");
       }
 
-      // console.log ("Image Mode " + imode);
-      // console.log ("parray :  " + JSON.stringify(parray));
-      // console.log ("index: " + ndx);
-      if ($scope.imode == 'path') {
-        if ($scope.outlineMotion)
-          $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].aname;
-        else
-          $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-        $scope.fallbackImgSrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-      } else {
+     
         $scope.imgsrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id + $scope.outlineMotionParam;
         $scope.fallbackImgSrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id;
 
-      }
+   
 
       //$rootScope.zmPopup = $ionicPopup.alert({title: kFrame+':'+fid+'/'+kEvent+':'+e,template:img,  cssClass:'popup80'});
 
@@ -944,7 +929,7 @@ angular.module('zmApp.controllers')
             type: 'button-assertive button-small ion-camera',
             onTap: function (e) {
               e.preventDefault();
-              saveNow($scope.imgsrc, r, parray[$scope.ndx].fname);
+              saveNow($scope.imgsrc);
 
             }
           },
@@ -969,17 +954,11 @@ angular.module('zmApp.controllers')
               if (nndx == null) nndx = $scope.ndx;
               $scope.ndx = nndx;
 
-              if ($scope.imode == 'path') {
-                if ($scope.outlineMotion)
-                  $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].aname;
-                else
-                  $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-                $scope.fallbackImgSrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-              } else {
+             
                 $scope.imgsrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id + $scope.outlineMotionParam;
                 $scope.fallbackImgSrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id;
 
-              }
+         
 
 
               e.preventDefault();
@@ -1008,17 +987,11 @@ angular.module('zmApp.controllers')
               if (nndx == null) nndx = $scope.ndx;
               $scope.ndx = nndx;
 
-              if ($scope.imode == 'path') {
-                if ($scope.outlineMotion)
-                  $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].aname;
-                else
-                  $scope.imgsrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-                $scope.fallbackImgSrc = p + "/index.php?view=image&path=" + r + $scope.parray[$scope.ndx].fname;
-              } else {
+             
                 $scope.imgsrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id + $scope.outlineMotionParam;
                 $scope.fallbackImgSrc = p + "/index.php?view=image&fid=" + $scope.parray[$scope.ndx].id;
 
-              }
+              
 
 
               e.preventDefault();
@@ -1193,14 +1166,9 @@ angular.module('zmApp.controllers')
               {
                 var fname;
                 //console.log ("PATH="+e.Event.imageMode);
-                if (e.Event.imageMode == 'path')
-                //if (1)
-                {
-                  var rfp = padToN(data.event.Frame[i].FrameId, eventImageDigits) + "-capture.jpg";
-                  fname = e.Event.baseURL + "/index.php?view=image&width=" + zm.maxGifWidth + "&path=" + e.Event.relativePath + rfp;
-                } else {
-                  fname = e.Event.baseURL + "/index.php?view=image&width=" + zm.maxGifWidth + "&fid=" + data.event.Frame[i].Id;
-                }
+                
+                  fname = e.Event.recordingURL + "/index.php?view=image&width=" + zm.maxGifWidth + "&fid=" + data.event.Frame[i].Id;
+             
 
                 if (data.event.Frame[i].TimeStamp != lastTime /*|| fps < 2*/ )
 
@@ -2119,7 +2087,17 @@ angular.module('zmApp.controllers')
           NVRDataModel.log("API for event details" + myurl);
           $http.get(myurl)
             .then(function (data) {
+
+              
                 data = data.data;
+             
+       
+             //  var ndata = data.replace(/<pre class="cake-error">/,'');
+
+           //    console.log ("NDATA:"+ndata);
+                //<pre class="cake-error">
+
+
                 $scope.FrameArray = data.event.Frame;
                 //  $scope.slider_options.scale=[];
 
@@ -2214,20 +2192,7 @@ angular.module('zmApp.controllers')
           $scope.slides = [];
           var i;
 
-          if (event.Event.imageMode == 'path') {
-            NVRDataModel.debug("EventCtrl: found " + frames + " frames to scrub");
-
-            for (i = 1; i <= frames; i++) {
-              var fname = padToN(i, eventImageDigits) + "-capture.jpg";
-
-              $scope.slides.push({
-                id: i,
-                img: fname
-              });
-
-            }
-          } else // we need fids
-          {
+          
             var myurl_frames = loginData.apiurl + '/events/' + event.Event.Id + ".json";
             NVRDataModel.log("API for event details" + myurl_frames);
             $http.get(myurl_frames)
@@ -2257,7 +2222,7 @@ angular.module('zmApp.controllers')
                   NVRDataModel.displayBanner('error', [$translate.instant('kErrorFrameBanner'), $translate.instant('kErrorPleaseTryAgain')]);
                 });
 
-          }
+          
 
           // now get event details to show alarm frames
           loginData = NVRDataModel.getLogin();
@@ -2268,10 +2233,8 @@ angular.module('zmApp.controllers')
           event.Event.video = {};
           var videoURL;
 
-          //if (event.Event.imageMode == 'path')
-
-          /* videoURL = event.Event.baseURL + "/events/" + event.Event.relativePath + event.Event.DefaultVideo;*/
-          videoURL = event.Event.baseURL + "/index.php?view=view_video&eid=" + event.Event.Id;
+        
+          videoURL = event.Event.recordingURL + "/index.php?view=view_video&eid=" + event.Event.Id;
           if ($rootScope.authSession != 'undefined') videoURL += $rootScope.authSession;
           videoURL += NVRDataModel.insertBasicAuthToken();
 
@@ -2494,56 +2457,8 @@ angular.module('zmApp.controllers')
       }
     };
 
-    //--------------------------------------------------------
-    // utility function
-    //--------------------------------------------------------
-
-    function computeRelativePath(event) {
-      var relativePath = "";
-      var loginData = NVRDataModel.getLogin();
-      var str = event.Event.StartTime;
-      var yy = moment(str).locale('en').format('YY');
-      var mm = moment(str).locale('en').format('MM');
-      var dd = moment(str).locale('en').format('DD');
-      var hh = moment(str).locale('en').format('HH');
-      var min = moment(str).locale('en').format('mm');
-      var sec = moment(str).locale('en').format('ss');
-      relativePath = event.Event.MonitorId + "/" +
-        yy + "/" +
-        mm + "/" +
-        dd + "/" +
-        hh + "/" +
-        min + "/" +
-        sec + "/";
-      return relativePath;
-
-    }
-
-    //--------------------------------------------------------
-    // utility function
-    //--------------------------------------------------------
-
-    function computeBasePath(event) {
-      var basePath = "";
-      var loginData = NVRDataModel.getLogin();
-      var str = event.Event.StartTime;
-      var yy = moment(str).locale('en').format('YY');
-      var mm = moment(str).locale('en').format('MM');
-      var dd = moment(str).locale('en').format('DD');
-      var hh = moment(str).locale('en').format('HH');
-      var min = moment(str).locale('en').format('mm');
-      var sec = moment(str).locale('en').format('ss');
-
-      basePath = event.Event.baseURL + "/events/" +
-        event.Event.MonitorId + "/" +
-        yy + "/" +
-        mm + "/" +
-        dd + "/" +
-        hh + "/" +
-        min + "/" +
-        sec + "/";
-      return basePath;
-    }
+    
+   
 
     $scope.modalGraph = function () {
       $ionicModal.fromTemplateUrl('templates/events-modalgraph.html', {
@@ -2826,15 +2741,13 @@ angular.module('zmApp.controllers')
               // now construct base path
 
               myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId);
-              myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId);
+              myevents[i].Event.recordingURL = NVRDataModel.getRecordingURL(myevents[i].Event.MonitorId);
               myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
               // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
 
-              //  console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
+              //  console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.recordingURL);
 
               myevents[i].Event.ShowScrub = false;
-              myevents[i].Event.BasePath = computeBasePath(myevents[i]);
-              myevents[i].Event.relativePath = computeRelativePath(myevents[i]);
               myevents[i].Event.height = eventsListDetailsHeight;
 
               // get thumbW/H
@@ -2857,11 +2770,8 @@ angular.module('zmApp.controllers')
               }
 
 
-              if (myevents[i].Event.imageMode == 'path')
-                //if (1)
-                myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/events/" + myevents[i].Event.relativePath + myevents[i].Event.DefaultVideo;
-              else
-                myevents[i].Event.videoPath = myevents[i].Event.baseURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id;
+            
+                myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id;
 
               if (idfound) $scope.events.push(myevents[i]);
             }
@@ -2951,7 +2861,7 @@ angular.module('zmApp.controllers')
 
     $scope.constructThumbnail = function (event) {
       var stream = "";
-      stream = event.Event.baseURL +
+      stream = event.Event.recordingURL +
         "/index.php?view=image&show=capture&fid=" +
         (event.Event.MaxScoreFrameId ? event.Event.MaxScoreFrameId : "1&eid=" + event.Event.Id) +
         "&width=" + event.Event.thumbWidth * 2 +
@@ -2966,14 +2876,10 @@ angular.module('zmApp.controllers')
     $scope.constructScrubFrame = function (event, slide) {
 
       var stream = "";
-      if (event.Event.imageMode == 'path') {
-        stream = event.Event.baseURL + "/index.php?view=image" +
-          "&path=" + event.Event.relativePath + slide.img + "&height=380";
-
-      } else if (event.Event.imageMode == 'fid') {
-        stream = event.Event.baseURL + "/index.php?view=image" +
+     
+        stream = event.Event.recordingURL + "/index.php?view=image" +
           "&fid=" + slide.id + $scope.outlineMotionParam;
-      }
+      
       if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession;
 
       stream += NVRDataModel.insertBasicAuthToken();
@@ -2985,22 +2891,14 @@ angular.module('zmApp.controllers')
     $scope.constructAlarmFrame = function (event, alarm, motion) {
       var stream = "";
 
-      if (event.Event.imageMode == 'fid') {
-        stream = event.Event.baseURL +
+     
+        stream = event.Event.recordingURL +
           "/index.php?view=image&fid=" + alarm.id;
         if (motion) stream += $scope.outlineMotionParam;
-
-      } else if (event.Event.imageMode == 'path') {
-        stream = event.Event.baseURL +
-          "/index.php?view=image&path=" + event.Event.relativePath +
-          motion ? alarm.aname : alarm.fname +
-          "&height=380";
-
-
-      }
       if ($rootScope.authSession != 'undefined') stream += $rootScope.authSession;
       stream += NVRDataModel.insertBasicAuthToken();
 
+//      console.log ("alarm:"+stream);
       return stream;
 
     };
-- 
cgit v1.2.3


From 3f549f3d6ea3dac1fbf862e236549ce0dd7fd570 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 21 Oct 2018 10:33:47 -0400
Subject: #724 more cleanup

---
 www/js/EventCtrl.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index b2bbca87..2c64ce70 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1813,7 +1813,7 @@ angular.module('zmApp.controllers')
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
-          NVRDataModel.debug(JSON.stringify(data));
+         // NVRDataModel.debug(JSON.stringify(data));
           $scope.hours = [];
           var p = data.results;
           for (var key in data.results) {
@@ -1849,7 +1849,7 @@ angular.module('zmApp.controllers')
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
-          NVRDataModel.debug(JSON.stringify(data));
+          //NVRDataModel.debug(JSON.stringify(data));
           $scope.days = [];
           var p = data.results;
           for (var key in data.results) {
@@ -1882,7 +1882,7 @@ angular.module('zmApp.controllers')
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
-          NVRDataModel.debug(JSON.stringify(data));
+         // NVRDataModel.debug(JSON.stringify(data));
           $scope.weeks = [];
           var p = data.results;
           for (var key in data.results) {
@@ -1916,7 +1916,7 @@ angular.module('zmApp.controllers')
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
-          NVRDataModel.debug(JSON.stringify(data));
+          //NVRDataModel.debug(JSON.stringify(data));
           $scope.months = [];
           var p = data.results;
           for (var key in data.results) {
-- 
cgit v1.2.3


From e3076881b748fff53690373f02211706b60fab79 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 21 Oct 2018 18:49:32 -0400
Subject: #725 moved evaluate tapped notification to service,trapped handler in
 all controllers

---
 www/js/EventCtrl.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 2c64ce70..cce81b3a 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -71,6 +71,19 @@ angular.module('zmApp.controllers')
     // initial code
     //---------------------------------------------------
 
+
+    $scope.$on ( "process-push", function () {
+      NVRDataModel.debug (">> EventCtrl: push handler");
+      var s = NVRDataModel.evaluateTappedNotification();
+      NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
+      $ionicHistory.nextViewOptions({
+        disableAnimate:true,
+        disableBack: true
+      });
+      $state.go(s[0],s[1],s[2]);
+    });
+ 
+
     //we come here is TZ is updated after the view loads
     var tzu = $scope.$on('tz-updated', function () {
       $scope.tzAbbr = NVRDataModel.getTimeZoneNow();
@@ -115,8 +128,8 @@ angular.module('zmApp.controllers')
         footerExpand();
         // now do event playback if asked
 
-        if (parseInt($rootScope.tappedEid) > 0) {
-          NVRDataModel.debug(" Trying ot live play " + $rootScope.tappedEid);
+        if (parseInt($rootScope.tappedEid) > 0 && $stateParams.playEvent == 'true') {
+          NVRDataModel.debug(" Trying to  play event due to push:" + $rootScope.tappedEid);
           playSpecificEvent($rootScope.tappedEid);
 
         }
@@ -148,7 +161,7 @@ angular.module('zmApp.controllers')
       window.removeEventListener("resize", recomputeThumbSize, false);
       NVRDataModel.debug("EventCtrl: Deregistering broadcast handles");
       for (var i = 0; i < broadcastHandles.length; i++) {
-        // broadcastHandles[i]();
+      //  broadcastHandles[i]();
       }
       broadcastHandles = [];
     });
-- 
cgit v1.2.3


From e3ee3eeeb220cfce88ddfdb2189ec6e49432565f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 22 Oct 2018 09:38:27 -0400
Subject: other cleanup

---
 www/js/EventCtrl.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index cce81b3a..ef70fcf6 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -103,7 +103,7 @@ angular.module('zmApp.controllers')
       //
       window.addEventListener("resize", recomputeThumbSize, false);
       $ionicListDelegate.canSwipeItems(true);
-      NVRDataModel.debug("enabling options swipe");
+     // NVRDataModel.debug("enabling options swipe");
 
       // see if we come from monitors, if so, don't filter events
       if ($ionicHistory.backTitle() == 'Monitors') {
@@ -159,7 +159,7 @@ angular.module('zmApp.controllers')
 
       NVRDataModel.debug("EventCtrl: Deregistering resize listener");
       window.removeEventListener("resize", recomputeThumbSize, false);
-      NVRDataModel.debug("EventCtrl: Deregistering broadcast handles");
+      //NVRDataModel.debug("EventCtrl: Deregistering broadcast handles");
       for (var i = 0; i < broadcastHandles.length; i++) {
       //  broadcastHandles[i]();
       }
@@ -205,7 +205,7 @@ angular.module('zmApp.controllers')
 
 
       if (NVRDataModel.getLogin().enableThumbs) {
-        NVRDataModel.debug("--> thumbnail means increasing row size");
+       // NVRDataModel.debug("--> thumbnail means increasing row size");
         eventsListScrubHeight = 370;
         eventsListDetailsHeight = 330;
 
@@ -1821,7 +1821,7 @@ angular.module('zmApp.controllers')
       var af = "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
 
       var apiurl = ld.apiurl + "/events/consoleEvents/1 hour" + af + ".json";
-      NVRDataModel.debug("consoleEvents API:" + apiurl);
+      //NVRDataModel.debug("consoleEvents API:" + apiurl);
 
       $http.get(apiurl)
         .then(function (data) {
@@ -1858,7 +1858,7 @@ angular.module('zmApp.controllers')
         });
 
       apiurl = ld.apiurl + "/events/consoleEvents/1 day" + af + ".json";
-      NVRDataModel.debug("consoleEvents API:" + apiurl);
+      //NVRDataModel.debug("consoleEvents API:" + apiurl);
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
@@ -1891,7 +1891,7 @@ angular.module('zmApp.controllers')
         });
 
       apiurl = ld.apiurl + "/events/consoleEvents/1 week" + af + ".json";
-      NVRDataModel.debug("consoleEvents API:" + apiurl);
+      //NVRDataModel.debug("consoleEvents API:" + apiurl);
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
@@ -1925,7 +1925,7 @@ angular.module('zmApp.controllers')
         });
 
       apiurl = ld.apiurl + "/events/consoleEvents/1 month" + af + ".json";
-      NVRDataModel.debug("consoleEvents API:" + apiurl);
+      //NVRDataModel.debug("consoleEvents API:" + apiurl);
       $http.get(apiurl)
         .then(function (data) {
           data = data.data;
@@ -2028,7 +2028,7 @@ angular.module('zmApp.controllers')
         NVRDataModel.debug("disabling options swipe");
       } else {
         $ionicListDelegate.canSwipeItems(true);
-        NVRDataModel.debug("enabling options swipe");
+        //NVRDataModel.debug("enabling options swipe");
       }
 
     };
@@ -2070,11 +2070,11 @@ angular.module('zmApp.controllers')
 
       if (event.Event.ShowScrub == false) {
         $ionicListDelegate.canSwipeItems(true);
-        NVRDataModel.debug("enabling options swipe due to toggle");
+        //NVRDataModel.debug("enabling options swipe due to toggle");
       } else {
         $ionicListDelegate.canSwipeItems(false);
         $ionicListDelegate.closeOptionButtons();
-        NVRDataModel.debug("disabling options swipe due to toggle");
+       // NVRDataModel.debug("disabling options swipe due to toggle");
 
       }
 
-- 
cgit v1.2.3


From ff613f8e6210d2c4cd2f8deacc0096e18aff2fcd Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 22 Oct 2018 11:50:53 -0400
Subject: #725 move push handlers inside beforeEnter for better consistency

---
 www/js/EventCtrl.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index ef70fcf6..a037c7ee 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -72,17 +72,7 @@ angular.module('zmApp.controllers')
     //---------------------------------------------------
 
 
-    $scope.$on ( "process-push", function () {
-      NVRDataModel.debug (">> EventCtrl: push handler");
-      var s = NVRDataModel.evaluateTappedNotification();
-      NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
-      $ionicHistory.nextViewOptions({
-        disableAnimate:true,
-        disableBack: true
-      });
-      $state.go(s[0],s[1],s[2]);
-    });
- 
+    
 
     //we come here is TZ is updated after the view loads
     var tzu = $scope.$on('tz-updated', function () {
@@ -171,6 +161,18 @@ angular.module('zmApp.controllers')
       //console.log ("********* BEFORE ENTER");
       //
 
+      $scope.$on ( "process-push", function () {
+        NVRDataModel.debug (">> EventCtrl: push handler");
+        var s = NVRDataModel.evaluateTappedNotification();
+        NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
+        $ionicHistory.nextViewOptions({
+          disableAnimate:true,
+          disableBack: true
+        });
+        $state.go(s[0],s[1],s[2]);
+      });
+   
+
       $scope.modalData = {
         "doRefresh": false
       };
-- 
cgit v1.2.3


From 022cd0c6c49d8b163207d790496a1516d289a849 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 23 Oct 2018 13:39:06 -0400
Subject: #724 copy paths from portal to recording and multi-server port too

---
 www/js/EventCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index a037c7ee..1fe91c6e 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -884,7 +884,7 @@ angular.module('zmApp.controllers')
     $scope.showImage = function (p, f, fid, e, imode, id, parray, ndx) {
       var img;
 
-      console.log ("P="+p+" F="+f+" E="+e+" imode="+imode+"  id="+id+" parray="+JSON.stringify(parray)+" ndx="+ndx);
+//      console.log ("P="+p+" F="+f+" E="+e+" imode="+imode+"  id="+id+" parray="+JSON.stringify(parray)+" ndx="+ndx);
 
       //console.log ("HERE");
       $scope.kFrame = $translate.instant('kFrame');
-- 
cgit v1.2.3


From da1db311fb6835e8d0b60cf073cd8803e96fe0a6 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 25 Oct 2018 13:06:47 -0400
Subject: fix live playback url, show snapshot instead of auto play #725

---
 www/js/EventCtrl.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 1fe91c6e..51333424 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -140,7 +140,7 @@ angular.module('zmApp.controllers')
       };
       $scope.event = event;
       $scope.currentEvent = event;
-      openModal(event);
+      openModal(event, 'enabled');
 
     }
 
@@ -161,10 +161,13 @@ angular.module('zmApp.controllers')
       //console.log ("********* BEFORE ENTER");
       //
 
+      $scope.mid = '';
+
       $scope.$on ( "process-push", function () {
         NVRDataModel.debug (">> EventCtrl: push handler");
         var s = NVRDataModel.evaluateTappedNotification();
         NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s));
+        $scope.mid = $rootScope.tappedMid;
         $ionicHistory.nextViewOptions({
           disableAnimate:true,
           disableBack: true
-- 
cgit v1.2.3


From 09a78638bd054f2188ddceaf59da4f144aec223a Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 26 Oct 2018 15:16:57 -0400
Subject: #725 make sure online/offline don't interfere

---
 www/js/EventCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 51333424..caf27220 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2153,7 +2153,7 @@ angular.module('zmApp.controllers')
               },
               function (err) {
                 NVRDataModel.log("Error retrieving detailed frame API " + JSON.stringify(err));
-                NVRDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
+               // NVRDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
               });
 
         } // end of groupType == alarms
-- 
cgit v1.2.3


From 38aecc45c37dbaf35a0523f3e8a880570b64f47a Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 31 Oct 2018 14:51:39 -0400
Subject: #733 use new Monitor_Status if available

---
 www/js/EventCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/js/EventCtrl.js')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index caf27220..66ff6463 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2815,7 +2815,7 @@ angular.module('zmApp.controllers')
 
 
     function recomputeThumbSize() {
-      NVRDataModel.debug("EventCtrl: recompute thumbnails");
+    //  NVRDataModel.debug("EventCtrl: recompute thumbnails");
 
       for (var i = 0; i < $scope.events.length; i++) {
         var tempMon = NVRDataModel.getMonitorObject($scope.events[i].Event.MonitorId);
-- 
cgit v1.2.3