file formatting

1 files changed, 430 insertions, 500 deletions

diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index b41abfd0..38bdf765 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -6,539 +6,469 @@
 // refer to comments in EventCtrl for the modal stuff. They are almost the same
 
 angular.module('zmApp.controllers')
-    .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$ionicPlatform', '$translate', '$q',
-        function($ionicPopup, zm, $scope, NVRDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $ionicPlatform, $translate, $q)
-        {
+  .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$ionicPlatform', '$translate', '$q',
+    function ($ionicPopup, zm, $scope, NVRDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $ionicPlatform, $translate, $q) {
 
-            //-----------------------------------------------------------------------
-            // Controller Main
-            //-----------------------------------------------------------------------
+      //-----------------------------------------------------------------------
+      // Controller Main
+      //-----------------------------------------------------------------------
 
-            // var isModalOpen = false;
+      // var isModalOpen = false;
 
-            // console.log("***EVENTS: Waiting for Monitors to load before I proceed");
+      // console.log("***EVENTS: Waiting for Monitors to load before I proceed");
 
-            var loginData;
+      var loginData;
 
-            // --------------------------------------------------------
-            // Handling of back button in case modal is open should
-            // close the modal
-            // --------------------------------------------------------                               
+      // --------------------------------------------------------
+      // Handling of back button in case modal is open should
+      // close the modal
+      // --------------------------------------------------------                               
 
-            $ionicPlatform.registerBackButtonAction(function(e)
-            {
-                e.preventDefault();
-                if ($scope.modal != undefined && $scope.modal.isShown())
-                {
-                    // switch off awake, as liveview is finished
-                    NVRDataModel.debug("Modal is open, closing it");
-                    NVRDataModel.setAwake(false);
-                    $scope.modal.remove();
-                }
-                else
-                {
-                    NVRDataModel.debug("Modal is closed, so toggling or exiting");
-                    if (!$ionicSideMenuDelegate.isOpenLeft())
-                    {
-                        $ionicSideMenuDelegate.toggleLeft();
-
-                    }
-                    else
-                    {
-                        navigator.app.exitApp();
-                    }
+      $ionicPlatform.registerBackButtonAction(function (e) {
+        e.preventDefault();
+        if ($scope.modal != undefined && $scope.modal.isShown()) {
+          // switch off awake, as liveview is finished
+          NVRDataModel.debug("Modal is open, closing it");
+          NVRDataModel.setAwake(false);
+          $scope.modal.remove();
+        } else {
+          NVRDataModel.debug("Modal is closed, so toggling or exiting");
+          if (!$ionicSideMenuDelegate.isOpenLeft()) {
+            $ionicSideMenuDelegate.toggleLeft();
 
-                }
+          } else {
+            navigator.app.exitApp();
+          }
 
-            }, 1000);
+        }
 
-            $scope.openMenu = function()
-            {
-                $ionicSideMenuDelegate.toggleLeft();
-            };
+      }, 1000);
+
+      $scope.openMenu = function () {
+        $ionicSideMenuDelegate.toggleLeft();
+      };
+
+      //----------------------------------------------------------------
+      // Alarm notification handling
+      //----------------------------------------------------------------
+      $scope.handleAlarms = function () {
+        $rootScope.isAlarm = !$rootScope.isAlarm;
+        if (!$rootScope.isAlarm) {
+          $rootScope.alarmCount = "0";
+          $ionicHistory.nextViewOptions({
+            disableBack: true
+          });
+
+          $state.go("app.events", {
+            "id": 0,
+            "playEvent": false
+          }, {
+            reload: true
+          });
+          return;
+        }
+      };
+      //-----------------------------------------------------------------------
+      // This function takes care of changing monitor parameters
+      // For now, I've only limited it to enable/disable and change monitor mode
+      // and changing monitor function
+      //-----------------------------------------------------------------------
+      $scope.changeConfig = function (monitorName, monitorId, enabled, func) {
+        var checked = false;
+
+        if (monitorName == 'All') {
+          monitorName = $translate.instant('kAll');
+        }
 
-            //----------------------------------------------------------------
-            // Alarm notification handling
-            //----------------------------------------------------------------
-            $scope.handleAlarms = function()
-            {
-                $rootScope.isAlarm = !$rootScope.isAlarm;
-                if (!$rootScope.isAlarm)
-                {
-                    $rootScope.alarmCount = "0";
-                    $ionicHistory.nextViewOptions(
-                    {
-                        disableBack: true
-                    });
+        //console.log("called with " + monitorId + ":" + enabled + ":" + func);
+        if (enabled == '1') checked = true;
+
+        //if monitorId is not specified, all monitors will be changed 
+        var monitorsIds = [];
+        if (monitorId == '') {
+          for (var i = 0; i < $scope.monitors.length; i++) {
+            monitorsIds[i] = $scope.monitors[i].Monitor.Id;
+          }
+        } else {
+          monitorsIds[0] = monitorId;
+        }
 
-                    $state.go("app.events",
-                    {
-                        "id": 0,
-                        "playEvent": false
-                    },
-                    {
-                        reload: true
-                    });
-                    return;
-                }
-            };
-            //-----------------------------------------------------------------------
-            // This function takes care of changing monitor parameters
-            // For now, I've only limited it to enable/disable and change monitor mode
-            // and changing monitor function
-            //-----------------------------------------------------------------------
-            $scope.changeConfig = function(monitorName, monitorId, enabled, func)
+        $scope.monFunctions = [{
+            text: $translate.instant('kMonModect'),
+            value: "Modect"
+          },
+          {
+            text: $translate.instant('kMonMocord'),
+            value: "Mocord"
+          },
+          {
+            text: $translate.instant('kMonRecord'),
+            value: "Record"
+          },
+          {
+            text: $translate.instant('kMonNodect'),
+            value: "Nodect"
+          },
+          {
+            text: $translate.instant('kMonMonitor'),
+            value: "Monitor"
+          },
+          {
+            text: $translate.instant('kMonNone'),
+            value: "None"
+          }
+        ];
+
+        $scope.monfunc = {
+          mymonitorsIds: monitorsIds,
+          myfunc: func,
+          myenabled: checked,
+          myfailedIds: [],
+          mypromises: []
+        };
+
+        $rootScope.zmPopup = $ionicPopup.show({
+          scope: $scope,
+          template: '<ion-toggle ng-model="monfunc.myenabled"   toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
+
+          title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName,
+
+          buttons: [{
+              text: $translate.instant('kButtonCancel'),
+
+            },
             {
-                var checked = false;
-
-                if (monitorName == 'All')
-                {
-                    monitorName = $translate.instant('kAll');
-                }
-
-                //console.log("called with " + monitorId + ":" + enabled + ":" + func);
-                if (enabled == '1') checked = true;
-
-                //if monitorId is not specified, all monitors will be changed 
-                var monitorsIds = [];
-                if (monitorId == '')
-                {
-                    for (var i = 0; i < $scope.monitors.length; i++)
-                    {
-                        monitorsIds[i] = $scope.monitors[i].Monitor.Id;
-                    }
-                }
-                else
-                {
-                    monitorsIds[0] = monitorId;
-                }
-
-                $scope.monFunctions = [
-                {
-                    text: $translate.instant('kMonModect'),
-                    value: "Modect"
-                },
-                {
-                    text: $translate.instant('kMonMocord'),
-                    value: "Mocord"
-                },
-                {
-                    text: $translate.instant('kMonRecord'),
-                    value: "Record"
-                },
-                {
-                    text: $translate.instant('kMonNodect'),
-                    value: "Nodect"
-                },
-                {
-                    text: $translate.instant('kMonMonitor'),
-                    value: "Monitor"
-                },
-                {
-                    text: $translate.instant('kMonNone'),
-                    value: "None"
-                }];
-
-                $scope.monfunc = {
-                    mymonitorsIds: monitorsIds,
-                    myfunc: func,
-                    myenabled: checked,
-                    myfailedIds: [],
-                    mypromises: []
-                };
-
-                $rootScope.zmPopup = $ionicPopup.show(
-                {
-                    scope: $scope,
-                    template: '<ion-toggle ng-model="monfunc.myenabled"   toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
-
-                    title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName,
-
-                    buttons: [
-                    {
-                        text: $translate.instant('kButtonCancel'),
-
-                    },
-                    {
-                        text: $translate.instant('kButtonSave'),
-                        onTap: function(e)
-                        {
-                            $scope.monfunc.mymonitorsIds.forEach(function(item, index)
-                            {
-                                NVRDataModel.debug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled +
-                                    $scope.monfunc.myfunc);
-                                var loginData = NVRDataModel.getLogin();
-                                var apiRestart = loginData.apiurl + "/states/change/restart.json";
-                                var apiMon = loginData.apiurl + "/monitors/" + item + ".json";
-
-                                NVRDataModel.debug("MonitorCtrl: URLs for changeConfig save:" + apiMon);
-
-                                var isEnabled = "";
-                                isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0';
-
-                                $ionicLoading.show(
-                                {
-                                    template: $translate.instant('kApplyingChanges') + "...",
-                                    noBackdrop: true,
-                                    duration: zm.largeHttpTimeout,
-                                });
-
-                                var httpPromise = $http(
-                                    {
-                                        url: apiMon,
-                                        method: 'post',
-                                        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);
-                                            NVRDataModel.debug("MonitorCtrl: parmeters constructed: " + foo);
-                                            return foo;
-                                        },
-                                        data:
-                                        {
-                                            'Monitor[Function]': $scope.monfunc.myfunc,
-                                            'Monitor[Enabled]': isEnabled,
-                                        }
-
-                                    })
-                                    .success(function()
-                                    {
-                                        NVRDataModel.debug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work");
-                                    })
-                                    .error(function(data, status, headers, config)
-                                    {
-                                        NVRDataModel.debug("MonitorCtrl: Error changing monitor " + JSON.stringify(data));
-                                        $scope.monfunc.myfailedIds.push(item);
-                                    });
-
-                                $scope.monfunc.mypromises.push(httpPromise);
-                            });
+              text: $translate.instant('kButtonSave'),
+              onTap: function (e) {
+                $scope.monfunc.mymonitorsIds.forEach(function (item, index) {
+                  NVRDataModel.debug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled +
+                    $scope.monfunc.myfunc);
+                  var loginData = NVRDataModel.getLogin();
+                  var apiRestart = loginData.apiurl + "/states/change/restart.json";
+                  var apiMon = loginData.apiurl + "/monitors/" + item + ".json";
+
+                  NVRDataModel.debug("MonitorCtrl: URLs for changeConfig save:" + apiMon);
+
+                  var isEnabled = "";
+                  isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0';
+
+                  $ionicLoading.show({
+                    template: $translate.instant('kApplyingChanges') + "...",
+                    noBackdrop: true,
+                    duration: zm.largeHttpTimeout,
+                  });
+
+                  var httpPromise = $http({
+                      url: apiMon,
+                      method: 'post',
+                      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);
+                        NVRDataModel.debug("MonitorCtrl: parmeters constructed: " + foo);
+                        return foo;
+                      },
+                      data: {
+                        'Monitor[Function]': $scope.monfunc.myfunc,
+                        'Monitor[Enabled]': isEnabled,
+                      }
 
-                            $q.all($scope.monfunc.mypromises).then(function(e)
-                            {
-                                $ionicLoading.hide();
-                                // if there's a failed ID, an error has occurred
-                                if ($scope.monfunc.myfailedIds.length != 0)
-                                {
-                                    $ionicLoading.show(
-                                    {
-                                        template: $translate.instant('kErrorChangingMonitors') + ". Monitor IDs : " + $scope.monfunc.myfailedIds.toString(),
-                                        noBackdrop: true,
-                                        duration: 3000,
-                                    });
-                                }
-                                else
-                                {
-                                    // I am not restarting ZM after monitor change
-                                    /* NVRDataModel.debug ("MonitorCtrl: Restarting ZM");
-                                    $ionicLoading.show({
-                                        template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...",
-                                        noBackdrop: true,
-                                        duration: zm.largeHttpTimeout,
-                                    });
-                                    $http.post(apiRestart)
-                                        .then(function (success) {
-                                            $ionicLoading.hide();
-                                            var refresh = NVRDataModel.getMonitors(1);
-                                            refresh.then(function (data) {
-                                                $scope.monitors = data;
-                                                $scope.$broadcast('scroll.refreshComplete');
-                                            });
-
-                                         },
-                                         function (error) {
-                                             $ionicLoading.hide();
-
-                                         });*/
-                                    doRefresh();
-                                }
-                            });
-                        }
+                    })
+                    .success(function () {
+                      NVRDataModel.debug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work");
+                    })
+                    .error(function (data, status, headers, config) {
+                      NVRDataModel.debug("MonitorCtrl: Error changing monitor " + JSON.stringify(data));
+                      $scope.monfunc.myfailedIds.push(item);
+                    });
 
-                    }, ]
+                  $scope.monfunc.mypromises.push(httpPromise);
                 });
 
-            };
-
-            // same logic as EventCtrl.js
-            $scope.finishedLoadingImage = function()
-            {
-                // console.log("***Monitor image FINISHED Loading***");
-                $ionicLoading.hide();
-            };
-
-            $scope.$on('$ionicView.loaded', function()
-            {
-                //  console.log("**VIEW ** Monitor 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 ** Monitor Ctrl Entered");
-                NVRDataModel.setAwake(false);
-                $ionicSideMenuDelegate.canDragContent(true);
-                $scope.areImagesLoading = true;
-            });
-
-            $scope.$on('$ionicView.afterEnter', function()
-            {
-                // console.log("**VIEW ** Monitor Ctrl Entered");
-                $scope.monitors = [];
-                $scope.monitors = message;
-
-                //console.log (">>>>>>>>>>>> MONITOR CTRL " + JSON.stringify($scope.monitors));
-
-                if ($scope.monitors.length == 0)
-                {
-                    $rootScope.zmPopup = $ionicPopup.alert(
-                    {
-                        title: $translate.instant('kNoMonitors'),
-                        template: $translate.instant('kPleaseCheckCredentials')
+                $q.all($scope.monfunc.mypromises).then(function (e) {
+                  $ionicLoading.hide();
+                  // if there's a failed ID, an error has occurred
+                  if ($scope.monfunc.myfailedIds.length != 0) {
+                    $ionicLoading.show({
+                      template: $translate.instant('kErrorChangingMonitors') + ". Monitor IDs : " + $scope.monfunc.myfailedIds.toString(),
+                      noBackdrop: true,
+                      duration: 3000,
                     });
-                    $ionicHistory.nextViewOptions(
-                    {
-                        disableBack: true
+                  } else {
+                    // I am not restarting ZM after monitor change
+                    /* NVRDataModel.debug ("MonitorCtrl: Restarting ZM");
+                    $ionicLoading.show({
+                        template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...",
+                        noBackdrop: true,
+                        duration: zm.largeHttpTimeout,
                     });
-                    $state.go("app.login",
-                    {
-                        "wizard": false
-                    });
-                    return;
-                }
+                    $http.post(apiRestart)
+                        .then(function (success) {
+                            $ionicLoading.hide();
+                            var refresh = NVRDataModel.getMonitors(1);
+                            refresh.then(function (data) {
+                                $scope.monitors = data;
+                                $scope.$broadcast('scroll.refreshComplete');
+                            });
 
-                loginData = NVRDataModel.getLogin();
-                monitorStateCheck();
-                //console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
-                NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
-                // Now lets see if we need to load live screen
-
-                // $rootScope.tappedMid = 1;
-                if ($rootScope.tappedMid != 0)
-                {
-                    NVRDataModel.log("Notification tapped, we need to go to monitor " + $rootScope.tappedMid);
-
-                    var tm = $rootScope.tappedMid;
-                    $rootScope.tappedMid = 0;
-                    var monitem;
-                    for (var m = 0; m < $scope.monitors.length; m++)
-                    {
-                        if ($scope.monitors[m].Monitor.Id == tm)
-                        {
-                            monitem = $scope.monitors[m];
-                            break;
-                        }
-
-                    }
-
-                    openModal(monitem.Monitor.Id, monitem.Monitor.Controllable, monitem.Monitor.ControlId, monitem.Monitor.connKey, monitem);
-                }
+                         },
+                         function (error) {
+                             $ionicLoading.hide();
 
-            });
+                         });*/
+                    doRefresh();
+                  }
+                });
+              }
+
+            },
+          ]
+        });
+
+      };
+
+      // same logic as EventCtrl.js
+      $scope.finishedLoadingImage = function () {
+        // console.log("***Monitor image FINISHED Loading***");
+        $ionicLoading.hide();
+      };
+
+      $scope.$on('$ionicView.loaded', function () {
+        //  console.log("**VIEW ** Monitor 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 ** Monitor Ctrl Entered");
+        NVRDataModel.setAwake(false);
+        $ionicSideMenuDelegate.canDragContent(true);
+        $scope.areImagesLoading = true;
+      });
+
+      $scope.$on('$ionicView.afterEnter', function () {
+        // console.log("**VIEW ** Monitor Ctrl Entered");
+        $scope.monitors = [];
+        $scope.monitors = message;
+
+        //console.log (">>>>>>>>>>>> MONITOR CTRL " + JSON.stringify($scope.monitors));
+
+        if ($scope.monitors.length == 0) {
+          $rootScope.zmPopup = $ionicPopup.alert({
+            title: $translate.instant('kNoMonitors'),
+            template: $translate.instant('kPleaseCheckCredentials')
+          });
+          $ionicHistory.nextViewOptions({
+            disableBack: true
+          });
+          $state.go("app.login", {
+            "wizard": false
+          });
+          return;
+        }
 
-            $scope.$on('$ionicView.leave', function()
-            {
-                // console.log("**VIEW ** Monitor Ctrl Left, force removing modal");
-                if ($scope.modal) $scope.modal.remove();
-            });
+        loginData = NVRDataModel.getLogin();
+        monitorStateCheck();
+        //console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
+        // Now lets see if we need to load live screen
+
+        // $rootScope.tappedMid = 1;
+        if ($rootScope.tappedMid != 0) {
+          NVRDataModel.log("Notification tapped, we need to go to monitor " + $rootScope.tappedMid);
+
+          var tm = $rootScope.tappedMid;
+          $rootScope.tappedMid = 0;
+          var monitem;
+          for (var m = 0; m < $scope.monitors.length; m++) {
+            if ($scope.monitors[m].Monitor.Id == tm) {
+              monitem = $scope.monitors[m];
+              break;
+            }
 
-            $scope.$on('$ionicView.unloaded', function()
-            {
-                // console.log("**VIEW ** Monitor Ctrl Unloaded");
-            });
+          }
 
-            $scope.openModal = function(mid, controllable, controlid, connKey, monitor)
-            {
+          openModal(monitem.Monitor.Id, monitem.Monitor.Controllable, monitem.Monitor.ControlId, monitem.Monitor.connKey, monitem);
+        }
 
-                openModal(mid, controllable, controlid, connKey, monitor);
+      });
 
-            };
+      $scope.$on('$ionicView.leave', function () {
+        // console.log("**VIEW ** Monitor Ctrl Left, force removing modal");
+        if ($scope.modal) $scope.modal.remove();
+      });
+
+      $scope.$on('$ionicView.unloaded', function () {
+        // console.log("**VIEW ** Monitor Ctrl Unloaded");
+      });
 
-            function openModal(mid, controllable, controlid, connKey, monitor)
-            {
-                NVRDataModel.debug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid +
-                    " and Controllable:" + controllable + " with control ID:" + controlid);
-
-                $scope.controlURL = monitor.Monitor.controlURL;
-                $scope.monitor = monitor;
-                //console.log (">>>>>>>>>>>> MONITOR CRL " + $scope.monitor.
-                $scope.monitorId = mid;
-                $scope.monitorName = NVRDataModel.getMonitorName(mid);
-                $scope.LoginData = NVRDataModel.getLogin();
-                $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
-                $scope.refMonitor = monitor;
-                NVRDataModel.log("Monitor Orientation is: " + $scope.orientation);
-                $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
-
-                $scope.showPTZ = false;
-                $scope.monitorId = mid;
-                $scope.monitorName = NVRDataModel.getMonitorName(mid);
-                $scope.controlid = controlid;
-
-                $scope.LoginData = NVRDataModel.getLogin();
-                $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
-
-                $scope.ptzMoveCommand = "";
-                $scope.ptzStopCommand = "";
-
-                $scope.zoomInCommand = "";
-                $scope.zoomOutCommand = "";
-                $scope.zoomStopCommand = "zoomStop";
-                $scope.canZoom = false;
-
-                $scope.presetOn = false;
-
-               
-                $scope.isControllable = controllable;
-
-                $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
-
-                // This is a modal to show the monitor footage
-                // We need to switch to always awake if set so the feed doesn't get interrupted
-                NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
-
-                $ionicModal.fromTemplateUrl('templates/monitors-modal.html',
-                    {
-                        scope: $scope,
-                        animation: 'slide-in-up'
-                    })
-                    .then(function(modal)
-                    {
-                        $scope.modal = modal;
-                        $scope.isModalActive = true;
-                        $scope.modal.show();
-                    });
+      $scope.openModal = function (mid, controllable, controlid, connKey, monitor) {
 
-            }
+        openModal(mid, controllable, controlid, connKey, monitor);
 
-            $scope.closeModal = function()
-            {
-                // console.log("Close & Destroy Monitor Modal");
-
-                // stop networking -nph-zms keeps sucking data
-
-                // switch off awake, as liveview is finished
-                NVRDataModel.setAwake(false);
-                $scope.modal.remove();
-                $timeout(function()
-                {
-                    NVRDataModel.log("MonitorCtrl:Stopping network pull...");
-                    if (NVRDataModel.isForceNetworkStop()) NVRDataModel.stopNetwork("MonitorCtrl-closeModal");
-                }, 300);
-
-            };
-            //Cleanup the modal when we're done with it!
-            $scope.$on('$destroy', function()
-            {
-                //console.log("Destroy Monitor Modal");
-                if ($scope.modal) $scope.modal.remove();
-            });
+      };
 
-            //-----------------------------------------------------------------------
-            // Controller Main
-            //-----------------------------------------------------------------------
-
-            function monitorStateCheck()
-            {
-                var apiMonCheck;
-
-                // The status is provided by zmdc.pl
-                // "not running", "pending", "running since", "Unable to connect"
-                var i;
-                for (i = 0; i < $scope.monitors.length; i++)
-                {
-                    (function(j)
-                    {
-                        $scope.monitors[j].Monitor.isRunningText = "...";
-                        $scope.monitors[j].Monitor.isRunning = "...";
-                        $scope.monitors[j].Monitor.color = zm.monitorCheckingColor;
-                        $scope.monitors[j].Monitor.char = "ion-checkmark-circled";
-                        apiMonCheck = loginData.apiurl + "/monitors/daemonStatus/id:" + $scope.monitors[j].Monitor.Id + "/daemon:zmc.json";
-
-                        //apiMonCheck = apiMonCheck.replace(loginData.url, $scope.monitors[j].Monitor.baseURL);
-
-                        // in multiserver replace apiurl with baseurl
-
-                        NVRDataModel.debug("MonitorCtrl:monitorStateCheck: " + apiMonCheck);
-                        //console.log("**** ZMC CHECK " + apiMonCheck);
-                        $http.get(apiMonCheck)
-                            .success(function(data)
-                            {
-                                NVRDataModel.debug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data));
-                                if (data.statustext.indexOf("not running") > -1)
-                                {
-                                    $scope.monitors[j].Monitor.isRunning = "false";
-                                    $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor;
-                                    $scope.monitors[j].Monitor.char = "ion-close-circled";
-                                }
-                                else if (data.statustext.indexOf("pending") > -1)
-                                {
-                                    $scope.monitors[j].Monitor.isRunning = "pending";
-                                    $scope.monitors[j].Monitor.color = zm.monitorPendingColor;
-                                }
-                                else if (data.statustext.indexOf("running since") > -1)
-                                {
-                                    $scope.monitors[j].Monitor.isRunning = "true";
-                                    $scope.monitors[j].Monitor.color = zm.monitorRunningColor;
-                                }
-                                else if (data.statustext.indexOf("Unable to connect") > -1)
-                                {
-                                    $scope.monitors[j].Monitor.isRunning = "false";
-                                    $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor;
-                                    $scope.monitors[j].Monitor.char = "ion-close-circled";
-                                }
-
-                                $scope.monitors[j].Monitor.isRunningText = data.statustext;
-                            })
-                            .error(function(data)
-                            {
-                                NVRDataModel.debug("MonitorCtrl: Error->monitor check state returned: " +
-                                    JSON.stringify(data));
-                                NVRDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]);
-                                $scope.monitors[j].Monitor.isRunning = "error";
-                                $scope.monitors[j].Monitor.color = zm.monitorErrorColor;
-                                $scope.monitors[j].Monitor.char = "ion-help-circled";
-                            });
-
-                    })(i);
+      function openModal(mid, controllable, controlid, connKey, monitor) {
+        NVRDataModel.debug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid +
+          " and Controllable:" + controllable + " with control ID:" + controlid);
+
+        $scope.controlURL = monitor.Monitor.controlURL;
+        $scope.monitor = monitor;
+        //console.log (">>>>>>>>>>>> MONITOR CRL " + $scope.monitor.
+        $scope.monitorId = mid;
+        $scope.monitorName = NVRDataModel.getMonitorName(mid);
+        $scope.LoginData = NVRDataModel.getLogin();
+        $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+        $scope.refMonitor = monitor;
+        NVRDataModel.log("Monitor Orientation is: " + $scope.orientation);
+        $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+
+        $scope.showPTZ = false;
+        $scope.monitorId = mid;
+        $scope.monitorName = NVRDataModel.getMonitorName(mid);
+        $scope.controlid = controlid;
+
+        $scope.LoginData = NVRDataModel.getLogin();
+        $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+
+        $scope.ptzMoveCommand = "";
+        $scope.ptzStopCommand = "";
+
+        $scope.zoomInCommand = "";
+        $scope.zoomOutCommand = "";
+        $scope.zoomStopCommand = "zoomStop";
+        $scope.canZoom = false;
+
+        $scope.presetOn = false;
+
+
+        $scope.isControllable = controllable;
+
+        $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
+
+        // This is a modal to show the monitor footage
+        // We need to switch to always awake if set so the feed doesn't get interrupted
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
+
+        $ionicModal.fromTemplateUrl('templates/monitors-modal.html', {
+            scope: $scope,
+            animation: 'slide-in-up'
+          })
+          .then(function (modal) {
+            $scope.modal = modal;
+            $scope.isModalActive = true;
+            $scope.modal.show();
+          });
+
+      }
+
+      $scope.closeModal = function () {
+        // console.log("Close & Destroy Monitor Modal");
+
+        // stop networking -nph-zms keeps sucking data
+
+        // switch off awake, as liveview is finished
+        NVRDataModel.setAwake(false);
+        $scope.modal.remove();
+        $timeout(function () {
+          NVRDataModel.log("MonitorCtrl:Stopping network pull...");
+          if (NVRDataModel.isForceNetworkStop()) NVRDataModel.stopNetwork("MonitorCtrl-closeModal");
+        }, 300);
+
+      };
+      //Cleanup the modal when we're done with it!
+      $scope.$on('$destroy', function () {
+        //console.log("Destroy Monitor Modal");
+        if ($scope.modal) $scope.modal.remove();
+      });
+
+      //-----------------------------------------------------------------------
+      // Controller Main
+      //-----------------------------------------------------------------------
+
+      function monitorStateCheck() {
+        var apiMonCheck;
+
+        // The status is provided by zmdc.pl
+        // "not running", "pending", "running since", "Unable to connect"
+        var i;
+        for (i = 0; i < $scope.monitors.length; i++) {
+          (function (j) {
+            $scope.monitors[j].Monitor.isRunningText = "...";
+            $scope.monitors[j].Monitor.isRunning = "...";
+            $scope.monitors[j].Monitor.color = zm.monitorCheckingColor;
+            $scope.monitors[j].Monitor.char = "ion-checkmark-circled";
+            apiMonCheck = loginData.apiurl + "/monitors/daemonStatus/id:" + $scope.monitors[j].Monitor.Id + "/daemon:zmc.json";
+
+            //apiMonCheck = apiMonCheck.replace(loginData.url, $scope.monitors[j].Monitor.baseURL);
+
+            // in multiserver replace apiurl with baseurl
+
+            NVRDataModel.debug("MonitorCtrl:monitorStateCheck: " + apiMonCheck);
+            //console.log("**** ZMC CHECK " + apiMonCheck);
+            $http.get(apiMonCheck)
+              .success(function (data) {
+                NVRDataModel.debug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data));
+                if (data.statustext.indexOf("not running") > -1) {
+                  $scope.monitors[j].Monitor.isRunning = "false";
+                  $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor;
+                  $scope.monitors[j].Monitor.char = "ion-close-circled";
+                } else if (data.statustext.indexOf("pending") > -1) {
+                  $scope.monitors[j].Monitor.isRunning = "pending";
+                  $scope.monitors[j].Monitor.color = zm.monitorPendingColor;
+                } else if (data.statustext.indexOf("running since") > -1) {
+                  $scope.monitors[j].Monitor.isRunning = "true";
+                  $scope.monitors[j].Monitor.color = zm.monitorRunningColor;
+                } else if (data.statustext.indexOf("Unable to connect") > -1) {
+                  $scope.monitors[j].Monitor.isRunning = "false";
+                  $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor;
+                  $scope.monitors[j].Monitor.char = "ion-close-circled";
                 }
-            }
 
-            function doRefresh()
-            {
-                $scope.monitors = [];
+                $scope.monitors[j].Monitor.isRunningText = data.statustext;
+              })
+              .error(function (data) {
+                NVRDataModel.debug("MonitorCtrl: Error->monitor check state returned: " +
+                  JSON.stringify(data));
+                NVRDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]);
+                $scope.monitors[j].Monitor.isRunning = "error";
+                $scope.monitors[j].Monitor.color = zm.monitorErrorColor;
+                $scope.monitors[j].Monitor.char = "ion-help-circled";
+              });
+
+          })(i);
+        }
+      }
 
-                var refresh = NVRDataModel.getMonitors(1);
+      function doRefresh() {
+        $scope.monitors = [];
 
-                refresh.then(function(data)
-                {
-                    $scope.monitors = data;
-                    monitorStateCheck();
-                    $scope.$broadcast('scroll.refreshComplete');
-                });
-            }
+        var refresh = NVRDataModel.getMonitors(1);
 
-            $scope.doRefresh = function()
-            {
-                //console.log("***Pull to Refresh");
-                doRefresh();
+        refresh.then(function (data) {
+          $scope.monitors = data;
+          monitorStateCheck();
+          $scope.$broadcast('scroll.refreshComplete');
+        });
+      }
 
-            };
+      $scope.doRefresh = function () {
+        //console.log("***Pull to Refresh");
+        doRefresh();
 
-        }
-    ]);
+      };
+
+    }
+  ]);