From 947a9c6a439b6e06c149e94e5f514ba3b5c6d0c4 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Wed, 24 May 2017 18:45:37 +0200 Subject: [PATCH] added back watering route and hopefully fixed bug with graph --- app/client/log.js | 13 +++++++------ app/client/startup.js | 4 +++- app/client/tabs.js | 2 +- app/router.js | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/client/log.js b/app/client/log.js index f48f9d0..f712ba8 100644 --- a/app/client/log.js +++ b/app/client/log.js @@ -29,12 +29,14 @@ var createChart = function() { self.temperatures = []; Tracker.autorun(function() { sensor_data_collection().forEach(function(sensorReading) { - self.labels.push(moment(sensorReading.lastBoxContact).format('ddd DD.MM. HH:mm:ss')); - for (var i = 0; i < sensorReading.temperatures.length; i++) { - if (!self.temperatures[i]) { - self.temperatures[i] = []; + if (sensorReading.temperatures) { + self.labels.push(moment(sensorReading.lastBoxContact).format('ddd DD.MM. HH:mm:ss')); + for (var i = 0; i < sensorReading.temperatures.length; i++) { + if (!self.temperatures[i]) { + self.temperatures[i] = []; + } + self.temperatures[i].push(sensorReading.temperatures[i]); } - self.temperatures[i].push(sensorReading.temperatures[i]); } }); }); @@ -187,7 +189,6 @@ Template.log.onRendered(function() { Template.log.resized = function() { createChart(); - return Session.get('resize'); } diff --git a/app/client/startup.js b/app/client/startup.js index 5f426d2..f677c12 100644 --- a/app/client/startup.js +++ b/app/client/startup.js @@ -1,5 +1,7 @@ Tracker.autorun(function() { var id = Session.get('controller_id'); + Session.set("orientation", new Date()); + Session.set("resize", new Date()); if (id) { Meteor.subscribe("sensor_data", id); Meteor.subscribe("controller_state", id); @@ -9,6 +11,6 @@ Tracker.autorun(function() { Session.set("orientation", new Date()); }); window.addEventListener('resize', function(){ - Session.set("resized", new Date()); + Session.set("resize", new Date()); }); }); diff --git a/app/client/tabs.js b/app/client/tabs.js index d8751d0..012a51f 100644 --- a/app/client/tabs.js +++ b/app/client/tabs.js @@ -34,7 +34,7 @@ function saveParamsAndGo(where) { Template.tabs.events({ 'click .start': function() { - saveParamsAndGo('/'); + saveParamsAndGo('/water'); }, 'click .weather': function() { saveParamsAndGo('/weather'); diff --git a/app/router.js b/app/router.js index 038c676..9b892f8 100644 --- a/app/router.js +++ b/app/router.js @@ -19,6 +19,7 @@ function safeRoute(route) { } Router.route('/', safeRoute('alarm')); +Router.route('/water', safeRoute('start')); Router.route('/alarm', safeRoute('alarm')); Router.route('/log', safeRoute('log')); Router.route('/surveillance', safeRoute('surveillance'));