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
Prev Previous commit
Next Next commit
Added code to display SRM badge on dashboard
  • Loading branch information
sushilshinde committed Sep 26, 2017
commit 67ac9b8386e4e06eb085161fa216458aacf0ad53
35 changes: 9 additions & 26 deletions app/directives/page-state-header/page-state-header.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import _ from 'lodash'
vm.previousStateName = null
vm.previousStateLabel = null
vm.previousState = null
vm.dashboardBadgeName = null


// identifies the previous state
if ($scope.$root.previousState && $scope.$root.previousState.name.length > 0) {
Expand All @@ -65,11 +67,10 @@ import _ from 'lodash'

// 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]

var dashboardAchievement = _filterDashboardAchievement(resp.Achievements || [])[0]
if (dashboardAchievement) {
//Get dashboard badges
vm.dashboardBadge = BadgeService.getAchievementVm(dashboardAchievement)
}
})
Expand Down Expand Up @@ -119,34 +120,16 @@ import _ from 'lodash'
})
.catch(function(err) {
$scope.hideMoney = true

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]
}]
}

function _filterDashboardAchievement(achievements) {
//Currently only one batch is shown on the dashboard
vm.dashboardBadgeName = 'SRM Engagement Honor'

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

Expand Down
4 changes: 2 additions & 2 deletions app/directives/page-state-header/page-state-header.jade
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
p.number(ng-bind="vm.moneyEarned | currency:'$':0")
.title
p Won in Prizes
.item(ng-if="vm.dashboardBadge")
.badge(ng-class="(vm.dashboardBadge.specificClass || vm.dashboardBadge.groupClass) + ' ' + (vm.dashboardBadge.type) + 'Badge'")
.badgeItem(ng-if="vm.dashboardBadge")
.badge(ng-class="(vm.dashboardBadge.specificClass || vm.dashboardBadge.groupClass) + ' ' + (vm.dashboardBadge.type) + 'Badge'" title='{{vm.dashboardBadgeName}}')
11 changes: 10 additions & 1 deletion app/profile/badges/badges.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@ import angular from 'angular'

var achievementsVm = BadgeService.buildAllAchievementsVm($scope.achievements)
badgeCtrl.achievementGroups = achievementsVm.achievementGroups
badgeCtrl.singleAchievements = achievementsVm.singleAchievements

//Dashboard badges shoudn't be displyed on public profile page
badgeCtrl.singleAchievements = removeDashBoardAchivements(achievementsVm.singleAchievements)
}

function removeDashBoardAchivements(singleAchievements){
var dashboardBadgeName = 'SRM Engagement Honor'
return singleAchievements.filter(function(achievement){
return (achievement.name != dashboardBadgeName)
})
}

})()
6 changes: 6 additions & 0 deletions app/services/badge.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,12 @@ import moment from 'moment-timezone'
name: 'iOS Community',
groupClass: 'iOS-Community',
active: false
},
{
id: 1010,
name: 'SRM Engagement Honor',
groupClass: 'SRM-Engagement-Honor-Badge',
active: false
}
]
}
Expand Down
4 changes: 4 additions & 0 deletions assets/css/directives/badge-tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -678,3 +678,7 @@ span.subBadge.selected {
background: url(https://github.com/images/tt-arrow.png) no-repeat;
background-position: 0 0;
}

.SRM-Engagement-Honor-Badge {
background-position: -146px -671px;
}
20 changes: 20 additions & 0 deletions assets/css/directives/page-state-header.directive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@

}

.badgeItem {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-end;

position: relative;
margin-left: 40px;
margin-right: 20px;


font-family: 'Sofia Pro', Arial, Helvetica, sans-serif;
font-weight: 400;

.value {
font-size: 24px;
margin-bottom: 15px;
}
}

}
}
}
Expand Down
Binary file modified assets/images/badge.grid.large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.