aboutsummaryrefslogtreecommitdiff
path: root/web/static/app/diller/client.js
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2016-03-06 21:21:12 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2016-03-06 21:30:39 +0100
commit45267e41368fbb9fb318fb455981110e83c97953 (patch)
treefc4b819604081076ec97962a5f2dad3b99f51399 /web/static/app/diller/client.js
parent7ca173de3de046501d79164da0c8c8871a03089b (diff)
downloaddiller-server-45267e41368fbb9fb318fb455981110e83c97953.tar.gz
diller-server-45267e41368fbb9fb318fb455981110e83c97953.tar.bz2
diller-server-45267e41368fbb9fb318fb455981110e83c97953.tar.xz
diller-server-45267e41368fbb9fb318fb455981110e83c97953.zip
web:
o Adding level to Interval that specifies what kind of aggregate level the server should use.
Diffstat (limited to 'web/static/app/diller/client.js')
-rw-r--r--web/static/app/diller/client.js23
1 files changed, 18 insertions, 5 deletions
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);
}