From 6bcc09cf53aee2ee8efc41d6d95213d678d8c330 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Tue, 26 Jan 2016 10:11:07 -0500 Subject: #154 - mostly working - events playing black nicely Former-commit-id: 523cb7b8166cb7bbfedb9fa3586b7937c424b289 --- www/js/MontageHistoryCtrl.js | 109 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 22 deletions(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index fa1e9247..bdbfeea5 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -4,6 +4,8 @@ /* global cordova,StatusBar,angular,console,ionic,Masonry,moment */ +// FIXME: This is a copy of montageCtrl - needs a lot of code cleanup + angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window) { $controller('zmApp.BaseController', { @@ -27,7 +29,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc } $scope.prettifyTime = function (str) { - console.log ("got " + str); + return moment(str).format('h:mm a'); }; @@ -36,33 +38,61 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc return moment(str).format('h:mm:ssa on MMMM Do YYYY'); }; - $scope.toggleTimeDisplay = function() + + + + $scope.footerCollapse = function() { - console.log ("TOGGLING"); - $scope.displayDateTimeSliders = !$scope.displayDateTimeSliders; - if ($scope.displayDateTimeSliders) - { - $scope.showtimers=true; - } - else + window.stop(); + + + $scope.sliderVal.realRate = $scope.sliderVal.rate *100; + ZMDataModel.zmDebug ("Playback rate is:" + $scope.sliderVal.realRate); + for (var i=0; i< $scope.MontageMonitors.length; i++) { - $timeout(function() - { $scope.showtimers=false; },300); + $scope.MontageMonitors[i].eventUrl = "img/noevent.png"; + } - - /*var element = angular.element(document.getElementById("historydials")); - if (!$scope.displayDateTimeSliders) - { + var TimeObjectFrom = $scope.sliderVal.year+"-"+$scope.sliderVal.month+"-"+$scope.sliderVal.day+" "+$scope.sliderVal.hour+":"+$scope.sliderVal.min; + + + + var TimeObjectTo = moment(TimeObjectFrom).add(1,'hour').format('YYYY-MM-DD HH:mm'); + - element.removeClass("animated fadeInDown"); - element.addClass("animated fadeOutUp"); - } - */ - + var apiurl = ld.apiurl + "/events/index/StartTime >=:"+TimeObjectFrom+"/StartTime <=:"+ TimeObjectTo+".json"; + + console.log ("New URL to get is " + apiurl); + + $http.get(apiurl) + .success( function(data) { + ZMDataModel.zmDebug ("Got new history events:"+ JSON.stringify(data)); + var eid, mid; + for (i=0; i