From 30a5e7245336d0bbc272e673dcf168b3d6fdf81c Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Mon, 1 Feb 2016 21:43:57 -0600 Subject: [PATCH] Graphs now use datetime instead of id for x-axis --- www/public/js/controller.js | 7 +++++-- www/public/partials/tagVals.html | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/www/public/js/controller.js b/www/public/js/controller.js index b39f4f2..a4b45b7 100644 --- a/www/public/js/controller.js +++ b/www/public/js/controller.js @@ -371,6 +371,9 @@ tsCtrlrs.controller('tagValsCtrl', function($scope, $route, $http, $routeParams, $scope.loading = false; if (data.status == "OK"){ $scope.data = data; + $scope.data.vals = $scope.data.vals.map(function(x){ + return {id: x.id, tagID: x.tagID, val: x.val, dateAdded: new Date(x.dateAdded)}; + }); $scope.error = false; $scope.options = { @@ -387,8 +390,8 @@ tsCtrlrs.controller('tagValsCtrl', function($scope, $route, $http, $routeParams, ], axes: { x: { - key: "id", - // type: "date" + key: "dateAdded", + type: "date" } } }; diff --git a/www/public/partials/tagVals.html b/www/public/partials/tagVals.html index c003cb0..99515c0 100644 --- a/www/public/partials/tagVals.html +++ b/www/public/partials/tagVals.html @@ -65,3 +65,4 @@ +
{{data}}