Skip to content

Commit

Permalink
#93 added data handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@kev007
kev007 committed May 28, 2016
1 parent 7b6185a commit 090c4b4
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 70 deletions.
1 change: 1 addition & 0 deletions rest_service/src/main/resources/static/index.html
View file
Expand Up @@ -74,6 +74,7 @@
<script src="scripts/controllers/controller.main.js"></script>
<script src="scripts/controllers/controller.map.js"></script>
<script src="scripts/controllers/controller.analytics.js"></script>
<script src="scripts/controllers/controller.rankings.js"></script>
<script src="scripts/controllers/controller.list.js"></script>
<script src="scripts/controllers/controller.about.js"></script>
<script src="scripts/services/service.navigation.js"></script>
Expand Down
7 changes: 7 additions & 0 deletions rest_service/src/main/resources/static/scripts/app.js
View file
Expand Up @@ -55,6 +55,13 @@
align: 'left',
glyphicon: 'glyphicon glyphicon-stats'
})
.when('/rankings', {
templateUrl: 'views/rankingsView.html',
controller: 'RankingsCtrl',
name: 'Rankings',
align: 'left',
glyphicon: 'glyphicon glyphicon-stats'
})
.when('/about', {
templateUrl: 'views/aboutView.html',
controller: 'AboutCtrl',
Expand Down
42 changes: 42 additions & 0 deletions rest_service/src/main/resources/static/scripts/controllers/controller.rankings.js
View file
@@ -0,0 +1,42 @@
/**
* The controller for the analytics view.
*/
(function () {
'use strict';

angular
.module('ostMapApp')
.controller('RankingsCtrl', RankingsCtrl);

/**
* Inject all dependencies for the controller
* $scope to interact with the view
* @type {string[]}
*/
RankingsCtrl.$inject = [
'$scope',
'httpService',
];

/**
* The controller logic
*
* @param $scope
* @constructor
*/
function RankingsCtrl($scope, httpService) {
// httpService.getHighScoreFromServer();
// $scope.data.highScore = httpService.getHighScore();
$scope.data = []
$scope.data.highScore = {"area":[{"user":"Zorne","area":6174893.727618582,"coordinates":[[-0.2147884,-0.4614716],[27.2147884,38.4614716],[49,26.546974]]},{"user":"Falk","area":2465661.8600413124,"coordinates":[[0,0],[10,10],[10,20],[20,0]]},{"user":"Oliver","area":54980.275141825,"coordinates":[[-2.2147884,52.4614716],[-4.2147884,54.4614716],[-5.2147884,55.4614716],[-8.2147884,53.4614716]]}],"path":[{"user":"Zorne","distance":7589.900654023497,"coordinates":[[49,26.546974],[27.2147884,38.4614716],[-0.2147884,-0.4614716]]},{"user":"Falk","distance":5818.530021620169,"coordinates":[[0,0],[20,0],[10,20],[10,10],[10,10],[10,10],[10,10]]},{"user":"Peter","distance":4925.676750216901,"coordinates":[[-3.2147884,53.4614716],[47.2147884,28.4614716]]},{"user":"Oliver","distance":1062.1904270002783,"coordinates":[[-3.2147884,53.4614716],[-4.2147884,54.4614716],[-5.2147884,55.4614716],[-2.2147884,52.4614716],[-8.2147884,53.4614716]]}]}


$scope.goToHighScoreArea = function() {
//TODO: move map to highscore, render area
}
$scope.goToHighScoreDistance = function() {
//TODO: move map to highscore, render path
}

}
})();
100 changes: 30 additions & 70 deletions rest_service/src/main/resources/static/views/analyticsView.html
View file
@@ -1,75 +1,35 @@
<br>
<div class="analyticsViewContainer" >
<!--<uib-tabset active="active">-->
<!--<uib-tab index="0" heading="Tweet Frequency">-->
<br>
<div class="btn-group ">
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="0">Now</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="60">1h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="120">2h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="240">4h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="360">6h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="720">12h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="1440">1d</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="2880">2d</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="5760">4d</label>
</div>
<div class="btn-group">
<label class="btn btn-danger btn-lg" ng-click="autoUpdate()" ng-model="autoUpdateEnabled" uib-btn-checkbox>AutoUpdate</label>
<label class="btn btn-danger btn-lg" ng-click="updateFilters()">Manual Update</label>
</div>
<br>
<br>
<br>
<div class="btn-group ">
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="0">Now</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="60">1h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="120">2h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="240">4h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="360">6h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="720">12h</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="1440">1d</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="2880">2d</label>
<label class="btn btn-success btn-lg" ng-model="timeFilter" uib-btn-radio="5760">4d</label>
</div>
<div class="btn-group">
<label class="btn btn-danger btn-lg" ng-click="autoUpdate()" ng-model="autoUpdateEnabled" uib-btn-checkbox>AutoUpdate</label>
<label class="btn btn-danger btn-lg" ng-click="updateFilters()">Manual Update</label>
</div>
<br>
<br>

<rickshaw
rickshaw-options="options"
rickshaw-features="features"
rickshaw-series="data.series">
</rickshaw>
<rickshaw
rickshaw-options="options"
rickshaw-features="features"
rickshaw-series="data.series">
</rickshaw>

<div id="chart"></div>
<code>
DEBUG<br>
<!--data.tweetFrequency: {{data.tweetFrequency}}<br>-->
autoUpdateEnabled: {{autoUpdateEnabled}}<br>
Current Filters: {{timeFilter/60}}h<br>
</code>
<!--</uib-tab>-->


<!--<uib-tab index="1" heading="Scoreboard: Area">-->
<br>
<div class="col-xs-6 col-md-4">
<div class="panel panel-default">
<!-- Table -->
<table class="table table-hover tabled-striped">
<caption>Top 10 Users: Area Covered</caption>
<tr ng-repeat="tweet in data.tweets|limitTo:10" ng-click="search.setHashtagFilter(tweet.user.screen_name)">
<td>
<p>#{{tweet.user.screen_name}}</p>
</td>
</tr>
</table>
</div>
</div>
<!--</uib-tab>-->


<!--<uib-tab index="2" heading="Scoreboard: Distance">-->
<br>
<div class="col-xs-6 col-md-4">
<div class="panel panel-default">
<!-- Table -->
<table class="table table-hover tabled-striped">
<caption>Top 10 Users: Distance Covered</caption>
<tr ng-repeat="tweet in data.tweets|limitTo:10" ng-click="search.setHashtagFilter(tweet.user.screen_name)">
<td>
<p>#{{tweet.user.screen_name}}</p>
</td>
</tr>
</table>
</div>
</div>
<!--</uib-tab>-->
<!--</uib-tabset>-->
<div id="chart"></div>
<code>
DEBUG<br>
<!--data.tweetFrequency: {{data.tweetFrequency}}<br>-->
autoUpdateEnabled: {{autoUpdateEnabled}}<br>
Current Filters: {{timeFilter/60}}h<br>
</code>
</div>
38 changes: 38 additions & 0 deletions rest_service/src/main/resources/static/views/rankingsView.html
View file
@@ -0,0 +1,38 @@
<br>
<div class="analyticsViewContainer" >
<br>
<div class="col-xs-6 col-md-4">
<div class="panel panel-default">
<!-- Table -->
<table class="table table-hover tabled-striped">
<caption>Top 10 Users: Area Covered</caption>
<tr ng-repeat="score in data.highScore.area" ng-click="goToHighScoreArea()">
<td>
<p>{{score.user}}</p>
</td>
</tr>
</table>
</div>
</div>


<br>
<div class="col-xs-6 col-md-4">
<div class="panel panel-default">
<!-- Table -->
<table class="table table-hover tabled-striped">
<caption>Top 10 Users: Distance Covered</caption>
<tr ng-repeat="score in data.highScore.path" ng-click="goToHighScoreDistance()">
<td>
<p>{{score.user}}</p>
</td>
</tr>
</table>
</div>
</div>

<code>
DEBUG<br>
High Score Data: {{highScore}}<br>
</code>
</div>

0 comments on commit 090c4b4

Please sign in to comment.