summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-10-11 12:32:45 -0400
committerPliable Pixels <pliablepixels@gmail.com>2016-10-11 12:32:45 -0400
commit07654b2eaaba4890cbbc45dec70e5995fd36a655 (patch)
tree3378df7035e5a00524ebf7ff7239daccdc25b700
parentf9e03227e62d7f6c5c0cc381a897888c5efc3759 (diff)
cleanup and fixes to montage history
Former-commit-id: 440b7c8a70e4085afcdc7ed8e9b14eb979198177
Diffstat
-rw-r--r--www/js/MontageCtrl.js30
-rw-r--r--www/js/MontageHistoryCtrl.js945
-rw-r--r--www/templates/events-modal.html2
-rw-r--r--www/templates/montage-history.html19
4 files changed, 271 insertions, 725 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6b48897d..0681d832 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -169,7 +169,7 @@ angular.module('zmApp.controllers')
imagesLoaded(elem).on('always', function () {
//console.log ("******** ALL IMAGES LOADED");
NVRDataModel.debug("All images loaded");
-
+ $scope.areImagesLoading = false;
$ionicLoading.hide();
@@ -182,15 +182,13 @@ angular.module('zmApp.controllers')
});
if (!progressCalled) {
- NVRDataModel.log("*** BUG PROGRESS WAS NOT CALLED");
+ NVRDataModel.log("*** PROGRESS WAS NOT CALLED");
+ pckry.reloadItems();
}
- NVRDataModel.debug("All images loaded, doing image layout");
- $scope.areImagesLoading = false; // outside timeout so images show before next line
- $timeout(function () {
- pckry.initShiftLayout(positions, 'data-item-id');
- //pckry.reloadItems();
+
-
+ $timeout(function () {
+
pckry.getItemElements().forEach(function (itemElem) {
draggie = new Draggabilly(itemElem);
pckry.bindDraggabillyEvents(draggie);
@@ -218,13 +216,15 @@ angular.module('zmApp.controllers')
}
-
+ NVRDataModel.debug("All images loaded, doing image layout");
+ $timeout(function () {
+ pckry.initShiftLayout(positions, 'data-item-id');
+ }, 0);
}
-
-
- pckry.shiftLayout();
- $timeout (function () {
- pckry.shiftLayout();},300);
+ $timeout(function () {
+ NVRDataModel.log("Force calling resize");
+ pckry.shiftLayout();
+ }, zm.packeryTimer); // don't ask
@@ -232,6 +232,8 @@ angular.module('zmApp.controllers')
});
+
+
function itemDragged(item) {
NVRDataModel.debug("drag complete");
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index c27e1c44..33e099fe 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -1,35 +1,22 @@
// Controller for the montage view
-/* jshint -W041, -W093 */
+/* jshint -W041, -W093, -W083 */
/* jslint browser: true*/
/* global cordova,StatusBar,angular,console,ionic,Masonry,moment,Packery, Draggabilly, imagesLoaded, Chart */
-
-
// FIXME: This is a copy of montageCtrl - needs a lot of code cleanup
-
angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$scope', '$rootScope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$translate', 'qHttp', function ($scope, $rootScope, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $translate, qHttp) {
-
-
-
-
//--------------------------------------------------------------------------------------
// Handles bandwidth change, if required
//
//--------------------------------------------------------------------------------------
-
$rootScope.$on("bandwidth-change", function (e, data) {
// nothing to do for now
// eventUrl will use lower BW in next query cycle
});
-
-
-
//--------------------------------------
// formats events dates in a nice way
//---------------------------------------
-
$scope.prettifyDateTimeFirst = function (str) {
return moment(str).format(NVRDataModel.getTimeFormat() + '/MMM Do');
-
};
$scope.prettifyDate = function (str) {
return moment(str).format('MMM Do, YYYY ' + NVRDataModel.getTimeFormat());
@@ -38,37 +25,24 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
function prettifyDate(str) {
return moment(str).format('MMM Do');
}
-
$scope.prettifyTime = function (str) {
-
return moment(str).format('h:mm a');
};
-
-
$scope.prettify = function (str) {
return moment(str).format(NVRDataModel.getTimeFormat() + ' on MMMM Do YYYY');
};
-
$scope.humanizeTime = function (str) {
return moment(str).fromNow();
-
};
// if you change date in footer, change hrs
- $scope.dateChanged = function()
- {
-
+ $scope.dateChanged = function () {
$scope.datetimeValueFrom.hrs = Math.round(moment.duration(moment().diff(moment($scope.datetimeValueFrom.value))).asHours());
};
-
-
- // if you change hrs in footer, change date
- $scope.hrsChanged = function()
- {
- $scope.datetimeValueFrom.value = moment().subtract($scope.datetimeValueFrom.hrs,'hours').toDate();
+ // if you change hrs in footer, change date
+ $scope.hrsChanged = function () {
+ $scope.datetimeValueFrom.value = moment().subtract($scope.datetimeValueFrom.hrs, 'hours').toDate();
timefrom.toDate();
-
};
-
function orientationChanged() {
NVRDataModel.debug("Detected orientation change, redoing packery resize");
@@ -76,11 +50,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
pckry.onresize();
});
}
-
-
-
-
-
//--------------------------------------
// pause/unpause nph-zms
//---------------------------------------
@@ -88,7 +57,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//console.log ("TOGGLE PAUSE " + mid);
var m = -1;
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
-
if ($scope.MontageMonitors[i].Monitor.Id == mid) {
m = i;
break;
@@ -96,99 +64,65 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
}
if (m != -1) {
$scope.MontageMonitors[m].Monitor.isPaused = !$scope.MontageMonitors[m].Monitor.isPaused;
-
var cmd = $scope.MontageMonitors[m].Monitor.isPaused ? 1 : 2;
-
NVRDataModel.debug("Sending CMD:" + cmd + " for monitor " + $scope.MontageMonitors[m].Monitor.Name);
controlEventStream(cmd, "", $scope.MontageMonitors[m].Monitor.connKey, -1);
}
};
-
-
- function sendCmd (mid, cmd, extra)
- {
+
+ function sendCmd(mid, cmd, extra) {
var m = -1;
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
-
if ($scope.MontageMonitors[i].Monitor.Id == mid) {
m = i;
break;
}
}
if (m != -1) {
-
NVRDataModel.debug("Sending CMD:" + cmd + " for monitor " + $scope.MontageMonitors[m].Monitor.Name);
controlEventStream(cmd, "", $scope.MontageMonitors[m].Monitor.connKey, -1, extra);
-
}
}
-
-
- $scope.seek = function (mid, p)
- {
- console.log ("SLIDER CALLED WITH MID="+mid+" progress="+p);
- sendCmd (mid, '14', "&offset="+p);
-
+ $scope.seek = function (mid, p) {
+ console.log("SLIDER CALLED WITH MID=" + mid + " progress=" + p);
+ sendCmd(mid, '14', "&offset=" + p);
};
-
- $scope.moveFaster = function (mid)
- {
- sendCmd (mid,4);
+ $scope.moveFaster = function (mid) {
+ sendCmd(mid, 4);
};
-
- $scope.moveSlower = function (mid)
- {
- sendCmd (mid,5);
+ $scope.moveSlower = function (mid) {
+ sendCmd(mid, 5);
};
-
-
- $scope.movePlay = function (mid)
- {
- sendCmd (mid,2);
+ $scope.movePlay = function (mid) {
+ sendCmd(mid, 2);
};
-
-
-
-
-
-
//--------------------------------------
// Called when ion-footer collapses
// note that on init it is also called
//---------------------------------------
-
$scope.footerExpand = function () {
// console.log ("**************** EXPAND CALLED ***************");
$ionicSideMenuDelegate.canDragContent(false);
};
-
$scope.footerCollapse = function () {
-
footerCollapse();
};
-
-
/* Note this is also called when the view is first loaded */
function footerCollapse() {
-
if (readyToRun == false) {
NVRDataModel.debug("fake call to footerCollapse - ignoring");
return;
}
-
$scope.dragBorder = "";
$scope.isDragabillyOn = false;
$ionicSideMenuDelegate.canDragContent(true);
-
NVRDataModel.stopNetwork("MontageHistory-footerCollapse");
var ld = NVRDataModel.getLogin();
-
$scope.sliderVal.realRate = $scope.sliderVal.rate * 100;
var TimeObjectFrom = moment($scope.datetimeValueFrom.value).format("YYYY-MM-DD HH:mm");
var TimeObjectTo = moment().format('YYYY-MM-DD HH:mm');
-
var apiurl;
-
+
// release all active streams
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
$scope.MontageMonitors[i].Monitor.selectStyle = "";
@@ -197,181 +131,141 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
if ($scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png') {
// this means this mid was showing a message, now we need to change it
// so kill prev. stream first
- NVRDataModel.log("footerCollapse: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey + " for Monitor:"+$scope.MontageMonitors[i].Monitor.Name);
+ NVRDataModel.log("footerCollapse: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey + " for Monitor:" + $scope.MontageMonitors[i].Monitor.Name);
var tmpCK = angular.copy($scope.MontageMonitors[i].Monitor.connKey);
timedControlEventStream(2500, 17, "", tmpCK, -1);
$scope.MontageMonitors[i].Monitor.eventUrl = "img/noevent.png";
$scope.MontageMonitors[i].Monitor.eid = "-1";
$scope.MontageMonitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
+ $scope.MontageMonitors[i].Monitor.noGraph = true;
//console.log ("Generating connkey: " +$scope.MontageMonitors[i].Monitor.connKey);
- }
-
+ }
}
-
- // grab events that start on or before the time and end on or after the time
- // this should only bring up events that span that time
-
- apiurl = ld.apiurl + "/events/index/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0)+ ".json";
-
-
+ // grab events that start on or after the time
+ apiurl = ld.apiurl + "/events/index/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json";
NVRDataModel.log("Event timeline API is " + apiurl);
-
// make sure there are no more than 5 active streams (noevent is ok)
$scope.currentLimit = $scope.monLimit;
//qHttp.get(apiurl)
- qHttp({method:'get', url:apiurl})
- .then(function (succ) {
- var data = succ.data;
- var ld = NVRDataModel.getLogin();
- NVRDataModel.debug("Got " + data.events.length + "new history events...");
- var eid, mid, stime;
- for (i = 0; i < data.events.length; i++) {
- mid = data.events[i].Event.MonitorId;
- eid = data.events[i].Event.Id;
- stime = data.events[i].Event.StartTime;
-
- // only take the first one for each monitor
- for (var j = 0; j < $scope.MontageMonitors.length; j++) {
- $scope.MontageMonitors[j].Monitor.isPaused = false;
- // that's the earliest match and play gapless from there
- if ($scope.MontageMonitors[j].Monitor.Id == mid) {
-
- if ($scope.MontageMonitors[j].Monitor.eventUrl == 'img/noevent.png') {
-
- // console.log ("Old value of event url " + $scope.MontageMonitors[j].eventUrl);
- //console.log ("ldurl is " + ld.streamingurl);
-
- var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
- $scope.MontageMonitors[j].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + eid + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[j].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
-
- //console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl);
-
- // console.log ("SWITCHING TO " + $scope.MontageMonitors[j].eventUrl);
-
-
- $scope.MontageMonitors[j].Monitor.eventUrlTime = stime;
- $scope.MontageMonitors[j].Monitor.eid = eid;
- $scope.MontageMonitors[j].Monitor.eventDuration = data.events[i].Event.Length;
- $scope.MontageMonitors[j].Monitor.sliderProgress = {progress:0};
-
- console.log (">>> Setting Event for " + $scope.MontageMonitors[j].Monitor.Name+" to " +eid);
- }
-
- }
- }
- }
-
- // make sure we do our best to get that duration for all monitors
- // in the above call, is possible some did not make the cut in the first page
-
- NVRDataModel.log("Making sure all monitors have a fair chance...");
- for (i = 0; i < $scope.MontageMonitors.length; i++) {
-
- console.log ("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name);
-
- if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noevent.png') {
-
-
- var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json";
-
- NVRDataModel.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
-
- getExpandedEvents(i, indivGrab);
-
+ qHttp({
+ method: 'get',
+ url: apiurl
+ }).then(function (succ) {
+ var data = succ.data;
+ var ld = NVRDataModel.getLogin();
+ NVRDataModel.debug("Got " + data.events.length + "new history events...");
+ var eid, mid, stime;
+ for (i = 0; i < data.events.length; i++) {
+ mid = data.events[i].Event.MonitorId;
+ eid = data.events[i].Event.Id;
+ stime = data.events[i].Event.StartTime;
+ // only take the first one for each monitor
+ for (var j = 0; j < $scope.MontageMonitors.length; j++) {
+ $scope.MontageMonitors[j].Monitor.isPaused = false;
+ // that's the earliest match and play gapless from there
+ if ($scope.MontageMonitors[j].Monitor.Id == mid) {
+ if ($scope.MontageMonitors[j].Monitor.eventUrl == 'img/noevent.png') {
+ // console.log ("Old value of event url " + $scope.MontageMonitors[j].eventUrl);
+ //console.log ("ldurl is " + ld.streamingurl);
+ var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
+ $scope.MontageMonitors[j].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + eid + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[j].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
+ //console.log ("Setting event URL to " +$scope.MontageMonitors[j].Monitor.eventUrl);
+ // console.log ("SWITCHING TO " + $scope.MontageMonitors[j].eventUrl);
+ $scope.MontageMonitors[j].Monitor.eventUrlTime = stime;
+ $scope.MontageMonitors[j].Monitor.eid = eid;
+ $scope.MontageMonitors[j].Monitor.eventDuration = data.events[i].Event.Length;
+ $scope.MontageMonitors[j].Monitor.sliderProgress = {
+ progress: 0
+ };
+ //console.log(">>> Setting Event for " + $scope.MontageMonitors[j].Monitor.Name + " to " + eid);
+ // now lets get the API for that event for graphing
+ $scope.MontageMonitors[j].Monitor.noGraph = true;
+
+
+ }
}
}
- console.log("REDOING PACKERY & DRAG");
- if (pckry !== undefined)
- {
-
- // remove current draggies
- draggies.forEach(function (drag) {
- drag.destroy();
- });
-
- draggies = [];
- // destroy existing packery object
- pckry.destroy();
- initPackery();
-
-
+ }
+ // make sure we do our best to get that duration for all monitors
+ // in the above call, is possible some did not make the cut in the first page
+ NVRDataModel.log("Making sure all monitors have a fair chance...");
+ for (i = 0; i < $scope.MontageMonitors.length; i++) {
+ console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name);
+ if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noevent.png') {
+ var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json";
+ NVRDataModel.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
+ getExpandedEvents(i, indivGrab);
}
-
-
- },
- function (err) {NVRDataModel.debug("history ERROR:" + JSON.stringify(err));} );
-
+ }
+
+ // At this stage, we have both a general events grab, and specific event grabs for MIDS that were empty
+ console.log("REDOING PACKERY & DRAG");
+ if (pckry !== undefined) {
+ // remove current draggies
+ draggies.forEach(function (drag) {
+ drag.destroy();
+ });
+ draggies = [];
+ // destroy existing packery object
+ pckry.destroy();
+ initPackery();
+ }
+ }, function (err) {
+ NVRDataModel.debug("history ERROR:" + JSON.stringify(err));
+ });
function getExpandedEvents(i, indivGrab) {
var ld = NVRDataModel.getLogin();
// console.log ("EXPANDED EVENT " + i + " " + indivGrab);
- qHttp({method:'get', url:indivGrab})
- .then(function (succ) {
- var data = succ.data;
- // console.log ("EXPANDED DATA FOR MONITOR " + i + JSON.stringify(data));
- if (data.events.length > 0) {
-
- if (!NVRDataModel.isBackground()) {
-
- var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
-
- $scope.MontageMonitors[i].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + data.events[0].Event.Id + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[i].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
-
-
-
- //console.log ("SWITCHING TO " + $scope.MontageMonitors[i].eventUrl);
-
- $scope.MontageMonitors[i].Monitor.eventUrlTime = data.events[0].Event.StartTime;
- $scope.MontageMonitors[i].Monitor.eid = data.events[0].Event.Id;
- $scope.MontageMonitors[i].Monitor.sliderProgress = {progress:0};
-
- $scope.MontageMonitors[i].Monitor.eventDuration = data.events[0].Event.Length;
- console.log (">>> Setting Event for " + $scope.MontageMonitors[i].Monitor.Name+" to " +data.events[0].Event.Id);
-
- NVRDataModel.log("Found expanded event " + data.events[0].Event.Id + " for monitor " + $scope.MontageMonitors[i].Monitor.Id);
- } else {
- // $scope.MontageMonitors[i].eventUrl="img/noevent.png";
- // $scope.MontageMonitors[i].eventUrlTime = "";
- // NVRDataModel.log ("Setting img src to null as data received in background");
- }
+ qHttp({
+ method: 'get',
+ url: indivGrab
+ }).then(function (succ) {
+ var data = succ.data;
+ // console.log ("EXPANDED DATA FOR MONITOR " + i + JSON.stringify(data));
+ if (data.events.length > 0) {
+ if (!NVRDataModel.isBackground()) {
+ var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
+ $scope.MontageMonitors[i].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + data.events[0].Event.Id + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[i].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
+ //console.log ("SWITCHING TO " + $scope.MontageMonitors[i].eventUrl);
+ $scope.MontageMonitors[i].Monitor.eventUrlTime = data.events[0].Event.StartTime;
+ $scope.MontageMonitors[i].Monitor.eid = data.events[0].Event.Id;
+ $scope.MontageMonitors[i].Monitor.noGraph = true;
+ $scope.MontageMonitors[i].Monitor.sliderProgress = {
+ progress: 0
+ };
+ $scope.MontageMonitors[i].Monitor.eventDuration = data.events[0].Event.Length;
+ console.log(">>> Setting Event for " + $scope.MontageMonitors[i].Monitor.Name + " to " + data.events[0].Event.Id);
+ NVRDataModel.log("Found expanded event " + data.events[0].Event.Id + " for monitor " + $scope.MontageMonitors[i].Monitor.Id);
+ } else {
+ // $scope.MontageMonitors[i].eventUrl="img/noevent.png";
+ // $scope.MontageMonitors[i].eventUrlTime = "";
+ // NVRDataModel.log ("Setting img src to null as data received in background");
}
-
- });
-
+ }
+ });
}
}
-
//---------------------------------------------------------
// This is periodically called to get the current playing
// event by zms. I use this to display a timestamp
// Its a 2 step process - get event Id then go a Event
// API call to get time stamp. Sucks
//---------------------------------------------------------
-
function checkAllEvents() {
-
- console.log ("Timer:Events are checked....");
-
+ console.log("Timer:Events are checked....");
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
// don't check for monitors that are not shown
// because nph connkey won't exist and the response
// will fail
- if ($scope.MontageMonitors[i].Monitor.eventUrl != "" && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' && $scope.MontageMonitors[i].Monitor.connKey != '' &&
- $scope.MontageMonitors[i].Monitor.Function != 'None' &&
- $scope.MontageMonitors[i].Monitor.listDisplay != 'noshow' &&
- $scope.MontageMonitors[i].Monitor.Enabled != '0') {
- // NVRDataModel.debug("Checking event status for " + $scope.MontageMonitors[i].Monitor.Name + ":" + $scope.MontageMonitors[i].Monitor.eventUrl + ":" + $scope.MontageMonitors[i].Monitor.Function + ":" + $scope.MontageMonitors[i].Monitor.listDisplay);
- // console.log ("Sending query 99 for " + $scope.MontageMonitors[i].Monitor.Name + " with ck="+$scope.MontageMonitors[i].Monitor.connKey);
+ if ($scope.MontageMonitors[i].Monitor.eventUrl != "" && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' && $scope.MontageMonitors[i].Monitor.connKey != '' && $scope.MontageMonitors[i].Monitor.Function != 'None' && $scope.MontageMonitors[i].Monitor.listDisplay != 'noshow' && $scope.MontageMonitors[i].Monitor.Enabled != '0') {
+ // NVRDataModel.debug("Checking event status for " + $scope.MontageMonitors[i].Monitor.Name + ":" + $scope.MontageMonitors[i].Monitor.eventUrl + ":" + $scope.MontageMonitors[i].Monitor.Function + ":" + $scope.MontageMonitors[i].Monitor.listDisplay);
+ // console.log ("Sending query 99 for " + $scope.MontageMonitors[i].Monitor.Name + " with ck="+$scope.MontageMonitors[i].Monitor.connKey);
controlEventStream('99', '', $scope.MontageMonitors[i].Monitor.connKey, i);
-
}
}
}
-
-
-
-
//--------------------------------------------------------------
// Used to control zms for a connkey. If ndx is not -1,
// then it also calls an event API for the returned eid
@@ -386,7 +280,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
NVRDataModel.debug("Deferring control " + cmd + " by " + mMtime);
$timeout(function () {
subControlStream(cmd, connkey);
-
}, mMtime);
}
@@ -399,42 +292,33 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
/*timeout: 15000,*/
url: loginData.url + '/index.php',
headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- //'Accept': '*/*',
+ 'Content-Type': 'application/x-www-form-urlencoded', //'Accept': '*/*',
},
transformRequest: function (obj) {
var str = [];
- for (var p in obj)
- str.push(encodeURIComponent(p) + "=" +
- encodeURIComponent(obj[p]));
+ for (var p in obj) str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
var foo = str.join("&");
//console.log("****SUB RETURNING " + foo);
return foo;
},
-
data: {
view: "request",
request: "stream",
connkey: connkey,
command: cmd,
- auth: myauthtoken,
- // user: loginData.username,
+ auth: myauthtoken, // user: loginData.username,
// pass: loginData.password
}
});
-
req.then(function (succ) {
NVRDataModel.debug("subControl success:" + JSON.stringify(succ));
- },
- function (err) {NVRDataModel.debug("subControl error:" + JSON.stringify(err));});
-
-
+ }, function (err) {
+ NVRDataModel.debug("subControl error:" + JSON.stringify(err));
+ });
}
-
function controlEventStream(cmd, disp, connkey, ndx, extras) {
// console.log("Command value " + cmd);
-
if (disp) {
$ionicLoading.hide();
$ionicLoading.show({
@@ -444,8 +328,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
});
}
var loginData = NVRDataModel.getLogin();
-
-
/*
var CMD_NONE = 0;
var CMD_PAUSE = 1;
@@ -464,18 +346,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
var CMD_SEEK = 14;
var CMD_QUERY = 99;
*/
-
-
-
// You need to POST commands to control zms
// Note that I am url encoding the parameters into the URL
// If I leave it as JSON, it gets converted to OPTONS due
// to CORS behaviour and ZM/Apache don't seem to handle it
-
//console.log("POST: " + loginData.url + '/index.php');
-
//console.log ("AUTH IS " + $rootScope.authSession);
-
var myauthtoken = $rootScope.authSession.replace("&auth=", "");
//&auth=
var req = qHttp({
@@ -483,137 +359,103 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
/*timeout: 15000,*/
url: loginData.url + '/index.php',
headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- //'Accept': '*/*',
+ 'Content-Type': 'application/x-www-form-urlencoded', //'Accept': '*/*',
},
transformRequest: function (obj) {
var str = [];
- for (var p in obj)
- str.push(encodeURIComponent(p) + "=" +
- encodeURIComponent(obj[p]));
+ for (var p in obj) str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
var foo = str.join("&");
- if (extras)
- foo = foo + extras;
- //console.log("****RETURNING " + foo);
+ if (extras) foo = foo + extras;
+ //console.log("****RETURNING " + foo);
return foo;
},
-
data: {
view: "request",
request: "stream",
connkey: connkey,
command: cmd,
- auth: myauthtoken,
- // user: loginData.username,
+ auth: myauthtoken, // user: loginData.username,
// pass: loginData.password
}
});
req.then(function (succ) {
-
var resp = succ.data;
- //console.log("SUCCESS FOR: " + JSON.stringify(resp));
-
- //SUCCESS FOR: {"result":"Ok","status":{"type":3,"event":29621,"progress":1,"rate":1,"zoom":"1.0","paused":0}}
- //$scope.MontageMonitors[ndx].Monitor.eid = data.event.Event.Id;
- if (resp.result == "Ok" && ndx != -1 && (resp.status.event == $scope.MontageMonitors[ndx].Monitor.eid))
+ console.log ("zms response: " + JSON.stringify(resp));
+
+ // move progress bar if event id is the same
+ if (resp.result == "Ok" && ndx != -1 && (resp.status.event == $scope.MontageMonitors[ndx].Monitor.eid))
$scope.MontageMonitors[ndx].Monitor.sliderProgress.progress = resp.status.progress;
- if (resp.result == "Ok" && ndx != -1 && (resp.status.event != $scope.MontageMonitors[ndx].Monitor.eid) ) {
- // $scope.MontageMonitors[ndx].Monitor.sliderProgress.progress = 0;
- NVRDataModel.debug ("Fetching details, as event changed for " + $scope.MontageMonitors[ndx].Monitor.Name+" from " + $scope.MontageMonitors[ndx].Monitor.eid + " to " +resp.status.event);
+
+ if (resp.result == "Ok" && ndx != -1 && ((resp.status.event != $scope.MontageMonitors[ndx].Monitor.eid) || $scope.MontageMonitors[ndx].Monitor.noGraph == true)) {
+ $scope.MontageMonitors[ndx].Monitor.noGraph = false;
+ // $scope.MontageMonitors[ndx].Monitor.sliderProgress.progress = 0;
+ NVRDataModel.debug("Fetching details, as event changed for " + $scope.MontageMonitors[ndx].Monitor.Name + " from " + $scope.MontageMonitors[ndx].Monitor.eid + " to " + resp.status.event);
var ld = NVRDataModel.getLogin();
var apiurl = ld.apiurl + "/events/" + resp.status.event + ".json";
//console.log ("API " + apiurl);
- qHttp({method:'get', url:apiurl})
- .then(function (succ) {
- var data = succ.data;
- var currentEventTime = moment(data.event.Event.StartTime);
- var maxTime = moment();
- //NVRDataModel.debug ("Monitor: " + $scope.MontageMonitors[ndx].Monitor.Id + " max time="+maxTime + "("+$scope.datetimeValueTo.value+")"+ " current="+currentEventTime + "("+data.event.Event.StartTime+")");
- if ($scope.MontageMonitors[ndx].Monitor.eventUrlTime != data.event.Event.StartTime && currentEventTime.diff(maxTime) <= 0) {
-
-
- var framearray = {
-
+ qHttp({
+ method: 'get',
+ url: apiurl
+ }).then(function (succ) {
+ var data = succ.data;
+ var currentEventTime = moment(data.event.Event.StartTime);
+ var maxTime = moment();
+ //NVRDataModel.debug ("Monitor: " + $scope.MontageMonitors[ndx].Monitor.Id + " max time="+maxTime + "("+$scope.datetimeValueTo.value+")"+ " current="+currentEventTime + "("+data.event.Event.StartTime+")");
+
+ var framearray = {
labels: [],
datasets: [{
-
backgroundColor: 'rgba(242, 12, 12, 0.5)',
borderColor: 'rgba(242, 12, 12, 0.5)',
data: [],
- }]
+ }]
};
-
-
- framearray.labels = [];
- var ld = NVRDataModel.getLogin();
- console.log (">>>>> GRAPH");
- for (i=0; i<data.event.Frame.length; i++)
- {
- var ts = moment(data.event.Frame[i].TimeStamp).format(timeFormat);
-
- //console.log ("pushing s:" + event.Frame[i].Score+" t:"+ts);
-
- framearray.datasets[0].data.push({
- x: ts,
- y: data.event.Frame[i].Score
- });
- framearray.labels.push("");
-
- }
- $timeout(function () {
- drawGraph(framearray,$scope.MontageMonitors[ndx].Monitor.Id);
- }, 500);
-
-
- var element = angular.element(document.getElementById($scope.MontageMonitors[ndx].Monitor.Id + "-timeline"));
- element.removeClass('animated flipInX');
- element.addClass('animated flipOutX');
- $timeout(function () {
- element.removeClass('animated flipOutX');
- element.addClass('animated flipInX');
- $scope.MontageMonitors[ndx].Monitor.eventUrlTime = data.event.Event.StartTime;
-
- var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
- $scope.MontageMonitors[ndx].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + data.event.Event.Id + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[ndx].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
- $scope.MontageMonitors[ndx].Monitor.eid = data.event.Event.Id;
-
- $scope.MontageMonitors[ndx].Monitor.sliderProgress = {progress:0};
- $scope.MontageMonitors[ndx].Monitor.eventDuration = data.event.Event.Length;
- console.log (">>> Setting Event for " + $scope.MontageMonitors[ndx].Monitor.Name+" to " +data.event.Event.Id);
-
-
- }, 700);
-
- } else if (currentEventTime.diff(maxTime) > 0) {
- NVRDataModel.debug(">>>>>>>>Monitor " + $scope.MontageMonitors[ndx].Monitor.Id + " event time of " + data.event.Event.StartTime + " exceeds " + $scope.datetimeValueTo.value + " stopping...");
- subControlStream(17, connkey);
-
-
+ framearray.labels = [];
+ var ld = NVRDataModel.getLogin();
+ console.log(">>>>> GRAPH");
+ for (i = 0; i < data.event.Frame.length; i++) {
+ var ts = moment(data.event.Frame[i].TimeStamp).format(timeFormat);
+ //console.log ("pushing s:" + event.Frame[i].Score+" t:"+ts);
+ framearray.datasets[0].data.push({
+ x: ts,
+ y: data.event.Frame[i].Score
+ });
+ framearray.labels.push("");
}
-
- },
- function (err) {$scope.MontageMonitors[ndx].Monitor.eventUrlTime = "-"; }
- );
+ $timeout(function () {
+ drawGraph(framearray, $scope.MontageMonitors[ndx].Monitor.Id);
+ }, 500);
+ var element = angular.element(document.getElementById($scope.MontageMonitors[ndx].Monitor.Id + "-timeline"));
+ element.removeClass('animated flipInX');
+ element.addClass('animated flipOutX');
+ $timeout(function () {
+ element.removeClass('animated flipOutX');
+ element.addClass('animated flipInX');
+ $scope.MontageMonitors[ndx].Monitor.eventUrlTime = data.event.Event.StartTime;
+ var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality;
+ $scope.MontageMonitors[ndx].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + data.event.Event.Id + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[ndx].Monitor.connKey + "&scale=" + bw + "&rand=" + $rootScope.rand;
+ $scope.MontageMonitors[ndx].Monitor.eid = data.event.Event.Id;
+ $scope.MontageMonitors[ndx].Monitor.sliderProgress = {
+ progress: 0
+ };
+ $scope.MontageMonitors[ndx].Monitor.eventDuration = data.event.Event.Length;
+ console.log(">>> Setting Event for " + $scope.MontageMonitors[ndx].Monitor.Name + " to " + data.event.Event.Id);
+ }, 700);
+
-
+ }, function (err) {
+ $scope.MontageMonitors[ndx].Monitor.eventUrlTime = "-";
+ });
}
- },
- function (err) { NVRDataModel.log("Error sending event command " + JSON.stringify(err), "error");}
-
- );
-
-
+ }, function (err) {
+ NVRDataModel.log("Error sending event command " + JSON.stringify(err), "error");
+ });
}
-
-
-
$scope.isBackground = function () {
return NVRDataModel.isBackground();
};
-
-
//----------------------------------------------------------------
// Alarm notification handling
//----------------------------------------------------------------
@@ -626,22 +468,19 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
});
$state.go("events", {
"id": 0,
- "playEvent":false
+ "playEvent": false
}, {
reload: true
});
}
};
-
$scope.handleAlarmsWhileMinimized = function () {
$rootScope.isAlarm = !$rootScope.isAlarm;
-
$scope.minimal = !$scope.minimal;
NVRDataModel.debug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
$interval.cancel(intervalHandle);
$interval.cancel($rootScope.eventQueryInterval);
-
if (!$rootScope.isAlarm) {
$rootScope.alarmCount = "0";
$ionicHistory.nextViewOptions({
@@ -649,42 +488,26 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
});
$state.go("events", {
"id": 0,
- "playEvent":false,
+ "playEvent": false,
}, {
reload: true
});
}
};
-
-
//-------------------------------------------------------------
// this is checked to make sure we are not pulling images
// when app is in background. This is a problem with Android,
// for example
//-------------------------------------------------------------
-
$scope.isBackground = function () {
//console.log ("Is background called from Montage and returned " +
//NVRDataModel.isBackground());
return NVRDataModel.isBackground();
};
-
-
-
-
-
-
-
-
- $scope.toggleControls = function()
- {
- $scope.showControls = !$scope.showControls;
- };
-
-
-
+ $scope.toggleControls = function () {
+ $scope.showControls = !$scope.showControls;
+ };
$scope.toggleSelectItem = function (ndx) {
-
if ($scope.MontageMonitors[ndx].Monitor.selectStyle !== "undefined" && $scope.MontageMonitors[ndx].Monitor.selectStyle == "dragborder-selected") {
$scope.MontageMonitors[ndx].Monitor.selectStyle = "";
} else {
@@ -695,31 +518,24 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//---------------------------------------------------------------------
// Called when you enable/disable dragging
//---------------------------------------------------------------------
-
$scope.dragToggle = function () {
dragToggle();
-
-
};
function dragToggle() {
var i;
$scope.isDragabillyOn = !$scope.isDragabillyOn;
-
$ionicSideMenuDelegate.canDragContent($scope.isDragabillyOn ? false : true);
-
//$timeout(function(){pckry.reloadItems();},10);
NVRDataModel.debug("setting dragabilly to " + $scope.isDragabillyOn);
if ($scope.isDragabillyOn) {
$scope.showSizeButtons = true;
-
$scope.dragBorder = "dragborder";
NVRDataModel.debug("Enabling drag for " + draggies.length + " items");
for (i = 0; i < draggies.length; i++) {
draggies[i].enable();
draggies[i].bindHandles();
}
-
// reflow and reload as some may be hidden
// $timeout(function(){pckry.reloadItems();$timeout(function(){pckry.layout();},300);},100);
} else {
@@ -743,7 +559,6 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
NVRDataModel.setLogin(ld);*/
}, 300);
}, 100);
-
}
}
//---------------------------------------------------------------------
@@ -752,12 +567,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.togglePTZ = function () {
$scope.showPTZ = !$scope.showPTZ;
};
-
$scope.callback = function () {
// console.log("dragging");
};
-
-
$scope.onDropComplete = function (index, obj, event) {
//console.log("dragged");
var otherObj = $scope.MontageMonitors[index];
@@ -765,134 +577,66 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.MontageMonitors[index] = obj;
$scope.MontageMonitors[otherIndex] = otherObj;
};
-
-
-
-
//---------------------------------------------------------------------
// changes order of montage display
//---------------------------------------------------------------------
-
$scope.toggleMontageDisplayOrder = function () {
$scope.packMontage = !$scope.packMontage;
loginData.packMontage = $scope.packMontage;
NVRDataModel.setLogin(loginData);
//console.log ("Switching orientation");
};
-
-
//---------------------------------------------------------------------
// In Android, the app runs full steam while in background mode
// while in iOS it gets suspended unless you ask for specific resources
// So while this view, we DON'T want Android to keep sending 1 second
// refreshes to the server for images we are not seeing
//---------------------------------------------------------------------
-
function onPause() {
NVRDataModel.debug("MontageHistoryCtrl: onpause called");
$interval.cancel($rootScope.eventQueryInterval);
$interval.cancel(intervalHandle);
-
// $interval.cancel(modalIntervalHandle);
-
// FIXME: Do I need to setAwake(false) here?
}
-
- function onResume() {
-
- // FIXME: Do we need to resume timers? when you resume, you go to portal and then here
- /*
- if (!$scope.isModalActive) {
- var ld = NVRDataModel.getLogin();
-
-
- NVRDataModel.debug("MontageHistoryCtrl: onresume called");
- NVRDataModel.log("Restarting eventQuery timer on resume");
-
- console.log ("************** TIMER STARTED INSIDE RESUME ***************");
-
- //$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
- $interval.cancel($rootScope.eventQueryInterval);
- $rootScope.eventQueryInterval = $interval(function () {
- checkAllEvents();
- // console.log ("Refreshing Image...");
- }.bind(this),zm.eventHistoryTimer);
- } else // modal is active
- {
- // $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
- }*/
-
-
-
-
- }
-
+ function onResume() {}
$scope.openMenu = function () {
$timeout(function () {
$rootScope.stateofSlide = $ionicSideMenuDelegate.isOpen();
}, 500);
-
$ionicSideMenuDelegate.toggleLeft();
};
-
$scope.$on('$destroy', function () {
NVRDataModel.debug("Cancelling eventQueryInterval");
$interval.cancel($rootScope.eventQueryInterval);
-
-
-
-
});
-
-
$scope.$on('$ionicView.loaded', function () {
//console.log("**VIEW ** MontageHistoryCtrl Loaded");
});
-
$scope.$on('$ionicView.enter', function () {
NVRDataModel.debug("**VIEW ** MontageHistory Ctrl Entered");
var ld = NVRDataModel.getLogin();
//console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
-
- NVRDataModel.debug ("query timer started");
+ NVRDataModel.debug("query timer started");
$interval.cancel($rootScope.eventQueryInterval);
//console.log ("****************** TIMER STARTED INSIDE ENTER");
$rootScope.eventQueryInterval = $interval(function () {
checkAllEvents();
-
}.bind(this), zm.eventHistoryTimer);
-
-
-
-
-
});
-
/*$scope.$on ('$ionicView.unloaded', function() {
console.log ("******** HISTORY UNLOADED KILLING WINDOW ************");
window.stop();
});*/
-
-
$scope.$on('$ionicView.beforeEnter', function () {
-
// NVRDataModel.log ("Before Enter History: initing connkeys");
-
-
-
-
-
});
-
$scope.$on('$ionicView.beforeLeave', function () {
//console.log("**VIEW ** Event History Ctrl Left, force removing modal");
if ($scope.modal) $scope.modal.remove();
-
-
NVRDataModel.log("BeforeLeave: Nullifying the streams...");
-
for (i = 0; i < $scope.MontageMonitors.length; i++) {
var element = document.getElementById("img-" + i);
/*if (element)
@@ -904,46 +648,25 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//$scope.$apply(nullify(element));
//element.src="";
}*/
-
}
-
-
-
NVRDataModel.log("Cancelling event query timer");
$interval.cancel($rootScope.eventQueryInterval);
-
NVRDataModel.log("MontageHistory:Stopping network pull...");
// make sure this is applied in scope digest to stop network pull
// thats why we are doing it beforeLeave
-
for (i = 0; i < $scope.MontageMonitors.length; i++) {
- if ($scope.MontageMonitors[i].Monitor.connKey != '' &&
- $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' &&
- $scope.MontageMonitors[i].Monitor.Function != 'None' &&
- $scope.MontageMonitors[i].Monitor.lisDisplay != 'noshow' &&
- $scope.MontageMonitors[i].Monitor.Enabled != '0') {
+ if ($scope.MontageMonitors[i].Monitor.connKey != '' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' && $scope.MontageMonitors[i].Monitor.Function != 'None' && $scope.MontageMonitors[i].Monitor.lisDisplay != 'noshow' && $scope.MontageMonitors[i].Monitor.Enabled != '0') {
NVRDataModel.log("Before leave: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey);
var tmpCK = angular.copy($scope.MontageMonitors[i].Monitor.connKey);
timedControlEventStream(2500, 17, "", tmpCK, -1);
}
}
-
pckry.destroy();
window.removeEventListener("resize", orientationChanged, false);
-
NVRDataModel.log("Forcing a window.stop() here");
NVRDataModel.stopNetwork("MontageHistory-beforeLeave");
-
-
-
-
- });
-
- $scope.$on('$ionicView.unloaded', function () {
-
});
-
-
+ $scope.$on('$ionicView.unloaded', function () {});
$scope.sliderChanged = function (dirn) {
console.log("SLIDER CHANGED");
if ($scope.sliderChanging) {
@@ -951,35 +674,26 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
//$scope.slider.monsize = oldSliderVal;
// return;
}
-
$scope.sliderChanging = true;
-
var somethingReset = false;
-
// this only changes items that are selected
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
-
var curVal = parseInt($scope.MontageMonitors[i].Monitor.gridScale);
curVal = curVal + (10 * dirn);
if (curVal < 10) curVal = 10;
if (curVal > 100) curVal = 100;
//console.log ("For Index: " + i + " From: " + $scope.MontageMonitors[i].Monitor.gridScale + " To: " + curVal);
-
if ($scope.isDragabillyOn) {
// only do this for selected monitors
if ($scope.MontageMonitors[i].Monitor.selectStyle == "dragborder-selected") {
-
$scope.MontageMonitors[i].Monitor.gridScale = curVal;
somethingReset = true;
}
} else {
$scope.MontageMonitors[i].Monitor.gridScale = curVal;
//somethingReset = true;
-
}
-
}
-
// this changes all items if none were selected
if (!somethingReset && $scope.isDragabillyOn) // nothing was selected
{
@@ -991,10 +705,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.MontageMonitors[i].Monitor.gridScale = cv;
}
}
-
-
//pckry.reloadItems();
-
pckry.once('layoutComplete', function () {
/* $timeout(function () {
var positions = pckry.EHgetShiftPositions('eh-data-item-id');
@@ -1006,33 +717,22 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.sliderChanging = false;
}, zm.packeryTimer);*/
});
-
-
-
if (!somethingReset) {
//console.log (">>>SOMETHING NOT RESET");
$timeout(function () {
pckry.layout();
}, zm.packeryTimer);
} else {
-
//console.log (">>>SOMETHING RESET");
$timeout(function () {
layout(pckry);
}, zm.packeryTimer);
}
-
-
-
-
};
function layout(pckry) {
pckry.shiftLayout();
}
-
-
-
$scope.resetSizes = function () {
var somethingReset = false;
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
@@ -1052,101 +752,44 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.MontageMonitors[i].Monitor.gridScale = "50";
}
}
-
$timeout(function () {
pckry.reloadItems();
-
-
$timeout(function () {
pckry.layout();
}, zm.packeryTimer); // force here - no shiftlayout
-
-
}, 100);
-
};
-
- function isEmpty(obj) {
+ function isEmpty(obj) {
for (var prop in obj) {
return false;
}
return true;
}
-
// called by afterEnter to load Packery
function initPackery() {
-
-
$ionicLoading.show({
template: $translate.instant('kArrangingImages'),
noBackdrop: true,
duration: zm.loadingTimeout
});
-
var progressCalled = false;
draggies = [];
var layouttype = true;
var ld = NVRDataModel.getLogin();
-
-
- var positionsStr = ld.packeryPositions;
- var positions = {};
-
- // if (positionsStr == '') {
- if (1) {
-
- NVRDataModel.log("Did NOT find a EHpackery layout");
- layouttype = true;
- } else {
-
- //console.log ("POSITION STR IS " + positionsStr);
- positions = JSON.parse(positionsStr);
- NVRDataModel.log("found a EHpackery layout");
- console.log(positionsStr);
- layouttype = false;
- }
-
-
- var cnt = 0;
- $scope.MontageMonitors.forEach(function (elem) {
-
- if ((elem.Monitor.Enabled != '0') && (elem.Monitor.Function != 'None'))
- cnt++;
- });
-
- NVRDataModel.log("Monitors that are active and not DOM hidden: " + cnt + " while grid has " + positions.length);
-
- if (cnt > NVRDataModel.getLogin().maxMontage) {
- cnt = NVRDataModel.getLogin().maxMontage;
- NVRDataModel.log("restricting monitor count to " + cnt + " due to max-montage setting");
- }
-
- /*if (cnt != positions.length) {
-
- NVRDataModel.log("Whoops!! Monitors have changed. I'm resetting layouts, sorry!");
- layouttype = true;
- positions = {};
- }*/
-
+
var elem = angular.element(document.getElementById("mygrid"));
-
//console.log ("**** mygrid is " + JSON.stringify(elem));
-
imagesLoaded(elem).on('progress', function (instance, img) {
-
progressCalled = true;
-
// if (layouttype) $timeout (function(){layout(pckry);},100);
});
-
imagesLoaded(elem).once('always', function () {
console.log("******** ALL IMAGES LOADED");
NVRDataModel.debug("All images loaded");
-
-
$ionicLoading.hide();
- $timeout(function () {
+
+ layouttype = true;
pckry = new Packery('.grid', {
itemSelector: '.grid-item',
percentPosition: true,
@@ -1155,16 +798,16 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
initLayout: layouttype
});
+ pckry.reloadItems();
if (!progressCalled) {
- NVRDataModel.log("*** BUG PROGRESS WAS NOT CALLED");
- pckry.reloadItems();
-
+ NVRDataModel.log("*** PROGRESS WAS NOT CALLED");
+
}
+
+
+ $timeout(function () {
-
- var cnt = 0;
pckry.getItemElements().forEach(function (itemElem) {
-
draggie = new Draggabilly(itemElem);
pckry.bindDraggabillyEvents(draggie);
draggies.push(draggie);
@@ -1176,7 +819,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
- if (!isEmpty(positions)) {
+ /*if (!isEmpty(positions)) {
NVRDataModel.log("Arranging as per packery grid");
for (var i = 0; i < $scope.MontageMonitors.length; i++) {
@@ -1192,79 +835,65 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
NVRDataModel.debug("All images loaded, doing image layout");
- /* $timeout(function () {
- pckry.initShiftLayout(positions, 'eh-data-item-id');
- }, 0);*/
- }
- $scope.allImagesLoaded = true;
+ $timeout(function () {
+ pckry.initShiftLayout(positions, 'data-item-id');
+ }, 0);
+ }*/
+
+
+
$timeout(function () {
NVRDataModel.log("Force calling resize");
pckry.layout();
-
}, zm.packeryTimer); // don't ask
}, zm.packeryTimer);
+
});
function itemDragged(item) {
NVRDataModel.debug("drag complete");
-
-
}
-
-
}
-
-
$scope.$on('$ionicView.afterEnter', function () {
// This rand is really used to reload the monitor image in img-src so it is not cached
// I am making sure the image in montage view is always fresh
// I don't think I am using this anymore FIXME: check and delete if needed
// $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
-
-
- $scope.showControls = false;
+ $scope.showControls = false;
+ readyToRun = false;
$timeout(function () {
+
initPackery();
+ readyToRun = true;
+ footerCollapse();
+
}, zm.packeryTimer);
});
-
$scope.reloadView = function () {
$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
NVRDataModel.log("User action: image reload " + $rootScope.rand);
};
-
$scope.doRefresh = function () {
-
-
-
//console.log("***Pull to Refresh, recomputing Rand");
NVRDataModel.log("Reloading view for montage view, recomputing rand");
$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
$scope.MontageMonitors = [];
imageLoadingDataShare.set(0);
-
-
var refresh = NVRDataModel.getMonitors(1);
-
refresh.then(function (data) {
$scope.MontageMonitors = data.data;
$scope.$broadcast('scroll.refreshComplete');
});
};
-
-
- function drawGraph(f,mid) {
-
- console.log ("Graphing on " + "eventchart-"+mid);
- var cv = document.getElementById("eventchart-"+mid);
+ function drawGraph(f, mid) {
+ console.log("Graphing on " + "eventchart-" + mid);
+ var cv = document.getElementById("eventchart-" + mid);
var ctx = cv.getContext("2d");
-
-
frameoptions = {
responsive: true,
legend: false,
@@ -1279,110 +908,76 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
display: false,
labelString: 'value',
}
-
}],
xAxes: [{
type: 'time',
display: false,
time: {
-
format: timeFormat,
tooltipFormat: 'll HH:mm',
min: f.datasets[0].data[0].x,
max: f.datasets[0].data[f.datasets[0].data.length - 1].x,
- displayFormats: {
-
- }
+ displayFormats: {}
},
scaleLabel: {
display: false,
labelString: ''
}
-
}]
}
};
-
-
$timeout(function () {
-
-
var myChart = new Chart(ctx, {
type: 'line',
data: f,
options: frameoptions,
});
-
});
}
-
-
//---------------------------------------------------------------------
// Controller main
//---------------------------------------------------------------------
-
var intervalHandle;
$scope.isModalActive = false;
var modalIntervalHandle;
$scope.hrsAgo = 4;
-
window.addEventListener("resize", orientationChanged, false);
-
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
-
$scope.timeFormat = "yyyy-MM-dd " + NVRDataModel.getTimeFormat();
$scope.displayDateTimeSliders = true;
$scope.showtimers = true;
$scope.loginData = NVRDataModel.getLogin();
var timeFormat = 'MM/DD/YYYY HH:mm:ss';
-
var curYear = new Date().getFullYear();
-
var readyToRun = false;
var i;
-
$scope.sliderVal = {
-
- rate: 1,
- realRate: 100,
+ rate: 2,
+ realRate: 200,
hideNoEvents: false,
enableGapless: true,
exactMatch: false,
showTimeline: true
-
};
-
-
var frameoptions = [];
-
-
// default = start of day
var timeto = moment();
var timefrom = moment().startOf('day');
-
- $scope.sliderVal.rate = 1;
+ $scope.sliderVal.rate = 2;
$scope.sliderVal.realRate = $scope.sliderVal.rate * 100;
-
-
$scope.datetimeValueFrom = {
value: "",
- hrs:""
+ hrs: ""
};
$scope.datetimeValueTo = {
value: ""
};
-
$scope.datetimeValueFrom.value = timefrom.toDate();
$scope.datetimeValueFrom.hrs = Math.round(moment.duration(moment().diff(moment($scope.datetimeValueFrom.value))).asHours());
-
$scope.datetimeValueTo.value = timeto.toDate();
-
$rootScope.eventQueryInterval = "";
-
-
var commonCss = {
-
background: {
"background-color": "silver"
},
@@ -1402,42 +997,29 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
"background-color": "red"
} // use it if double value
};
-
-
$scope.slider_modal_options_rate = {
from: 1,
to: 10,
realtime: true,
step: 1,
- className: "mySliderClass",
- //modelLabels:function(val) {return "";},
+ className: "mySliderClass", //modelLabels:function(val) {return "";},
smooth: false,
css: commonCss,
dimension: 'X'
-
};
-
-
var gridcontainer, pckry, draggie, draggies;
-
$scope.monitorSize = []; // array with montage sizes per monitor
$scope.scaleDirection = []; // 1 = increase -1 = decrease
-
-
// The difference between old and original is this:
// old will have a copy of the last re-arranged monitor list
// while original will have a copy of the order returned by ZM
-
var oldMonitors = []; // To keep old order if user cancels after sort;
-
// Montage display order may be different so don't
// mangle monitors as it will affect other screens
// in Montage screen we will work with this local copy
//$scope.MontageMonitors = angular.copy ($scope.monitors);
-
var montageOrder = []; // This array will keep the ordering in montage view
var hiddenOrder = []; // 1 = hide, 0 = don't hide
-
var tempMonitors = message;
if (tempMonitors.length == 0) {
$rootScope.zmPopup = $ionicPopup.alert({
@@ -1450,22 +1032,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$state.go("login");
return;
}
-
-
- $scope.MontageMonitors = message;
+ $scope.MontageMonitors = message;
NVRDataModel.log("Inside MontageHistoryCtrl:We found " + $scope.MontageMonitors.length + " monitors");
-
- // $scope.MontageMonitors = NVRDataModel.applyMontageMonitorPrefs(message, 1)[0];
-
-
+ // $scope.MontageMonitors = NVRDataModel.applyMontageMonitorPrefs(message, 1)[0];
var loginData = NVRDataModel.getLogin();
-
// init monitors
NVRDataModel.debug(">>Initializing connkeys and images...");
for (i = 0; i < $scope.MontageMonitors.length; i++) {
//$scope.MontageMonitors[i].Monitor.connKey='';
-
-
$scope.MontageMonitors[i].Monitor.eid = "-1";
$scope.MontageMonitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
$scope.MontageMonitors[i].Monitor.eventUrl = 'img/noevent.png';
@@ -1475,18 +1049,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$scope.MontageMonitors[i].Monitor.gridScale = "50";
$scope.MontageMonitors[i].Monitor.selectStyle = "";
$scope.MontageMonitors[i].Monitor.alarmState = 'color:rgba(0,0,0,0);';
- $scope.MontageMonitors[i].Monitor.sliderProgress = {progress:0};
-
+ $scope.MontageMonitors[i].Monitor.sliderProgress = {
+ progress: 0
+ };
}
- readyToRun = true;
-
-
-
+
// --------------------------------------------------------
// Handling of back button in case modal is open should
// close the modal
// --------------------------------------------------------
-
$ionicPlatform.registerBackButtonAction(function (e) {
e.preventDefault();
if ($scope.modal && $scope.modal.isShown()) {
@@ -1499,37 +1070,22 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
NVRDataModel.debug("Modal is closed, so toggling or exiting");
if (!$ionicSideMenuDelegate.isOpenLeft()) {
$ionicSideMenuDelegate.toggleLeft();
-
} else {
navigator.app.exitApp();
}
-
}
-
}, 1000);
-
-
-
-
$scope.isRefresh = $stateParams.isRefresh;
var sizeInProgress = false;
$ionicSideMenuDelegate.canDragContent(true);
-
-
-
-
$scope.LoginData = NVRDataModel.getLogin();
$scope.monLimit = $scope.LoginData.maxMontage;
$scope.currentLimit = $scope.LoginData.maxMontage;
-
if ($rootScope.platformOS != 'ios') {
NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit");
$scope.currentLimit = 5;
$scope.monLimit = 5;
-
}
-
-
$rootScope.authSession = "undefined";
$ionicLoading.show({
template: $translate.instant('kNegotiatingStreamAuth'),
@@ -1539,33 +1095,18 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
maxWidth: 300,
showDelay: 0
});
-
-
var ld = NVRDataModel.getLogin();
-
//console.log ("MONITORS " + JSON.stringify($scope.monitors));
$rootScope.validMonitorId = $scope.MontageMonitors[0].Monitor.Id;
- NVRDataModel.getAuthKey($rootScope.validMonitorId)
- .then(function (success) {
- $ionicLoading.hide();
- //console.log(success);
- $rootScope.authSession = success;
- NVRDataModel.log("Stream authentication construction: " +
- $rootScope.authSession);
-
- },
- function (error) {
-
- $ionicLoading.hide();
- NVRDataModel.debug("MontageHistoryCtrl: Error in authkey retrieval " + error);
- //$rootScope.authSession="";
- NVRDataModel.log("MontageHistoryCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
- });
-
-
-
-
-
-
-
+ NVRDataModel.getAuthKey($rootScope.validMonitorId).then(function (success) {
+ $ionicLoading.hide();
+ //console.log(success);
+ $rootScope.authSession = success;
+ NVRDataModel.log("Stream authentication construction: " + $rootScope.authSession);
+ }, function (error) {
+ $ionicLoading.hide();
+ NVRDataModel.debug("MontageHistoryCtrl: Error in authkey retrieval " + error);
+ //$rootScope.authSession="";
+ NVRDataModel.log("MontageHistoryCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+ });
}]); \ No newline at end of file
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 2c1c38c7..b71cf751 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -78,7 +78,7 @@
<div ng-if="( (defaultVideo=='') || (loginData.enableh264==false)) && (loginData.useNphZmsForEvents==true)">
<div id="event_canvas">
<canvas style="padding-left:23px;
- padding-right:23px;" id="eventchart" width="auto" height="20px"></canvas>
+ padding-right:23px;" id="eventchart" width="auto" height="20"></canvas>
</div>
<div ng-if="checkEventOn" id="event_slider" data-tap-disabled="false">
<div class="range">
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index aa38df16..98426dc1 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
<!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng- -->
<span ng-repeat="monitor in MontageMonitors | onlyEnabledAndEventHas |limitTo: currentLimit">
<div ng-if="$root.authSession!='undefined'">
- <div ng-if = "monitor.Monitor.eventUrl == 'img/noevent.png' && !sliderVal.hideNoEvents">
+ <div ng-if = "monitor.Monitor.eventUrl == 'img/noevent.png' ">
<!-- make sure we don't use id here
-- or we lose the handle for cleanup forever!-->
<div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
@@ -41,7 +41,7 @@
<div ng-if = "monitor.Monitor.eventUrl != 'img/noevent.png' && monitor.Monitor.connKey !=''">
<div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
<figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
- <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" on-swipe-left="toggleControls()" />
+ <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" on-swipe-left="toggleControls()" />
<figcaption class="normal-figcaption" >
&nbsp;
@@ -50,12 +50,12 @@
<i class="ion-pause"></i>&nbsp;
</span> {{monitor.Monitor.Name}}&nbsp;
- <div ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style="white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:9px" class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">
+ <div ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style="white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:9px" class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">[{{monitor.Monitor.eid}}]
<i class="ion-clock"></i> {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}} ({{humanizeTime(monitor.Monitor.eventUrlTime)}})&nbsp;
</div>
</figcaption>
</figure>
- <div ng-if="showControls">
+ <div ng-show="showControls">
@@ -63,12 +63,13 @@
<input on-release="seek(monitor.Monitor.Id,monitor.Monitor.sliderProgress.progress )" type="range" min="0" max="{{monitor.Monitor.eventDuration}}" ng-model="monitor.Monitor.sliderProgress.progress">
</div>
<div id="history_canvas_video">
- eventchart-{{monitor.Monitor.Id}}
- <canvas id="eventchart-{{monitor.Monitor.Id}}" width="95%" height="20px"></canvas>
- </div>
+
+ <canvas style="padding-left:23px;
+ padding-right:23px;" id="eventchart-{{monitor.Monitor.Id}}" width="auto" height="20"></canvas>
+
</div>
- <div id="flyoutmenu" ng-if="showControls" style="position:absolute;top:50%;left:50%;z-index:99999;transform: translate(-50%, -50%);">
+ <div id="flyoutmenu" ng-if="showControls" style="position:absolute;bottom:5%;left:50%;z-index:99999;transform: translate(-50%, -50%);">
<ul>
<li>
<a href="" ng-click="moveSlower(monitor.Monitor.Id)"> {{'kEventHistSlower' | translate}} </a>
@@ -81,6 +82,8 @@
</li>
</ul>
</div>
+ </div>
+
</div>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 15:30:48 +0000