diff --git a/www/assets/js/ng/controller_tagVals.js b/www/assets/js/ng/controller_tagVals.js index 2d706f1..b27878b 100644 --- a/www/assets/js/ng/controller_tagVals.js +++ b/www/assets/js/ng/controller_tagVals.js @@ -1,7 +1,7 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams, Page, $log, tags, dateConversion) { Page.setTitle('Tag Series'); Page.setPage('tags'); - + $log.info({routeParams:$routeParams}); var colors = ['#d7191c','#fdae61','#abdda4','#2b83ba']; if ($routeParams.endDatetime){ @@ -19,6 +19,7 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams $log.info({start: $scope.startDatetime, end:$scope.endDatetime}); $scope.loadTagVals = function(sDTime, eDTime){ + $log.info({start: sDTime, end:eDTime}); $scope.loading = true; var tags_to_get = $routeParams.tagID.split(","); var getTag = tags.getTag(tags_to_get); @@ -27,10 +28,8 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams $scope.tag = tagData.tag; var getTagHistoryBetween = tags.getTagHistoryBetween(tags_to_get, sDTime, eDTime); getTagHistoryBetween.then(function(data) { - $scope.loading = false; $scope.data = data; - $scope.table_vals = $scope.data.vals.map(function(x){ var ob = {id: x.id, tagID: x.tagID, dtime: new Date(x.createdAt)}; for(var t = 0; t< $scope.tag.length; t++){ @@ -40,7 +39,6 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams ob[$scope.tag[t].name] = null; } } - return ob; });