From 1a4b28329bba3a30b83dd0538a2a159e8c17950b Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Mon, 28 Sep 2015 17:02:39 -0400 Subject: added support to delete events --- www/css/style.css | 10 ++++++++++ www/js/EventCtrl.js | 40 ++++++++++++++++++++++++++++++++++++++++ www/templates/events.html | 29 ++++++++++++++++++++++------- 3 files changed, 72 insertions(+), 7 deletions(-) (limited to 'www') diff --git a/www/css/style.css b/www/css/style.css index 84f532ca..7ad2d38f 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -428,6 +428,16 @@ input[type=range]::-webkit-slider-thumb { } +/* to avoid padding on delete in event list */ +.item-content { + padding-right: 16px !important; +} + +.eventDeleteSpeed +{ + -webkit-animation-duration: 300ms; +} + /*.mySliderClass.jslider.sliderCSS div.jslider-pointer {top:-10px;left:15px;width:60px;height:60px;margin-left:-5px;background-color:silver;background-color:#615959;border-radius:50% }*/ diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 243b5405..e4f29c3b 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -21,6 +21,8 @@ angular.module('zmApp.controllers') $scope.weeks = []; $scope.months = []; + $scope.eventList = {showDelete:false}; + $scope.slides = []; // will hold scrub frames var segmentHandle = 0; // holds timer for progress bar $scope.totalEventTime = 0; // used to display max of progress bar @@ -236,6 +238,44 @@ angular.module('zmApp.controllers') $state.go("events", {"id":monitorId}); }; + + $scope.deleteEvent = function (id, itemid) + { + //$scope.eventList.showDelete = false; + //curl -XDELETE http://server/zm/api/events/1.json + var loginData = ZMDataModel.getLogin(); + var apiDelete = loginData.apiurl + "/events/" + id + ".json"; + ZMDataModel.zmDebug("DeleteEvent: ID="+id+" item="+itemid); + ZMDataModel.zmLog("Delete event " + apiDelete); + $http.delete(apiDelete) + .success(function(data) + { + ZMDataModel.zmDebug ("delete success: " + JSON.stringify(data)); + ZMDataModel.displayBanner ('info', ['deleted event'],2000,2000); + + + /*var element = angular.element(document.getElementById("item-"+itemid)); + element.addClass("eventDeleteSpeed animated slideOutLeft") + .one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', + + function () { + // element.removeClass("animated slideOutLeft"); + }); + $ionicScrollDelegate.$getByHandle("mainScroll").resize();*/ + + $scope.events.splice(itemid, 1); + //doRefresh(); + + }) + .error (function (data) + { + ZMDataModel.zmDebug ("delete error: " + JSON.stringify(data)); + ZMDataModel.displayBanner ('error', ['could not delete event', 'please check logs']); + }); + + + }; + //------------------------------------------------ // Tapping on the filter sign lets you reset it //------------------------------------------------- diff --git a/www/templates/events.html b/www/templates/events.html index 7d96d8cb..a95cb2eb 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -4,6 +4,9 @@ + + @@ -40,10 +43,10 @@
-
-
- + + +
     {{prettifyTime(event.Event.StartTime)}} @@ -112,6 +115,8 @@ ng-click="closeIfOpen(event);openModal(event.Event.Id, event.Event.Name, event.Event.Length,event.Event.Frames, event.Event.BasePath, event.Event.relativePath)" > View Footage + + @@ -169,9 +174,19 @@
- -
-
+ + + + + + + + -- cgit v1.2.3