From ea413de3671c036d633b16bb25fd3d391f65d072 Mon Sep 17 00:00:00 2001 From: Caio SBA Date: Mon, 28 Sep 2015 13:33:54 -0300 Subject: [PATCH] Revert "Ticket #126: Profile page with badges, part 1" --- www/html/_profile.html | 15 +-------------- www/js/controllers.js | 71 ----------------------------------------------------------------------- 2 files changed, 1 insertion(+), 85 deletions(-) diff --git a/www/html/_profile.html b/www/html/_profile.html index d6edadf..8887861 100644 --- a/www/html/_profile.html +++ b/www/html/_profile.html @@ -5,20 +5,6 @@ Voltar -

Nível {{profile.level}} Você possui {{profile.points}} pontos

-
{{profile.gamification_plugin_level_percent}} %
- -

Suas Medalhas

-
- - - -

{{ badge.level }}

-

{{ badge.title }}

-

{{ badge.description }}

-
-
-

Nome

{{profile.name}}

@@ -38,5 +24,6 @@

{{profile.etnia | etniaFilter}}

Não Sou Transgênero

+ diff --git a/www/js/controllers.js b/www/js/controllers.js index a948fdd..d5a64d8 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -1305,76 +1305,6 @@ angular.module('confjuvapp.controllers', []) }); }; - /****************************************************************************** - B A D G E S - ******************************************************************************/ - -// $scope.showFollowedProposals = function() { -// $scope.cardsBackup = []; -// $scope.showBackupProposalsLink = false; -// -// $scope.cards = $scope.following.slice(); -// } -// -// $scope.loadFollowedProposals = function() { -// $scope.loading = true; -// var config = { -// headers: { -// 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', -// }, -// timeout: 10000 -// }; -// -// $http.get(ConfJuvAppUtils.pathTo('/articles/followed_by_me?fields=title,image,body,abstract,id,tag_list,categories,created_by&private_token=' + $scope.token + '&_=' + new Date().getTime()), config) -// .then(function(resp) { -// $scope.following = []; -// $scope.followingIds = []; -// var followed = resp.data.articles; -// for (var i = 0; i < followed.length; i++) { -// var p = followed[i]; -// $scope.following.push(p); -// $scope.followingIds.push(p.id); -// } -// $scope.loading = false; -// }, function(err) { -// $scope.loading = false; -// $ionicPopup.alert({ title: 'Propostas seguidas', template: 'Erro ao carregar propostas seguidas' }); -// }); -// }; - - // Load Badges - $scope.loadMyBadges = function() { - $scope.loading = true; - - var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(); - var path = 'gamification_plugin/my/badges' + params; - - $http.get(ConfJuvAppUtils.pathTo(path)) - .then(function(resp) { - var data = resp.data['badges']; - var badges =[]; - var badge_type_loaded = {}; - for (var i = 0; i < data.length; i++) { - if(badge_type_loaded[data[i]['name']]){ - for (var j = 0; j < badges.length; j++) { - if(badges[j]['name'] == data[i]['name']){ - badges[j] = data[i]; - break; - } - } - }else{ - badge_type_loaded[data[i]['name']] = true; - badges.push(data[i]); - } - } - $scope.profile['badges'] = badges; -console.log($scope.profile); - $scope.loading = false; - }, function(err) { - var popup = $ionicPopup.alert({ title: 'Meus Badges', template: 'Não foi possível carregar os badges.' }); - $scope.loading = false; - }); - }; /****************************************************************************** P R O F I L E @@ -1393,7 +1323,6 @@ console.log($scope.profile); .then(function(resp) { $scope.profile = resp.data.user.person; $scope.loginCallback(ConfJuvAppUtils.getPrivateToken()); - $scope.loadMyBadges(); $scope.setStateAndCityOfProfile(); $scope.loading = false; }, function(err) { -- libgit2 0.21.2