public interface: rework
This commit is contained in:
parent
4bce3aa1c1
commit
14277e525f
3 changed files with 377 additions and 157 deletions
|
@ -60,29 +60,81 @@ angular.module("FICApp")
|
|||
}
|
||||
updTime();
|
||||
})
|
||||
.controller("DataController", function($scope, $http, $rootScope, $timeout) {
|
||||
$rootScope.refresh = function() {
|
||||
$timeout.cancel($scope.cbd);
|
||||
$scope.cbd = $timeout($rootScope.refresh, 4200);
|
||||
$http.get("/demo.json").success(function(demo) {
|
||||
$scope.my = demo;
|
||||
});
|
||||
$http.get("/events.json").success(function(evts) {
|
||||
var events = {};
|
||||
.controller("EventsController", function($scope, $http, $interval) {
|
||||
$scope.events = [];
|
||||
var refreshEvents = function() {
|
||||
$http.get("/events.json").then(function(response) {
|
||||
if ($scope.lasteventsetag != undefined && $scope.lasteventsetag == response.headers().etag)
|
||||
return;
|
||||
$scope.lasteventsetag = response.headers().etag;
|
||||
|
||||
var events = response.data;
|
||||
var now = new Date();
|
||||
angular.forEach(evts, function(event, key) {
|
||||
events["e" + event.id] = event;
|
||||
event.since = now.getTime() - now.getTimezoneOffset() * 60000 - Date.parse(event.time);
|
||||
var key = 0;
|
||||
angular.forEach($scope.events, function(event) {
|
||||
event.keep = 0;
|
||||
});
|
||||
angular.forEach(events, function(event) {
|
||||
event.time = Date.parse(event.time);
|
||||
//event.since = now.getTime() - now.getTimezoneOffset() * 60000 - event.time;
|
||||
event.since = now.getTime() - event.time;
|
||||
event.keep = 1;
|
||||
while (key <= $scope.events.length) {
|
||||
if (key >= $scope.events.length) {
|
||||
$scope.events.push(event);
|
||||
break;
|
||||
} else if (event.id == $scope.events[key].id) {
|
||||
$scope.events[key].txt = event.txt;
|
||||
$scope.events[key].time = event.time;
|
||||
$scope.events[key].kind = event.kind;
|
||||
$scope.events[key].since = event.since;
|
||||
$scope.events[key].keep = 1;
|
||||
break;
|
||||
} else if (event.time > $scope.events[key].time) {
|
||||
$scope.events.unshift(event);
|
||||
break;
|
||||
} else {
|
||||
key += 1;
|
||||
}
|
||||
}
|
||||
});
|
||||
angular.forEach($scope.events, function(event, i) {
|
||||
if (event.keep == 0) {
|
||||
$scope.events.splice(i, 1);
|
||||
}
|
||||
});
|
||||
$scope.events = events;
|
||||
});
|
||||
$http.get("/public.json").success(function(scene) {
|
||||
$scope.scene = scene;
|
||||
}
|
||||
refreshEvents()
|
||||
$interval(refreshEvents, 2100);
|
||||
})
|
||||
.controller("DataController", function($scope, $http, $rootScope, $interval) {
|
||||
var refreshScene = function() {
|
||||
$http.get("/public.json").then(function(response) {
|
||||
if ($scope.lastpublicetag == response.headers().etag)
|
||||
return;
|
||||
$scope.lastpublicetag = response.headers().etag;
|
||||
|
||||
$scope.scene = response.data;
|
||||
});
|
||||
}
|
||||
var refreshData = function() {
|
||||
$http.get("/my.json").then(function(response) {
|
||||
if ($scope.lastmyetag == response.headers().etag)
|
||||
return;
|
||||
$scope.lastmyetag = response.headers().etag;
|
||||
|
||||
$scope.my = response.data;
|
||||
});
|
||||
$http.get("/stats.json").success(function(stats) {
|
||||
$scope.stats = stats;
|
||||
});
|
||||
$http.get("/themes.json").success(function(themes) {
|
||||
$http.get("/themes.json").then(function(response) {
|
||||
if ($scope.lastthemeetag == response.headers().etag)
|
||||
return;
|
||||
$scope.lastthemeetag = response.headers().etag;
|
||||
|
||||
var themes = response.data;
|
||||
$scope.themes = themes;
|
||||
$scope.max_gain = 0;
|
||||
angular.forEach(themes, function(theme, key) {
|
||||
|
@ -94,7 +146,13 @@ angular.module("FICApp")
|
|||
$scope.max_gain += theme.gain;
|
||||
}, themes);
|
||||
});
|
||||
$http.get("/teams.json").success(function(teams) {
|
||||
$http.get("/teams.json").then(function(response) {
|
||||
if ($scope.lastteametag == response.headers().etag)
|
||||
return;
|
||||
$scope.lastteametag = response.headers().etag;
|
||||
|
||||
var teams = response.data;
|
||||
|
||||
$scope.teams_count = Object.keys(teams).length
|
||||
$scope.teams = teams;
|
||||
|
||||
|
@ -106,7 +164,15 @@ angular.module("FICApp")
|
|||
}
|
||||
}, $scope.rank);
|
||||
});
|
||||
console.log("refresh!");
|
||||
}
|
||||
$rootScope.refresh();
|
||||
refreshData();
|
||||
refreshScene();
|
||||
$interval(refreshData, 4200);
|
||||
$interval(refreshScene, 900);
|
||||
})
|
||||
.controller("TeamController", function($scope, $http, $interval) {
|
||||
$scope.mystats = null;
|
||||
$http.get("/api/teams/" + $scope.team.id + "/stats.json").success(function(mstats) {
|
||||
$scope.mystats = mstats;
|
||||
});
|
||||
});
|
||||
|
|
Reference in a new issue