Commit 5072ad72b106640198087ddd8b054032ae6a87b0

Authored by Adabriand Furtado
1 parent 7a6c1af9
Exists in master

Add uploaded signs ranking

assets/js/ranking/ranking.service.js
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 angular.module('wikilibras.ranking').service("rankingService", ['$http', '$q', function ($http, $q) { 4 angular.module('wikilibras.ranking').service("rankingService", ['$http', '$q', function ($http, $q) {
5 var PROJECT_CONF_URL = 'conf/app-conf.json'; 5 var PROJECT_CONF_URL = 'conf/app-conf.json';
6 var RANKING_ENDPOINT = '/api/leaderboard?limit=20'; 6 var RANKING_ENDPOINT = '/api/leaderboard?limit=20';
  7 + var UPLOADED_SIGNS_RANKING_ENDPOINT = '/countuservideos?limit=20';
7 var NUMBER_OF_COLUMNS = 2; 8 var NUMBER_OF_COLUMNS = 2;
8 9
9 function splitToChunks(array, chunk) { 10 function splitToChunks(array, chunk) {
@@ -20,7 +21,14 @@ @@ -20,7 +21,14 @@
20 getRankingData: function() { 21 getRankingData: function() {
21 return $http.get(PROJECT_CONF_URL).then(function(response) { 22 return $http.get(PROJECT_CONF_URL).then(function(response) {
22 var baseApiUrl = response.data.pybossa_url; 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 angular.forEach(response.data, function(obj, key) { 32 angular.forEach(response.data, function(obj, key) {
25 response.data[key] = splitToChunks(obj, NUMBER_OF_COLUMNS); 33 response.data[key] = splitToChunks(obj, NUMBER_OF_COLUMNS);
26 }); 34 });
assets/templates/sections.html
@@ -368,8 +368,8 @@ @@ -368,8 +368,8 @@
368 </div> 368 </div>
369 </div> 369 </div>
370 <div ng-show="activeTab === 3" class="wl-ranking-container"> 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 <div class="wl-rank"> 373 <div class="wl-rank">
374 <div class="row"> 374 <div class="row">
375 <div class="col-xs-4"> 375 <div class="col-xs-4">
@@ -377,11 +377,11 @@ @@ -377,11 +377,11 @@
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')}}"> 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 </div> 378 </div>
379 <div class="position-wrapper"> 379 <div class="position-wrapper">
380 - {{ $index+1 }}. 380 + {{ $index + 1 }}.
381 </div> 381 </div>
382 </div> 382 </div>
383 <div class="col-xs-8 wl-ranked-volunteer"> 383 <div class="col-xs-8 wl-ranked-volunteer">
384 - {{ 'Teste ' + (i + 1) }} 384 + {{ user.username }}
385 </div> 385 </div>
386 </div> 386 </div>
387 </div> 387 </div>