summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/DataModel.js1
-rw-r--r--www/js/EventCtrl.js32
2 files changed, 32 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index dcd8d11d..4a4fdee0 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -68,6 +68,7 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
simevents.push({
"Event": {
// Obviously this is dummy data
+ "Id":Math.floor(Math.random() * (5000 - 100 + 1)) + 1000,
"MonitorId": mon.toString(),
"Cause": causes[Math.floor(Math.random() * (2 - 0 + 1)) + 0],
"Length": Math.floor(Math.random() * (700 - 20 + 1)) + 20,
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 69fd0222..84764f19 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -2,7 +2,7 @@
// 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', function ($ionicPlatform, $scope, $stateParams, message, ZMDataModel,$ionicSideMenuDelegate) {
+angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ionicPlatform, $scope, $stateParams, message, ZMDataModel,$ionicSideMenuDelegate, $ionicModal) {
console.log("I got STATE PARAM " + $stateParams.id);
$scope.id = parseInt($stateParams.id,10);
@@ -10,6 +10,36 @@ $scope.openMenu = function () {
$ionicSideMenuDelegate.toggleLeft();
}
+// This is a modal to show the event footage
+$ionicModal.fromTemplateUrl('templates/events-modal.html', {
+ scope: $scope,
+ animation: 'slide-in-up'
+ })
+ .then(function(modal) {
+ $scope.modal = modal;
+
+ });
+
+
+$scope.openModal = function(eid,ename,edur) {
+ console.log ("Open Modal");
+ $scope.eventName = ename;
+ $scope.eventId = eid;
+ $scope.eventDur = Math.round(edur);
+ $scope.loginData = ZMDataModel.getLogin();
+ $scope.modal.show();
+ };
+ $scope.closeModal = function() {
+ console.log ("Close Modal");
+ $scope.modal.hide();
+
+ };
+ //Cleanup the modal when we're done with it!
+ $scope.$on('$destroy', function() {
+ console.log ("Destroy Modal");
+ $scope.modal.remove();
+ });
+
console.log("***CALLING EVENTS FACTORY");
var lData = ZMDataModel.getLogin();
console.log("ZM Service Username = " + lData.username);