summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/DataModel.js40
-rw-r--r--www/js/EventCtrl.js1284
-rw-r--r--www/js/ModalCtrl.js12
-rw-r--r--www/js/MonitorCtrl.js7
-rw-r--r--www/js/MontageCtrl.js58
-rw-r--r--www/js/angular-circular-navigation.js58
-rw-r--r--www/js/app.js24
-rw-r--r--www/js/controllers.js31
8 files changed, 876 insertions, 638 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 5104e464..1954d997 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -26,6 +26,9 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
'useSSL':false, // "1" if HTTPS
'keepAwake':true // don't dim/dim during live view
};
+ var configParams = {
+ 'ZM_EVENT_IMAGE_DIGITS':'-1'
+ };
//--------------------------------------------------------------------------
// uses fileLogger to write logs to file for later investigation
@@ -235,6 +238,43 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
},
//-----------------------------------------------------------------------------
+ // This function returns the numdigits for padding capture images
+ //-----------------------------------------------------------------------------
+
+ getKeyConfigParams: function (forceReload) {
+
+ var d = $q.defer();
+
+ if (forceReload ==1 || configParams.ZM_EVENT_IMAGE_DIGITS == '-1')
+ {
+ var apiurl = loginData.apiurl;
+ var myurl = apiurl + '/configs/viewByName/ZM_EVENT_IMAGE_DIGITS.json';
+ console.log ("CONFIG URL IS " + myurl);
+ $http.get(myurl)
+ .success(function(data) {
+ zmLog ("ZM_EVENT_IMAGE_DIGITS is " + data.config.Value);
+ configParams.ZM_EVENT_IMAGE_DIGITS = data.config.Value;
+ d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
+
+ })
+ .error (function(err) {
+ zmLog ("Error retrieving ZM_EVENT_IMAGE_DIGITS" + JSON.stringify(err));
+ zmLog ("Taking a guess, setting ZM_EVENT_IMAGE_DIGITS to 5");
+ // FIXME: take a plunge and keep it at 5?
+ configParams.ZM_EVENT_IMAGE_DIGITS = 5;
+ d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
+ });
+ }
+ else
+ {
+ zmLog ("ZM_EVENT_IMAGE_DIGITS is already configured for " + configParams.ZM_EVENT_IMAGE_DIGITS);
+ d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
+ }
+ return (d.promise);
+
+ },
+
+ //-----------------------------------------------------------------------------
// This function returns a list of monitors
// if forceReload == 1 then it will force an HTTP API request to get a list of monitors
// if 0. then it will return back the previously loaded monitor list if one exists, else
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index eb412575..dac73ec9 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -6,637 +6,815 @@
// This was before I got access to the new APIs. FIXME: Revisit this code to see what I am doing with it
// and whether the new API has a better mechanism
-angular.module('zmApp.controllers').controller('zmApp.EventCtrl', ['$scope', '$rootScope','zm', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', function ($scope, $rootScope, zm,ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate) {
-
-
- //---------------------------------------------------
- // Controller main
- //---------------------------------------------------
-
-
- var segmentHandle = 0; // holds timer for progress bar
- $scope.totalEventTime = 0; // used to display max of progress bar
- $scope.currentEventTime = 0;
- $scope.imageStyle=true;
-
-
-
- document.addEventListener("pause", onPause, false);
- console.log("I got STATE PARAM " + $stateParams.id);
- $scope.id = parseInt($stateParams.id, 10);
- $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
- //var segmentHandle = 0;
-
-
- // These are the commands ZM uses to move around
- // in ZMS
- var eventCommands = {
- next: "13",
- previous: "12",
- zoomin: "8",
- zoomout: "9",
- stop: "3",
- pause: "1",
- play: "2",
- fastFwd: "4",
- slowFwd: "5",
- fastRev: "7",
- slowRev: "6"
- };
-
- $scope.showSearch = false;
- var eventsPage = 1;
- var moreEvents = true;
- $scope.viewTitle = {
- title: ""
- };
- $scope.search = {
- text: ""
- };
- $scope.myfilter = "";
- $scope.eventCommands = eventCommands;
-
-
- // for some reason inifinite scroll is invoked
- // before I actually load the first page with page count
- // this makes scrolling stop as eventsPage is still 0
- // FIXME: This is a hack
-
- var pageLoaded = false;
- var enableLoadMore = true;
-
- // When loading images, it sometimes takes time - the images can be quite
- // large. What practically was happening was you'd see a blank screen for a few
- // seconds. Not a good UX. So what I am doing is when the events modal or
- // monitor modal is loaded, I show an ionic loading. And then when the first frame
- // finishes loading, I take it away
-
- console.log("***CALLING EVENTS FACTORY");
- var lData = ZMDataModel.getLogin();
- $scope.monitors = message;
-
- // I am converting monitor ID to monitor Name
- // so I can display it along with Events
- // Is there a better way?
-
- $scope.events = [];
-
- // First get total pages and then
- // start from the latest. If this fails, nothing displays
-
- ZMDataModel.getEventsPages($scope.id)
- .then(function (data) {
- eventsPage = data.pageCount;
- console.log("TOTAL EVENT PAGES IS " + eventsPage);
- pageLoaded = true;
- $scope.viewTitle.title = data.count;
- ZMDataModel.getEvents($scope.id, eventsPage, "")
+angular.module('zmApp.controllers')
+ .controller('zmApp.EventCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', '$ionicSlideBoxDelegate', '$ionicPosition', function ($scope, $rootScope, zm, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPosition) {
+
+ //---------------------------------------------------
+ // Controller main
+ //---------------------------------------------------
+
+ $scope.slides = [];
+
+
+ var segmentHandle = 0; // holds timer for progress bar
+ $scope.totalEventTime = 0; // used to display max of progress bar
+ $scope.currentEventTime = 0;
+ var oldEvent = ""; // will hold previous event that had showScrub = true
+ var scrollbynumber = 0;
+
+
+ document.addEventListener("pause", onPause, false);
+ console.log("I got STATE PARAM " + $stateParams.id);
+ $scope.id = parseInt($stateParams.id, 10);
+ $scope.connKey = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+ //var segmentHandle = 0;
+
+
+ // These are the commands ZM uses to move around
+ // in ZMS
+ var eventCommands = {
+ next: "13",
+ previous: "12",
+ zoomin: "8",
+ zoomout: "9",
+ stop: "3",
+ pause: "1",
+ play: "2",
+ fastFwd: "4",
+ slowFwd: "5",
+ fastRev: "7",
+ slowRev: "6"
+ };
+
+ var eventImageDigits = 5; // failsafe
+ ZMDataModel.getKeyConfigParams(0)
.then(function (data) {
- console.log("EventCtrl Got events");
- //var events = [];
- var myevents = data;
- for (var i = 0; i < myevents.length; i++) {
+ //console.log ("***GETKEY: " + JSON.stringify(data));
+ eventImageDigits = parseInt(data);
+ });
- myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
- }
+ $scope.showSearch = false;
+ var eventsPage = 1;
+ var moreEvents = true;
+ $scope.viewTitle = {
+ title: ""
+ };
+ $scope.search = {
+ text: ""
+ };
+ $scope.myfilter = "";
+ $scope.eventCommands = eventCommands;
+ $scope.loginData = ZMDataModel.getLogin();
+
+ $scope.mycarousel = {
+ index: 0
+ };
+ $scope.ionRange = {
+ index: 0
+ };
+
+
+ // for some reason inifinite scroll is invoked
+ // before I actually load the first page with page count
+ // this makes scrolling stop as eventsPage is still 0
+ // FIXME: This is a hack
+
+ var pageLoaded = false;
+ var enableLoadMore = true;
+
+ // When loading images, it sometimes takes time - the images can be quite
+ // large. What practically was happening was you'd see a blank screen for a few
+ // seconds. Not a good UX. So what I am doing is when the events modal or
+ // monitor modal is loaded, I show an ionic loading. And then when the first frame
+ // finishes loading, I take it away
+
+ console.log("***CALLING EVENTS FACTORY");
+ var lData = ZMDataModel.getLogin();
+ $scope.monitors = message;
+
+ // I am converting monitor ID to monitor Name
+ // so I can display it along with Events
+ // Is there a better way?
+
+ $scope.events = [];
+
+ // First get total pages and then
+ // start from the latest. If this fails, nothing displays
+
+ ZMDataModel.getEventsPages($scope.id)
+ .then(function (data) {
+ eventsPage = data.pageCount;
+ console.log("TOTAL EVENT PAGES IS " + eventsPage);
+ pageLoaded = true;
+ $scope.viewTitle.title = data.count;
+ ZMDataModel.getEvents($scope.id, eventsPage, "")
+ .then(function (data) {
+ console.log("EventCtrl Got events");
+ //var events = [];
+ var myevents = data;
+ var loginData = ZMDataModel.getLogin();
+ for (var i = 0; i < myevents.length; i++) {
+
+ myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+ myevents[i].Event.ShowScrub = false;
+ // now construct base path
+
+ var str = myevents[i].Event.StartTime;
+ //var yy = moment(str).format('h:mm:ssa on MMMM Do YYYY');
+ var yy = moment(str).format('YY');
+ var mm = moment(str).format('MM');
+ var dd = moment(str).format('DD');
+ var hh = moment(str).format('HH');
+ var min = moment(str).format('mm');
+ var sec = moment(str).format('ss');
+
+ myevents[i].Event.BasePath = loginData.url + "/events/" +
+ myevents[i].Event.MonitorId + "/" +
+ yy + "/" +
+ mm + "/" +
+ dd + "/" +
+ hh + "/" +
+ min + "/" +
+ sec + "/";
+
+
+ }
+
+
+ $scope.events = myevents;
+ // to avoid only few events being displayed
+ // if last page has less events
+ console.log("**Loading Next Page ***");
+ loadMore();
+ });
- $scope.events = myevents;
- // to avoid only few events being displayed
- // if last page has less events
- console.log ("**Loading Next Page ***");
- loadMore();
});
- });
+ // not explictly handling error --> I have a default "No events found" message
+ // displayed in the template if events list is null
- // not explictly handling error --> I have a default "No events found" message
- // displayed in the template if events list is null
-
-
- $scope.openMenu = function () {
- $ionicSideMenuDelegate.toggleLeft();
- };
-
-
- function onPause() {
- console.log("*** Moving to Background ***"); // Handle the pause event
- console.log("*** CANCELLING INTERVAL ****");
- $interval.cancel(segmentHandle);
- // FIXME: Do I need to setAwake(false) here?
- }
-
- //---------------------------------------------------
- // reload view
- //---------------------------------------------------
- $scope.reloadView = function () {
- // All we really need to do here is change the random token
- // in the image src and it will refresh. No need to reload the view
- // and if you did reload the view, it would go back to events list
- // which is the view - and when you are in the modal it will go away
- console.log("*** Refreshing Modal view ***");
- //$state.go($state.current, {}, {reload: true});
- $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
- $ionicLoading.show({
- template: "refreshed view",
- noBackdrop: true,
- duration: 3000
- });
- };
+ $scope.openMenu = function () {
+ $ionicSideMenuDelegate.toggleLeft();
+ };
- //---------------------------------------------------
- // when you tap a list entry - to break search loop
- //---------------------------------------------------
- $scope.tapped = function () {
- console.log("*** TAPPED ****");
- // if he tapped, the we are not infinite loading on ion-infinite
- if (enableLoadMore == false) {
- moreEvents = true;
- enableLoadMore = true;
- console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
- }
- };
-
- $scope.$on('$ionicView.loaded', function () {
- console.log("**VIEW ** Events Ctrl Loaded");
- });
-
- //-------------------------------------------------------------------------
- // Lets make sure we set screen dim properly as we enter
- // The problem is we enter other states before we leave previous states
- // from a callback perspective in ionic, so we really can't predictably
- // reset power state on exit as if it is called after we enter another
- // state, that effectively overwrites current view power management needs
- //------------------------------------------------------------------------
- $scope.$on('$ionicView.enter', function () {
- console.log("**VIEW ** Events Ctrl Entered");
- ZMDataModel.setAwake(false);
- });
-
- $scope.$on('$ionicView.leave', function () {
- console.log("**VIEW ** Events Ctrl Left");
- });
-
- $scope.$on('$ionicView.unloaded', function () {
- console.log("**VIEW ** Events Ctrl Unloaded");
- console.log("*** MODAL ** Destroying modal too");
- if ($scope.modal !== undefined) {
- $scope.modal.remove();
+
+ function onPause() {
+ console.log("*** Moving to Background ***"); // Handle the pause event
+ console.log("*** CANCELLING INTERVAL ****");
+ $interval.cancel(segmentHandle);
+ // FIXME: Do I need to setAwake(false) here?
}
- });
-
- //---------------------------------------------------
- // used to hide loading image toast
- //---------------------------------------------------
- $scope.finishedLoadingImage = function () {
- console.log("*** Events image FINISHED loading ***");
- $ionicLoading.hide();
- };
-
- //---------------------------------------------------
- //
- //---------------------------------------------------
- $scope.clearSearch = function () {
- $scope.search.text = "";
- };
-
- //---------------------------------------------------
- // Called when user toggles search
- //---------------------------------------------------
- $scope.searchClicked = function () {
- $scope.showSearch = !$scope.showSearch;
- // this helps greatly in repeat scroll gets
- if ($scope.showSearch == false)
- $scope.search.text = "";
+ function padToN(number, digits) {
- console.log("**** Setting search view to " + $scope.showSearch + " ****");
- if (enableLoadMore == false && $scope.showSearch == false) {
- moreEvents = true;
- enableLoadMore = true;
- console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
+ var i;
+ var stringMax = "";
+ var stringLeading = "";
+ for (i = 1; i <= digits; i++) {
+ stringMax = stringMax + "9";
+ if (i != digits) stringLeading = stringLeading + "0";
+ }
+ var numMax = parseInt(stringMax);
+
+ if (number <= numMax) {
+ number = (stringLeading + number).slice(-digits);
+ }
+ //console.log ("PADTON: returning " + number);
+ return number;
}
- };
- //--------------------------------------------------------
- // Not used - plan to use it to show event progress
- //--------------------------------------------------------
- function segmentCheck() {
- if ($scope.totalEventTime == 0) {
- console.log("No events to play");
- return;
- }
- if ($scope.currentEventTime >= $scope.totalEventTime) {
- console.log("Total event duration reached");
- $scope.currentEventTime = $scope.totalEventTime;
- return;
- }
- // false == don't show ionic loadings, a query is a background job
- controlEventStream("99", false);
- //console.log("Duration: " + $scope.currentEventTime + " of " + $scope.totalEventTime);
+ $scope.disableSlide = function () {
+ console.log("***INSIDE DISABLE SLIDE");
+ $ionicSlideBoxDelegate.$getByHandle("eventSlideBox").enableSlide(false);
+ };
+ $scope.$watch('ionRange.index', function () {
- // ./skins/classic/views/event.php panelSection
- }
+ $scope.mycarousel.index = parseInt($scope.ionRange.index);
+ });
- //--------------------------------------------------------
- // this routine handles skipping through events
- // in different event views
- //--------------------------------------------------------
- function controlEventStream(cmd, disp) {
- // console.log("Command value " + cmd);
+ $scope.$watch('mycarousel.index', function () {
- if (disp) {
- $ionicLoading.hide();
+ $scope.ionRange.index = $scope.mycarousel.index.toString();
+ });
+
+
+
+
+ $scope.toggleGroup = function (event, ndx, frames) {
+
+
+
+ // If we are here and there is a record of a previous scroll
+ // then we need to scroll back to hide that view
+ if (scrollbynumber) {
+ $ionicScrollDelegate.$getByHandle("mainScroll").scrollBy(0, -1 * scrollbynumber, true);
+ scrollbynumber = 0;
+ }
+
+ if (oldEvent && event !=oldEvent) {
+ console.log("SWITCHING OLD EVENT OFF");
+ oldEvent.Event.ShowScrub = false;
+ oldEvent = "";
+ }
+
+ event.Event.ShowScrub = !event.Event.ShowScrub;
+ $ionicScrollDelegate.resize();
+
+ if (event.Event.ShowScrub==true) // turn on display now
+ {
+
+ $scope.mycarousel.index = 0;
+ $scope.ionRange.index = 0;
+ //console.log("**Resetting range");
+ $scope.slides = [];
+ var i;
+ for (i = 1; i <= frames; i++) {
+ var fname = padToN(i, eventImageDigits) + "-capture.jpg";
+ $scope.slides.push({
+ id: i,
+ img: fname
+ });
+
+ }
+ oldEvent = event;
+ $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+ var elem = angular.element(document.getElementById("item-" + ndx));
+ var locobject = $ionicPosition.offset(elem);
+ //console.log(JSON.stringify(locobject));
+ var toplocation = parseInt(locobject.top);
+ var objheight = parseInt(locobject.height);
+ console.log("top location is " + toplocation);
+ var distdiff = parseInt($rootScope.devHeight) - toplocation - objheight;
+ console.log("*****Space at bottom is " + distdiff);
+
+ if (distdiff < 300) // size of the scroller with bars
+ {
+ scrollbynumber = 300 - distdiff;
+ $ionicScrollDelegate.$getByHandle("mainScroll").scrollBy(0, scrollbynumber, true);
+
+ // we need to scroll up to make space
+ }
+
+ }
+ else
+ {
+ if (scrollbynumber) {
+ $ionicScrollDelegate.$getByHandle("mainScroll").scrollBy(0, -1 * scrollbynumber, true);
+ scrollbynumber = 0;
+ }
+ // we are turning off, so scroll by back
+ }
+
+ // do this at the end for performance reasons
+
+
+
+
+
+
+ };
+
+
+ $scope.isGroupShown = function (event) {
+ // console.log ("IS SHOW INDEX is " + ndx);
+ //console.log ("SHOW GROUP IS " + showGroup);
+ return event.Event.ShowScrub;
+
+ };
+
+ //---------------------------------------------------
+ // reload view
+ //---------------------------------------------------
+ $scope.reloadView = function () {
+ // All we really need to do here is change the random token
+ // in the image src and it will refresh. No need to reload the view
+ // and if you did reload the view, it would go back to events list
+ // which is the view - and when you are in the modal it will go away
+ console.log("*** Refreshing Modal view ***");
+ //$state.go($state.current, {}, {reload: true});
+ $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
$ionicLoading.show({
- template: "please wait...",
+ template: "refreshed view",
noBackdrop: true,
- duration: zm.loadingTimeout,
+ duration: 3000
});
- }
- var loginData = ZMDataModel.getLogin();
-
- /*
- var CMD_NONE = 0;
- var CMD_PAUSE = 1;
- var CMD_PLAY = 2;
- var CMD_STOP = 3;
- var CMD_FASTFWD = 4;
- var CMD_SLOWFWD = 5;
- var CMD_SLOWREV = 6;
- var CMD_FASTREV = 7;
- var CMD_ZOOMIN = 8;
- var CMD_ZOOMOUT = 9;
- var CMD_PAN = 10;
- var CMD_SCALE = 11;
- var CMD_PREV = 12;
- var CMD_NEXT = 13;
- var CMD_SEEK = 14;
- var CMD_QUERY = 99;
- */
- var toast_blurb = "";
- switch (cmd) {
- case "13":
- toast_blurb = "moving to ";
- $scope.totalEventTime = 0;
-
-
- break;
- case "12":
- toast_blurb = "moving to ";
- $scope.totalEventTime = 0;
- break;
- case "8":
- toast_blurb = "zoomed into ";
- break;
- case "9":
- toast_blurb = "zoomed out of ";
- break;
- case "3":
- toast_blurb = "stopping playback for ";
-
- break;
- case "2":
- toast_blurb = "resuming playback for ";
-
- break;
- case "1":
- toast_blurb = "pausing playback for ";
-
- break;
- case "4":
- toast_blurb = "fast forward ";
-
- break;
- case "5":
- toast_blurb = "slow forward ";
- break;
- case "6":
- toast_blurb = "slow rewind ";
- break;
- case "7":
- toast_blurb = "fast rewind ";
- break;
- }
-
- // 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');
-
- var req = $http({
- method: 'POST',
- /*timeout: 15000,*/
- url: loginData.url + '/index.php',
- headers: {
- '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]));
- var foo = str.join("&");
- // console.log("****RETURNING " + foo);
- return foo;
- },
-
- data: {
- view: "request",
- request: "stream",
- connkey: $scope.connKey,
- command: cmd,
- user: loginData.username,
- pass: loginData.password
+ };
+
+ //---------------------------------------------------
+ // when you tap a list entry - to break search loop
+ //---------------------------------------------------
+ $scope.tapped = function () {
+ console.log("*** TAPPED ****");
+ // if he tapped, the we are not infinite loading on ion-infinite
+ if (enableLoadMore == false) {
+ moreEvents = true;
+ enableLoadMore = true;
+ console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
}
+ };
+
+ $scope.$on('$ionicView.loaded', function () {
+ console.log("**VIEW ** Events Ctrl Loaded");
});
- req.success(function (resp) {
- console.log("SUCCESS: " + JSON.stringify(resp));
- var str = toast_blurb + "event:" + resp.status.event;
- // console.log(str);
- // $ionicLoading.hide();
+ //-------------------------------------------------------------------------
+ // Lets make sure we set screen dim properly as we enter
+ // The problem is we enter other states before we leave previous states
+ // from a callback perspective in ionic, so we really can't predictably
+ // reset power state on exit as if it is called after we enter another
+ // state, that effectively overwrites current view power management needs
+ //------------------------------------------------------------------------
+ $scope.$on('$ionicView.enter', function () {
+ console.log("**VIEW ** Events Ctrl Entered");
+ ZMDataModel.setAwake(false);
+ });
- if (disp == true) {
- $ionicLoading.show({
- template: str,
- noBackdrop: true,
- duration: 2000
- });
- }
+ $scope.$on('$ionicView.leave', function () {
+ console.log("**VIEW ** Events Ctrl Left");
+ });
- // 99 is CMD_QUERY its a convenient way to know where I am in the event playback
- // takes care of speed etc so I don't have to worry about it
- if (cmd == '99') {
- $scope.currentEventTime = Math.round(parseFloat(resp.status.progress));
+ $scope.$on('$ionicView.unloaded', function () {
+ console.log("**VIEW ** Events Ctrl Unloaded");
+ console.log("*** MODAL ** Destroying modal too");
+ if ($scope.modal !== undefined) {
+ $scope.modal.remove();
}
- if (cmd == '12' || cmd == '13') {
- console.log("New event, so recomputing");
- var newevent = resp.status.event;
- console.log("**** EXTRACTED EVENT ****" + newevent);
- var ld = ZMDataModel.getLogin();
- var myurl = ld.apiurl + "/events/" + newevent + ".json";
- $http.get(myurl)
- .success(function (data) {
- $scope.totalEventTime = Math.round(parseFloat(data.event.Event.Length)) - 1;
- $scope.currentEventTime = 0;
+ });
+ //---------------------------------------------------
+ // used to hide loading image toast
+ //---------------------------------------------------
+ $scope.finishedLoadingImage = function (ndx) {
+ // console.log("*** Events image FINISHED loading index: "+ndx+"***");
+ $ionicLoading.hide();
+ };
+ //---------------------------------------------------
+ //
+ //---------------------------------------------------
+ $scope.clearSearch = function () {
+ $scope.search.text = "";
+ };
+
+ //---------------------------------------------------
+ // Called when user toggles search
+ //---------------------------------------------------
+ $scope.searchClicked = function () {
+ $scope.showSearch = !$scope.showSearch;
+ // this helps greatly in repeat scroll gets
+ if ($scope.showSearch == false)
+ $scope.search.text = "";
+
+ console.log("**** Setting search view to " + $scope.showSearch + " ****");
+ if (enableLoadMore == false && $scope.showSearch == false) {
+ moreEvents = true;
+ enableLoadMore = true;
+ console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
+ }
+ };
- })
- .error(function (err) {
- console.log("Error : " + JSON.stringify(err));
- ZMDataModel.zmLog("Error getting timing info for new event " + newevent + ":" + JSON.stringify(err));
- $scope.totalEventTime = 0;
+ //--------------------------------------------------------
+ // Not used - plan to use it to show event progress
+ //--------------------------------------------------------
+ function segmentCheck() {
+ if ($scope.totalEventTime == 0) {
- });
+ console.log("No events to play");
+ return;
+ }
+ if ($scope.currentEventTime >= $scope.totalEventTime) {
+ console.log("Total event duration reached");
+ $scope.currentEventTime = $scope.totalEventTime;
+ return;
}
- });
+ // false == don't show ionic loadings, a query is a background job
+ controlEventStream("99", false);
+ //console.log("Duration: " + $scope.currentEventTime + " of " + $scope.totalEventTime);
- req.error(function (resp) {
- console.log("ERROR: " + JSON.stringify(resp));
- ZMDataModel.zmLog("Error sending event command " + JSON.stringify(resp), "error");
- });
- }
-
-
- $scope.controlEventStream = function (cmd) {
- controlEventStream(cmd, true);
- };
-
- //--------------------------------------------------------
- //This is called when we first tap on an event to see
- // the feed. It's important to instantiate ionicModal here
- // as otherwise you'd instantiate it when the view loads
- // and our "Please wait loading" technique I explained
- //earlier won't work
- //--------------------------------------------------------
-
- $scope.openModal = function (eid, ename, edur, eframes) {
- console.log("Open Modal");
- $scope.eventName = ename;
- $scope.eventId = eid;
- $scope.eventDur = Math.round(edur);
- $scope.loginData = ZMDataModel.getLogin();
- $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
- $scope.totalEventTime = Math.round(parseFloat(edur)) - 1;
- $scope.currentEventTime = 0;
+ // ./skins/classic/views/event.php panelSection
+ }
- ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+ //--------------------------------------------------------
+ // this routine handles skipping through events
+ // in different event views
+ //--------------------------------------------------------
- $ionicModal.fromTemplateUrl('templates/events-modal.html', {
- scope: $scope,
- animation: 'slide-in-up'
- })
- .then(function (modal) {
- $scope.modal = modal;
+ function controlEventStream(cmd, disp) {
+ // console.log("Command value " + cmd);
+ if (disp) {
+ $ionicLoading.hide();
$ionicLoading.show({
template: "please wait...",
noBackdrop: true,
- duration: 10000
+ duration: zm.loadingTimeout,
});
+ }
+ var loginData = ZMDataModel.getLogin();
+
+ /*
+ var CMD_NONE = 0;
+ var CMD_PAUSE = 1;
+ var CMD_PLAY = 2;
+ var CMD_STOP = 3;
+ var CMD_FASTFWD = 4;
+ var CMD_SLOWFWD = 5;
+ var CMD_SLOWREV = 6;
+ var CMD_FASTREV = 7;
+ var CMD_ZOOMIN = 8;
+ var CMD_ZOOMOUT = 9;
+ var CMD_PAN = 10;
+ var CMD_SCALE = 11;
+ var CMD_PREV = 12;
+ var CMD_NEXT = 13;
+ var CMD_SEEK = 14;
+ var CMD_QUERY = 99;
+ */
+ var toast_blurb = "";
+ switch (cmd) {
+ case "13":
+ toast_blurb = "moving to ";
+ $scope.totalEventTime = 0;
+
+
+ break;
+ case "12":
+ toast_blurb = "moving to ";
+ $scope.totalEventTime = 0;
+ break;
+ case "8":
+ toast_blurb = "zoomed into ";
+ break;
+ case "9":
+ toast_blurb = "zoomed out of ";
+ break;
+ case "3":
+ toast_blurb = "stopping playback for ";
+
+ break;
+ case "2":
+ toast_blurb = "resuming playback for ";
+
+ break;
+ case "1":
+ toast_blurb = "pausing playback for ";
+
+ break;
+ case "4":
+ toast_blurb = "fast forward ";
+
+ break;
+ case "5":
+ toast_blurb = "slow forward ";
+ break;
+ case "6":
+ toast_blurb = "slow rewind ";
+ break;
+ case "7":
+ toast_blurb = "fast rewind ";
+ break;
+ }
- $scope.modal.show();
- var ld = ZMDataModel.getLogin();
+ // 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
- // how many seconds this event will take
- //evtSegments = eframes / ld.maxFPS + 3;
- //evtCurSegment = 0;
- // console.log ("**** I SET SEGMENTS TO " + evtSegments);
+ //console.log("POST: " + loginData.url + '/index.php');
- // call on progress indicator every 5 seconds
- // don't want to overload
- segmentHandle = $interval(function () {
- segmentCheck();
- }, zm.progressIntervalCheck);
- segmentCheck();
+ var req = $http({
+ method: 'POST',
+ /*timeout: 15000,*/
+ url: loginData.url + '/index.php',
+ headers: {
+ '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]));
+ var foo = str.join("&");
+ // console.log("****RETURNING " + foo);
+ return foo;
+ },
+
+ data: {
+ view: "request",
+ request: "stream",
+ connkey: $scope.connKey,
+ command: cmd,
+ user: loginData.username,
+ pass: loginData.password
+ }
+ });
+ req.success(function (resp) {
+
+ console.log("SUCCESS: " + JSON.stringify(resp));
+ var str = toast_blurb + "event:" + resp.status.event;
+ // console.log(str);
+ // $ionicLoading.hide();
+
+ if (disp == true) {
+ $ionicLoading.show({
+ template: str,
+ noBackdrop: true,
+ duration: 2000
+ });
+ }
+
+ // 99 is CMD_QUERY its a convenient way to know where I am in the event playback
+ // takes care of speed etc so I don't have to worry about it
+ if (cmd == '99') {
+ $scope.currentEventTime = Math.round(parseFloat(resp.status.progress));
+ }
+ if (cmd == '12' || cmd == '13') {
+ console.log("New event, so recomputing");
+ var newevent = resp.status.event;
+ console.log("**** EXTRACTED EVENT ****" + newevent);
+ var ld = ZMDataModel.getLogin();
+ var myurl = ld.apiurl + "/events/" + newevent + ".json";
+ $http.get(myurl)
+ .success(function (data) {
+ $scope.totalEventTime = Math.round(parseFloat(data.event.Event.Length)) - 1;
+ $scope.currentEventTime = 0;
+
+
+
+ })
+ .error(function (err) {
+ console.log("Error : " + JSON.stringify(err));
+ ZMDataModel.zmLog("Error getting timing info for new event " + newevent + ":" + JSON.stringify(err));
+ $scope.totalEventTime = 0;
+
+ });
+ }
});
- };
-
- //--------------------------------------------------------
- //We need to destroy because we are instantiating
- // it on open
- //--------------------------------------------------------
- $scope.closeModal = function () {
- // $interval.cancel(eventsInterval);
- $interval.cancel(segmentHandle);
- console.log("Close & Destroy Modal");
- ZMDataModel.setAwake(false);
- if ($scope.modal !== undefined) {
- $scope.modal.remove();
+ req.error(function (resp) {
+ console.log("ERROR: " + JSON.stringify(resp));
+ ZMDataModel.zmLog("Error sending event command " + JSON.stringify(resp), "error");
+ });
}
- };
- //--------------------------------------------------------
- //Cleanup the modal when we're done with it
- // I Don't think it ever comes here
- //--------------------------------------------------------
- $scope.$on('$destroy', function () {
- console.log("Destroy Modal");
- if ($scope.modal !== undefined) {
- $scope.modal.remove();
- }
- $interval.cancel(segmentHandle);
- });
-
- //--------------------------------------------------------
- // used by infinite scrolling to see if we can get more
- //--------------------------------------------------------
-
- $scope.moreDataCanBeLoaded = function () {
- return moreEvents;
- };
-
- //--------------------------------------------------------
- // stop searching for more data
- //--------------------------------------------------------
- $scope.cancelSearch = function () {
- $ionicLoading.hide(); //Or whatever action you want to preform
- enableLoadMore = false;
- console.log("**** CANCELLED ****");
- $ionicLoading.show({
- template: 'Search Cancelled',
- animation: 'fade-in',
- showBackdrop: true,
- duration: 2000,
- maxWidth: 200,
- showDelay: 0
- });
+ $scope.controlEventStream = function (cmd) {
+ controlEventStream(cmd, true);
+ };
+
+ //--------------------------------------------------------
+ //This is called when we first tap on an event to see
+ // the feed. It's important to instantiate ionicModal here
+ // as otherwise you'd instantiate it when the view loads
+ // and our "Please wait loading" technique I explained
+ //earlier won't work
+ //--------------------------------------------------------
+
+ $scope.openModal = function (eid, ename, edur, eframes, basepath) {
+ console.log("Open Modal with Base path " + basepath);
+ $scope.eventName = ename;
+ $scope.eventId = eid;
+ $scope.eventDur = Math.round(edur);
+ $scope.loginData = ZMDataModel.getLogin();
+ $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+
+ $scope.totalEventTime = Math.round(parseFloat(edur)) - 1;
+ $scope.currentEventTime = 0;
+
+ ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+
+ $ionicModal.fromTemplateUrl('templates/events-modal.html', {
+ scope: $scope,
+ animation: 'slide-in-up'
+ })
+ .then(function (modal) {
+ $scope.modal = modal;
+
+ $ionicLoading.show({
+ template: "please wait...",
+ noBackdrop: true,
+ duration: 10000
+ });
+ $scope.modal.show();
- };
+ var ld = ZMDataModel.getLogin();
- //--------------------------------------------------------
- // loads next page of events
- //--------------------------------------------------------
+ // how many seconds this event will take
+ //evtSegments = eframes / ld.maxFPS + 3;
+ //evtCurSegment = 0;
+ // console.log ("**** I SET SEGMENTS TO " + evtSegments);
+ // call on progress indicator every 5 seconds
+ // don't want to overload
+ segmentHandle = $interval(function () {
+ segmentCheck();
+ }, zm.progressIntervalCheck);
+ segmentCheck();
- function loadMore()
- {
- // the events API does not return an error for anything
- // except greater page limits than reported
- console.log("***** LOADING MORE INFINITE SCROLL ****");
- eventsPage--;
- if ((eventsPage <= 0) && (pageLoaded)) {
- moreEvents = false;
- console.log("*** At Page " + eventsPage + ", not proceeding");
- return;
- }
+ });
- if (!enableLoadMore) {
- moreEvents = false; // Don't ion-scroll till enableLoadMore is true;
- $scope.$broadcast('scroll.infiniteScrollComplete');
+ };
+
+ //--------------------------------------------------------
+ //We need to destroy because we are instantiating
+ // it on open
+ //--------------------------------------------------------
+ $scope.closeModal = function () {
+ // $interval.cancel(eventsInterval);
+ $interval.cancel(segmentHandle);
+ console.log("Close & Destroy Modal");
+ ZMDataModel.setAwake(false);
+ if ($scope.modal !== undefined) {
+ $scope.modal.remove();
+ }
- console.log("**** LOADMORE ARTIFICALLY DISABLED");
- return;
- }
+ };
- var loadingStr = "";
- if ($scope.search.text != "") {
- var toastStr = "Searching page " + eventsPage;
+ //--------------------------------------------------------
+ //Cleanup the modal when we're done with it
+ // I Don't think it ever comes here
+ //--------------------------------------------------------
+ $scope.$on('$destroy', function () {
+ console.log("Destroy Modal");
+ if ($scope.modal !== undefined) {
+ $scope.modal.remove();
+ }
+ $interval.cancel(segmentHandle);
+ });
+
+ //--------------------------------------------------------
+ // used by infinite scrolling to see if we can get more
+ //--------------------------------------------------------
+
+ $scope.moreDataCanBeLoaded = function () {
+ return moreEvents;
+ };
+
+ //--------------------------------------------------------
+ // stop searching for more data
+ //--------------------------------------------------------
+ $scope.cancelSearch = function () {
+ $ionicLoading.hide(); //Or whatever action you want to preform
+ enableLoadMore = false;
+ console.log("**** CANCELLED ****");
$ionicLoading.show({
- maxwidth: 100,
- scope: $scope,
- template: '<button class="button button-clear icon-left ion-close-circled button-text-wrap" ng-click="cancelSearch()" >' + toastStr + '</button>'
+ template: 'Search Cancelled',
+ animation: 'fade-in',
+ showBackdrop: true,
+ duration: 2000,
+ maxWidth: 200,
+ showDelay: 0
});
- loadingStr = "none";
- }
- ZMDataModel.getEvents($scope.id, eventsPage, loadingStr)
- .then(function (data) {
- console.log("Got new page of events with Page=" + eventsPage);
- var myevents = data;
- for (var i = 0; i < myevents.length; i++) {
-
- myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
- }
- $scope.events = $scope.events.concat(myevents);
- console.log("Got new page of events");
- moreEvents = true;
- $scope.$broadcast('scroll.infiniteScrollComplete');
- },
- function (error) {
- console.log("*** No More Events to Load, Stop Infinite Scroll ****");
- moreEvents = false;
- $scope.$broadcast('scroll.infiniteScrollComplete');
+ };
+
+ //--------------------------------------------------------
+ // loads next page of events
+ //--------------------------------------------------------
+
+
+ function loadMore() {
+ // the events API does not return an error for anything
+ // except greater page limits than reported
+
+ console.log("***** LOADING MORE INFINITE SCROLL ****");
+ eventsPage--;
+ if ((eventsPage <= 0) && (pageLoaded)) {
+ moreEvents = false;
+ console.log("*** At Page " + eventsPage + ", not proceeding");
+ return;
+ }
+
+ if (!enableLoadMore) {
+ moreEvents = false; // Don't ion-scroll till enableLoadMore is true;
+ $scope.$broadcast('scroll.infiniteScrollComplete');
+
+ console.log("**** LOADMORE ARTIFICALLY DISABLED");
+ return;
+ }
+ var loadingStr = "";
+ if ($scope.search.text != "") {
+ var toastStr = "Searching page " + eventsPage;
+ $ionicLoading.show({
+ maxwidth: 100,
+ scope: $scope,
+ template: '<button class="button button-clear icon-left ion-close-circled button-text-wrap" ng-click="cancelSearch()" >' + toastStr + '</button>'
});
- }
-
- $scope.loadMore = function () {
- loadMore();
-
- };
-
- //--------------------------------------
- // formats events dates in a nice way
- //---------------------------------------
-
- $scope.prettify = function (str) {
- return moment(str).format('h:mm:ssa on MMMM Do YYYY');
- };
- //--------------------------------------------------------
- // For consistency we are keeping the refresher list
- // but its a dummy. The reason I deviated is because
- // refresh with infinite scroll is a UX problem - its
- // easy to pull to refresh when scrolling up with
- // a large list
- //--------------------------------------------------------
-
- $scope.dummyDoRefresh = function () {
- $scope.$broadcast('scroll.refreshComplete');
- };
-
- $scope.doRefresh = function () {
- console.log("***Pull to Refresh");
- $scope.events = [];
- moreEvents = true;
- ZMDataModel.getEventsPages($scope.id)
- .then(function (data) {
- eventsPage = data.pageCount;
- console.log("TOTAL EVENT PAGES IS " + eventsPage);
- pageLoaded = true;
- $scope.viewTitle.title = data.count;
- ZMDataModel.getEvents($scope.id, eventsPage, "")
+ loadingStr = "none";
+ }
+ ZMDataModel.getEvents($scope.id, eventsPage, loadingStr)
.then(function (data) {
- console.log("EventCtrl Got events");
- //var events = [];
- var myevents = data;
- for (var i = 0; i < myevents.length; i++) {
-
- myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
- }
- $scope.events = myevents;
- });
+ var loginData = ZMDataModel.getLogin();
+ console.log("Got new page of events with Page=" + eventsPage);
+ var myevents = data;
+ for (var i = 0; i < myevents.length; i++) {
+
+ myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+ // now construct base path
+
+ var str = myevents[i].Event.StartTime;
+ //var yy = moment(str).format('h:mm:ssa on MMMM Do YYYY');
+ var yy = moment(str).format('YY');
+ var mm = moment(str).format('MM');
+ var dd = moment(str).format('DD');
+ var hh = moment(str).format('HH');
+ var min = moment(str).format('mm');
+ var sec = moment(str).format('ss');
+
+ myevents[i].Event.BasePath = loginData.url + "/events/" +
+ myevents[i].Event.MonitorId + "/" +
+ yy + "/" +
+ mm + "/" +
+ dd + "/" +
+ hh + "/" +
+ min + "/" +
+ sec + "/";
+
+
+ }
+ $scope.events = $scope.events.concat(myevents);
+ console.log("Got new page of events");
+ moreEvents = true;
+ $scope.$broadcast('scroll.infiniteScrollComplete');
+ },
+
+ function (error) {
+ console.log("*** No More Events to Load, Stop Infinite Scroll ****");
+ moreEvents = false;
+ $scope.$broadcast('scroll.infiniteScrollComplete');
- });
- }; //dorefresh
+ });
+ }
- $scope.scaleImage = function() {
- console.log ("Switching image style");
- $scope.imageStyle = !$scope.imageStyle;
+ $scope.loadMore = function () {
+ loadMore();
+
+ };
+
+ //--------------------------------------
+ // formats events dates in a nice way
+ //---------------------------------------
+
+ $scope.prettify = function (str) {
+ return moment(str).format('h:mm:ssa on MMMM Do YYYY');
+ };
+ //--------------------------------------------------------
+ // For consistency we are keeping the refresher list
+ // but its a dummy. The reason I deviated is because
+ // refresh with infinite scroll is a UX problem - its
+ // easy to pull to refresh when scrolling up with
+ // a large list
+ //--------------------------------------------------------
+
+ $scope.dummyDoRefresh = function () {
+ $scope.$broadcast('scroll.refreshComplete');
+ };
+
+ $scope.doRefresh = function () {
+ console.log("***Pull to Refresh");
+ $scope.events = [];
+ moreEvents = true;
+ ZMDataModel.getEventsPages($scope.id)
+ .then(function (data) {
+ eventsPage = data.pageCount;
+ console.log("TOTAL EVENT PAGES IS " + eventsPage);
+ pageLoaded = true;
+ $scope.viewTitle.title = data.count;
+ ZMDataModel.getEvents($scope.id, eventsPage, "")
+
+ .then(function (data) {
+ console.log("EventCtrl Got events");
+ //var events = [];
+ var myevents = data;
+ for (var i = 0; i < myevents.length; i++) {
+
+ myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+ }
+ myevents[i].Event.ShowScrub = false;
+ $scope.events = myevents;
+ });
- };
+ });
+ }; //dorefresh
}]);
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index 01b8e27c..f0bb9f6c 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -18,6 +18,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
//var imageStyle=1;
//$scope.imageAspect = "max-width: 100%;max-height: 100%;";
+ $scope.imageFit=false;
+
$scope.radialMenuOptions = {
content: '',
@@ -224,11 +226,6 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
};
- $scope.saveImageToPhone2=function(mid)
- {
- console.log ("TEST");
- };
-
$scope.onSwipeLeft = function(m,d)
{
console.log ("SWIPED LEFT");
@@ -332,7 +329,10 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
}
};
-
+ $scope.scaleImage = function() {
+ console.log ("Switching image style");
+ $scope.imageFit = !$scope.imageFit;
+};
}]);
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 5725a690..c4d338e5 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -19,7 +19,7 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
monitorStateCheck();
console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
- $scope.imageStyle = true;
+
@@ -347,11 +347,6 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
};
- $scope.scaleImage = function () {
- console.log("Switching image style");
- $scope.imageStyle = !$scope.imageStyle;
-
- };
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 1ba0c235..6ae99aee 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -4,14 +4,31 @@
/* global cordova,StatusBar,angular,console,ionic */
-angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm) {
+angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm,$ionicPopover,$controller) {
+ $controller('zmApp.BaseController', { $scope: $scope });
//---------------------------------------------------------------------
// Controller main
//---------------------------------------------------------------------
+ /* console.log ("IMAGES***************");
+ var fooImages = [
+ {src:'http://www.pbase.com/arjunrc/image/160698184.jpg'},
+ {src:'http://www.pbase.com/arjunrc/image/160697822.jpg'},
+ {src:'http://www.pbase.com/arjunrc/image/160697821.jpg'},
+ {src:'http://www.pbase.com/arjunrc/image/160697740.jpg'}
+ ];
+
+ $scope.fl = fooImages.length;
+ $scope.fooImages = fooImages;*/
+
document.addEventListener("pause", onPause, false);
+ $ionicPopover.fromTemplateUrl('templates/help/montage-help.html', {
+ scope: $scope,
+ }).then(function(popover) {
+ $scope.popover = popover;
+ });
var timestamp = new Date().getUTCMilliseconds();
$scope.minimal = $stateParams.minimal;
@@ -213,7 +230,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
type: 'button-block icon ion-close-round',
onTap: function (e) {
// user tapped cancel
- var i;
+ var i,myhiddenorder;
if (window.localStorage.getItem("montageOrder") == undefined) {
for (i = 0; i < $scope.MontageMonitors.length; i++) {
montageOrder[i] = i;
@@ -221,12 +238,26 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
}
console.log("Order string is " + montageOrder.toString());
ZMDataModel.zmLog("User press Cancel. Reset Monitor Order to: " + montageOrder.toString());
- } else {
+ }
+ else // montageOrder exists
+ {
var myorder = window.localStorage.getItem("montageOrder");
- var myhiddenorder = window.localStorage.getItem("montageHiddenOrder");
+
+ if (window.localStorage.getItem("montageHiddenOrder") == undefined)
+ {
+ for (i = 0; i < $scope.MontageMonitors.length; i++) {
+ hiddenOrder[i] = 0;
+ }
+ }
+ else
+ {
+ myhiddenorder = window.localStorage.getItem("montageHiddenOrder");
+ hiddenOrder = myhiddenorder.split(",");
+ }
+
console.log("Montage order is " + myorder + " and hidden order is " + myhiddenorder);
montageOrder = myorder.split(",");
- hiddenOrder = myhiddenorder.split(",");
+
for (i = 0; i < montageOrder.length; i++) {
montageOrder[i] = parseInt(montageOrder[i]);
hiddenOrder[i] = parseInt(hiddenOrder[i]);
@@ -505,6 +536,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.openMenu = function () {
+ $timeout (function() {
+ $rootScope.stateofSlide = $ionicSideMenuDelegate.isOpen();
+ },500);
+
$ionicSideMenuDelegate.toggleLeft();
};
@@ -596,4 +631,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
+ $scope.doRefresh = function () {
+ console.log("***Pull to Refresh");
+ $scope.monitors = [];
+
+ var refresh = ZMDataModel.getMonitors(1);
+
+ refresh.then(function (data) {
+ $scope.monitors = data;
+ $scope.$broadcast('scroll.refreshComplete');
+ });
+ };
+
+
}]);
diff --git a/www/js/angular-circular-navigation.js b/www/js/angular-circular-navigation.js
deleted file mode 100644
index 6f62a9e5..00000000
--- a/www/js/angular-circular-navigation.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// PP - Modified to show at right angles
-/* jshint -W041 */
-/* jslint browser: true*/
-/* global cordova,StatusBar,angular,console */
-
-(function () {
-
- 'use strict';
-
- /*global define, module, exports, require */
-
- /* istanbul ignore next */
- var angular = window.angular ? window.angular : 'undefined' !== typeof require ? require('angular') : undefined;
-
- var circular = angular.module('angularCircularNavigation', [])
- .directive('circular', ['$compile', function ($compile) {
-
- return {
- restrict: 'EA',
- scope: {
- options: '='
- },
- template: '<button ng-click="toggleMenu()" class="cn-button {{options.button.size}}" ng-class="options.button.cssClass" style="background: {{options.button.background ? options.button.background : options.background}}; color: {{options.button.color ? options.button.color :options.color}};">{{options.content}}</button>' +
- '<div class="cn-wrapper {{options.size}} items-{{options.items.length}}" ng-class="{\'opened-nav\': options.isOpen}"><ul>' +
- '<li ng-repeat="item in options.items">' +
- '<a ng-hide="item.empty" ng-click="perform(options, item)" ng-class="{\'is-active\': item.isActive}" class="{{item.cssClass}}" style="background: {{item.background ? item.background : options.background}}; color: {{item.color ? item.color : options.color}};">' +
- '<span>{{item.content}}</span>' +
- '</a></li></ul></div>',
- controller: ['$scope', '$element', '$attrs',
- function ($scope, $element, $attrs) {
-
- $scope.toggleMenu = function () {
- $scope.options.isOpen = !$scope.options.isOpen;
- };
-
- $scope.perform = function (options, item) {
- if (typeof item.onclick === 'function') {
- item.onclick(options, item);
- }
-
- if ($scope.options.toggleOnClick) {
- $scope.toggleMenu();
- }
- };
-
- }
- ]
- };
- }]);
-
- /* istanbul ignore next */
- if (typeof define === 'function' && define.amd) {
- define('circular', ['angular'], circular);
- } else if ('undefined' !== typeof exports && 'undefined' !== typeof module) {
- module.exports = circular;
- }
-
-})();
diff --git a/www/js/app.js b/www/js/app.js
index 40280917..f676bfb3 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -9,9 +9,7 @@ angular.module('zmApp', [
'ionic',
'tc.chartjs',
'zmApp.controllers',
- 'fileLogger',
-
-
+ 'fileLogger'
])
// ------------------------------------------
@@ -201,6 +199,8 @@ angular.module('zmApp', [
.run(function ($ionicPlatform, $ionicPopup, $rootScope, zm, $state, ZMDataModel, $cordovaSplashscreen, $http, $interval, zmAutoLogin, $fileLogger,$timeout, $ionicHistory, $window, $ionicSideMenuDelegate)
{
+
+
ZMDataModel.init();
var loginData = ZMDataModel.getLogin();
@@ -208,6 +208,7 @@ angular.module('zmApp', [
ZMDataModel.zmLog ("User is logged in");
console.log("VALID CREDENTIALS. Grabbing Monitors");
ZMDataModel.getMonitors(0);
+ ZMDataModel.getKeyConfigParams(1);
}
@@ -216,9 +217,10 @@ angular.module('zmApp', [
// MenuDelegate always returns False, so I don't know
// when its on or off, so can't exit the app if its on
- $ionicPlatform.registerBackButtonAction(function (event) {
- $ionicSideMenuDelegate.toggleLeft();
-}, 100);
+
+
+
+
// this works reliably on both Android and iOS. The "onorientation" seems to reverse w/h in Android. Go figure.
// http://stackoverflow.com/questions/1649086/detect-rotation-of-android-phone-in-the-browser-with-javascript
@@ -302,12 +304,18 @@ angular.module('zmApp', [
}
- setTimeout(function () {
+ /*setTimeout(function () {
if (window.cordova)
{
$cordovaSplashscreen.hide();
}
- }, 1500);
+ }, 1500);*/
+
+ if(window.navigator && window.navigator.splashscreen) {
+ window.navigator.splashscreen.hide();
+ console.log ("Unlocking portrait mode after splash");
+ window.plugins.orientationLock.unlock();
+ }
var pixelRatio = window.devicePixelRatio || 1;
$rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width);
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 914a23bf..16a02ba2 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -4,11 +4,38 @@
-angular.module('zmApp.controllers', ['ionic', 'ngCordova', 'ng-mfb','angularCircularNavigation'])
+angular.module('zmApp.controllers', ['ionic', 'ngCordova', 'ng-mfb','angularCircularNavigation','angular-carousel'])
-.controller('zmApp.AppCtrl', function($scope, $ionicSideMenuDelegate) {
+.controller('zmApp.BaseController', function($scope, $ionicSideMenuDelegate, $ionicPlatform, $timeout, $rootScope) {
$scope.openMenu = function () {
$ionicSideMenuDelegate.toggleLeft();
};
+
+ $ionicPlatform.registerBackButtonAction(function (event) {
+ console.log ("ANDROID BACK");
+ $ionicSideMenuDelegate.toggleLeft();
+ $timeout (function() {
+ $rootScope.stateofSlide = $ionicSideMenuDelegate.isOpen() + new Date();
+ },500);
+
+ /* $timeout ( function() {
+
+
+ if ($ionicSideMenuDelegate.$getByHandle('sideMenu').isOpenLeft())
+ {
+ console.log ("**** EXITING APP ****");
+ }
+ else
+ {
+ console.log ("**** GOING TO SLIDE MENU");
+ // $ionicSideMenuDelegate.toggleLeft();
+ $ionicSideMenuDelegate.$getByHandle('sideMenu').toggleLeft();
+ }
+
+
+ },100);*/
+
+
+}, 100);
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 16:32:23 +0000