From 23679ac06ff8ee95365a62bfccefac53a5d89bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juuso=20K=C3=A4enm=C3=A4ki?= Date: Thu, 15 Sep 2016 20:56:49 +0300 Subject: [PATCH] Fixes for hsl timetable. --- infoscreen/static/html/hsl.html | 2 +- infoscreen/static/js/infoscreen_controllers.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/infoscreen/static/html/hsl.html b/infoscreen/static/html/hsl.html index e7a0b78..69aa920 100644 --- a/infoscreen/static/html/hsl.html +++ b/infoscreen/static/html/hsl.html @@ -17,7 +17,7 @@ - + {{x.time}} diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js index c2b6826..704488b 100644 --- a/infoscreen/static/js/infoscreen_controllers.js +++ b/infoscreen/static/js/infoscreen_controllers.js @@ -40,7 +40,7 @@ app.controller('ABBController', function($scope, $http){ app.controller('timetableCtrl', function($scope, $http, $interval) { function load(){ - $http.get('../js/hsl.json') + $http.get('/static/js/hsl.json') .then(function(data, status, headers, config) { $scope.arr=[]; parse(data); @@ -111,7 +111,6 @@ app.controller('timetableCtrl', d.setFullYear(date.substring(0,4),date.substring(4,6)-1,date.substring(6,8)); d.setHours(time[0]); d.setMinutes(time[1]); - console.log(d); if(d < f){ $scope.arr.splice(a,1); }