From 45267e41368fbb9fb318fb455981110e83c97953 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 6 Mar 2016 21:21:12 +0100 Subject: web: o Adding level to Interval that specifies what kind of aggregate level the server should use. --- web/static/app/diller/client.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'web/static/app/diller/client.js') diff --git a/web/static/app/diller/client.js b/web/static/app/diller/client.js index 6641ffb..e73ac5f 100644 --- a/web/static/app/diller/client.js +++ b/web/static/app/diller/client.js @@ -4,13 +4,26 @@ } function Property($http, DillerRpc, propertyId) { - function getInterval(interval) { - // moment().subtract(24, 'hour') + /** + * @param {Diller.Interval} interval + * @returns {Promise} + */ + function getInterval(interval) { var req = DillerRpc.getValuesReq(propertyId); - req.params = { - from: interval.getFrom().toISOString() - }; + req.params = {}; + var from = interval.getFrom(); + if(from.isValid()) { + req.params.from = from.toISOString(); + } + + var to = interval.getTo(); + if(to.isValid()) { + req.params.to = to.toISOString(); + } + + req.params.aggregateLevel = interval.getLevel(); + return $http(req).then(extractData); } -- cgit v1.2.3