Download as
Browse Code »

Commit 5072ad72b106640198087ddd8b054032ae6a87b0

Authored by Adabriand Furtado
1 parent 7a6c1af9
Exists in master

Add uploaded signs ranking

Showing 2 changed files with 13 additions and 5 deletions   Show diff stats
assets/js/ranking/ranking.service.js
  Diff comments   View file @5072ad7
... ... @@ -4,6 +4,7 @@
4 4 angular.module('wikilibras.ranking').service("rankingService", ['$http', '$q', function ($http, $q) {
5 5 var PROJECT_CONF_URL = 'conf/app-conf.json';
6 6 var RANKING_ENDPOINT = '/api/leaderboard?limit=20';
  7 + var UPLOADED_SIGNS_RANKING_ENDPOINT = '/countuservideos?limit=20';
7 8 var NUMBER_OF_COLUMNS = 2;
8 9  
9 10 function splitToChunks(array, chunk) {
... ... @@ -20,7 +21,14 @@
20 21 getRankingData: function() {
21 22 return $http.get(PROJECT_CONF_URL).then(function(response) {
22 23 var baseApiUrl = response.data.pybossa_url;
23   - return $http.get(baseApiUrl + RANKING_ENDPOINT).then(function(response) {
  24 + var baseDBApiUrl = response.data.db_api_url;
  25 +
  26 + return $q.all([$http.get(baseApiUrl + RANKING_ENDPOINT), $http.get(baseDBApiUrl + UPLOADED_SIGNS_RANKING_ENDPOINT)]).then(function(response) {
  27 + if (typeof response[0] === 'undefined' ||
  28 + typeof response[1] === 'undefined') return;
  29 + response[0].data['uploaded_signs'] = response[1].data;
  30 + response = response[0];
  31 +
24 32 angular.forEach(response.data, function(obj, key) {
25 33 response.data[key] = splitToChunks(obj, NUMBER_OF_COLUMNS);
26 34 });
... ...
assets/templates/sections.html
  Diff comments   View file @5072ad7
... ... @@ -368,8 +368,8 @@
368 368 </div>
369 369 </div>
370 370 <div ng-show="activeTab === 3" class="wl-ranking-container">
371   - <div class="row">
372   - <div class="col-xs-6" ng-repeat="i in [0,1,2,3,4,5,6,7,8,9]">
  371 + <div class="row" ng-repeat="row in rankingData.uploaded_signs">
  372 + <div class="col-xs-6" ng-repeat="user in row" ng-if="user.username">
373 373 <div class="wl-rank">
374 374 <div class="row">
375 375 <div class="col-xs-4">
... ... @@ -377,11 +377,11 @@
377 377 <img ng-if="[0,1,2].indexOf($index) !== -1" ng-src="assets/img/{{$index === 0? 'gold':($index === 1? 'silver': 'bronze')}}-star-icon.png" alt="Estrela de {{$index === 0? 'ouro':($index === 1? 'prata': 'bronze')}}">
378 378 </div>
379 379 <div class="position-wrapper">
380   - {{ $index+1 }}.
  380 + {{ $index + 1 }}.
381 381 </div>
382 382 </div>
383 383 <div class="col-xs-8 wl-ranked-volunteer">
384   - {{ 'Teste ' + (i + 1) }}
  384 + {{ user.username }}
385 385 </div>
386 386 </div>
387 387 </div>
... ...