summaryrefslogtreecommitdiff
path: root/www/js/EventsGraphsCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/EventsGraphsCtrl.js')
-rw-r--r--www/js/EventsGraphsCtrl.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js
index 21d67f56..e6238084 100644
--- a/www/js/EventsGraphsCtrl.js
+++ b/www/js/EventsGraphsCtrl.js
@@ -8,9 +8,6 @@
// the main function is generateChart. I call generate chart with required parameters
// from the template file
-// FIXME: I need to clean this up, the animation is stupid because the data loads
-// dynamically. I think I should really be using $q.all to animate after we get everything
-
angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ionicPlatform', '$scope', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', function ($ionicPlatform, $scope, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $element) {
console.log("Inside Graphs controller");
$scope.openMenu = function () {
@@ -34,6 +31,10 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
});
+ //-------------------------------------------------
+ // Controller main
+ //-------------------------------------------------
+
$scope.navTitle = 'Tab Page';
// $scope.chart="";
$scope.leftButtons = [{
@@ -43,8 +44,6 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
}
}];
- // $scope.chartObject=[{},{},{},{}];
-
angular.element(document).ready(function () {
console.log('****DOCUMENT READY******');
@@ -58,6 +57,9 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
};
+ //-------------------------------------------------
+ // Generates a bar graph with data provided
+ //-------------------------------------------------
$scope.generateTCChart = function (id, chartTitle, hrs) {
var monitors = [];
var dateRange = "";
@@ -150,5 +152,5 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
//String - A legend template
// legendTemplate : '<ul class="tc-chart-js-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'
};
- };
+ }; //generateTCChart
}]);