Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

badge updates and CI update #1232

Merged
merged 9 commits into from
Oct 3, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
F2F: Topcoder - Dashboard header update
Submission #518728 by ronakkaria to the challenge
http://www.topcoder.com/challenge-details/30059314/?type=develop
  • Loading branch information
birdofpreyru committed Sep 13, 2017
commit bf7d1992e9b4f2d3fe1604f1109442baacb5ad3c
68 changes: 54 additions & 14 deletions app/directives/page-state-header/page-state-header.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import _ from 'lodash'
hideMoney: '=',
defaultState: '@'
},
controller: ['CONSTANTS', '$rootScope', '$scope', 'ProfileService', 'logger', '$state', pageStateHeader],
controller: ['CONSTANTS', '$rootScope', '$scope', 'ProfileService', 'logger', '$state', 'ChallengeService', '$q', 'UserService', 'BadgeService', pageStateHeader],
controllerAs: 'vm'
}
})

function pageStateHeader(CONSTANTS, $rootScope, $scope, ProfileService, logger, $state) {
function pageStateHeader(CONSTANTS, $rootScope, $scope, ProfileService, logger, $state, ChallengeService, $q, UserService, BadgeService) {
var vm = this
vm.backHandler = backHandler

Expand All @@ -35,13 +35,10 @@ import _ from 'lodash'
function activate() {
vm.handle = $scope.handle
vm.profile = null
vm.handleColor = null
$scope.hideMoney = _.get($scope, 'hideMoney', true)
vm.previousStateName = null
vm.previousStateLabel = null
vm.previousState = null
vm.showBackLink = _.get($scope, 'showBackLink', false)
vm.loading = true

// identifies the previous state
if ($scope.$root.previousState && $scope.$root.previousState.name.length > 0) {
Expand All @@ -65,14 +62,33 @@ import _ from 'lodash'
// gets member's profile
ProfileService.getUserProfile(vm.handle).then(function(profile) {
vm.profile = profile
vm.handleColor = ProfileService.getUserHandleColor(vm.profile)

if (!$scope.hideMoney) {
displayMoneyEarned(vm.handle)
} else {
vm.loading = false
}
// get members dashboard badge
UserService.getV2UserProfile(vm.handle).then(function(resp) {
// Calling the mock to return a badge
// In actuality filtering should be done by whether the achievement contains a field 'forDashboard' or not.
var dashboardAchievement = _filterDashboardAchievement(resp.Achievements || [])[0]

if (dashboardAchievement) {
vm.dashboardBadge = BadgeService.getAchievementVm(dashboardAchievement)
}
})

})

// get member's challenges to display number of active challenges
$q.all([
ChallengeService.getUserMarathonMatches(vm.handle, { filter: 'status=active' }),
ChallengeService.getUserChallenges(vm.handle, { filter: 'status=active' })
]).then(function(challenges){
var marathonMatches = challenges[0]
var devDesignChallenges = challenges[1]

vm.activeChallenges = marathonMatches.length + devDesignChallenges.length
})

displayMoneyEarned(vm.handle)

}

function backHandler() {
Expand Down Expand Up @@ -100,15 +116,39 @@ import _ from 'lodash'
if (!vm.moneyEarned) {
$scope.hideMoney = true
}

vm.loading = false
})
.catch(function(err) {
$scope.hideMoney = true
vm.loading = false

logger.error('Could not get user financial information', err)
})
}

// Temporary function to simulate dashboard achievement
function _filterDashboardAchievement(achievements) {
// If forceBadge is true, it displays the achievement in _mock, whether the user has that achievement or not
var _forceBadge = false

// temoprary config object that maps usernames to badge name
var _mock = {
ronakkaria: 'First Win',
birdofpreyru: 'Predix Community'
}

var dashboardBadgeName = _mock[vm.handle]
if (!dashboardBadgeName) { return [] }

if (_forceBadge) {
return [{
date: new Date(),
description: _mock[vm.handle]
}]
}

return achievements.filter(function(achievement) {
return (achievement.description === dashboardBadgeName)
})
}

}
})()
27 changes: 11 additions & 16 deletions app/directives/page-state-header/page-state-header.jade
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,15 @@
div(ng-transclude)

.info
.pic
a(ui-sref="profile.about({userHandle: vm.profile.handle})")
img.profile-circle(ng-if="vm.profile.photoURL", ng-src="{{vm.profile.photoURL}}")

img.profile-circle(ng-if="!vm.profile.photoURL", src=require("../../../assets/images/ico-user-default.svg"))

.user-metrics(id="metrics", ng-hide="vm.loading")
a.handle(style="color:{{vm.handleColor}};", ui-sref="profile.about({userHandle: vm.profile.handle})") {{vm.profile.handle}}

.money-earned(ng-hide="hideMoney")
.item
.value
p(ng-bind="vm.activeChallenges")
.title
p Active Challenges
.item(ng-if="!hideMoney")
.value
p.number(ng-bind="vm.moneyEarned | currency:'$':0")

p Earned

.back-link(ng-if="showBackLink && vm.previousStateLabel")
a(ng-click="vm.backHandler()") Back to {{vm.previousStateLabel}}

.title
p Won in Prizes
.item(ng-if="vm.dashboardBadge")
.badge(ng-class="(vm.dashboardBadge.specificClass || vm.dashboardBadge.groupClass) + ' ' + (vm.dashboardBadge.type) + 'Badge'")
Loading