diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-23 10:44:56 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-23 10:44:56 -0400 |
| commit | fe6545298f311891ecea3434f1b6a76e6ebd9987 (patch) | |
| tree | 61ef6d6e6b649a3abe9aa97b74a419633882b1b0 /www/js/EventModalCtrl.js | |
| parent | 881c94d1f4b9b4503e7ca97385f7d1b15f70f4b5 (diff) | |
fixes #354
Former-commit-id: c91962ed5b156e0e60fa2ee57621cf34182404c1
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 3674dab9..078b22fe 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -441,6 +441,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if ($rootScope.platformOS != 'android') { processSaveEventImageToPhone(onlyAlarms); + return; } // if we are on android do the 6.x+ hasPermissions flow @@ -531,7 +532,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro // console.log ("STEP 1 : Computed index as "+ $scope.mycarousel.index); var i; for (i = 1; i <= event.Frame.length; i++) { - var fname = padToN(i, eventImageDigits) + "-capture.jpg"; + var fname = padToN(event.Frame[i-1].FrameId, eventImageDigits) + "-capture.jpg"; // console.log ("Building " + fname); // console.log ("DUMPING ONE " + JSON.stringify(event.Frame[i-1])); @@ -539,17 +540,20 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if (onlyAlarms) { if (event.Frame[i - 1] && event.Frame[i - 1].Type == 'Alarm') { $scope.slides.push({ - id: i, + id: event.Frame[i-1].FrameId, img: fname, }); + console.log ("ALARM PUSHED " + fname); } } else // push all frames { $scope.slides.push({ - id: i, + id: event.Frame[i-1].FrameId, img: fname, }); + console.log ("PUSHED " + fname); } + } // console.log ("STEP 2 : calling Save Event To Phone"); $ionicLoading.hide(); @@ -601,11 +605,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.slideIndex = $scope.mycarousel.index; $scope.slideLastIndex = $scope.slides.length - 1; - + console.log ("URL TO DISPLAY " + url); $rootScope.zmPopup = $ionicPopup.show({ - template: '<center>Frame: {{slideIndex+1}} / {{slideLastIndex+1}}</center><br/><img src="{{selectEventUrl}}" width="100%" />', + template: '<center>Frame: {{slideIndex+1}} / {{slideLastIndex+1}}</center><br/><img src="{{selectEventUrl}}" width="100%" /><br/>{{selectEventUrl}}', title: 'Select ' + (onlyAlarms ? 'Alarmed ' : '') + 'frame to save', subTitle: 'use left and right arrows to change', scope: $scope, @@ -620,6 +624,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img; //NVRDataModel.log("selected frame is " + $scope.slideIndex); + console.log ("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img); + e.preventDefault(); } }, @@ -631,6 +637,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++; $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img; //NVRDataModel.log("selected frame is " + $scope.slideIndex); + console.log ("URL TO DISPLAY " + $scope.slides[$scope.slideIndex].img); e.preventDefault(); } }, |