TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for hsl timetable.

Browse Source
This commit is contained in:
Juuso Käenmäki
2016-09-15 20:56:49 +03:00
parent 88f50b161b
commit 23679ac06f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infoscreen/static/html/hsl.html
+1 -1
View File
@@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="x in arr | orderBy: ['date','time']"> <tr ng-repeat="x in arr | orderBy: ['date','time'] | limitTo: 15">
<td> <td>
{{x.time}} {{x.time}}
</td> </td>
infoscreen/static/js/infoscreen_controllers.js
+1 -2
View File
@@ -40,7 +40,7 @@ app.controller('ABBController', function($scope, $http){
app.controller('timetableCtrl', app.controller('timetableCtrl',
function($scope, $http, $interval) { function($scope, $http, $interval) {
function load(){ function load(){
$http.get('../js/hsl.json') $http.get('/static/js/hsl.json')
.then(function(data, status, headers, config) { .then(function(data, status, headers, config) {
$scope.arr=[]; $scope.arr=[];
parse(data); 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.setFullYear(date.substring(0,4),date.substring(4,6)-1,date.substring(6,8));
d.setHours(time[0]); d.setHours(time[0]);
d.setMinutes(time[1]); d.setMinutes(time[1]);
console.log(d);
if(d < f){ if(d < f){
$scope.arr.splice(a,1); $scope.arr.splice(a,1);
} }