Merge pull request #1234 from appirio-tech/dev

badge updates

Author: ajefts

app/directives/page-state-header/page-state-header.directive.js

@@ -64,17 +64,10 @@ import _ from 'lodash'
       // gets member's profile
       ProfileService.getUserProfile(vm.handle).then(function(profile) {
         vm.profile = profile
-
         // get members dashboard badge
         UserService.getV2UserProfile(vm.handle).then(function(resp) {
-
-          var dashboardAchievement = _filterDashboardAchievement(resp.Achievements || [])[0]
-          if (dashboardAchievement) {
-            //Get dashboard badges
-            vm.dashboardBadge = BadgeService.getAchievementVm(dashboardAchievement)
-          }
+          vm.dashboardAchievement = _filterDashboardAchievement(resp.Achievements || [])[0]
         })
-
       })
 
       // get member's challenges to display number of active challenges
@@ -84,8 +77,9 @@ import _ from 'lodash'
       ]).then(function(challenges){
         var marathonMatches = challenges[0]
         var devDesignChallenges = challenges[1]
-
+        
         vm.activeChallenges = marathonMatches.length + devDesignChallenges.length
+
       })
 
       displayMoneyEarned(vm.handle)
@@ -132,6 +126,5 @@ import _ from 'lodash'
         return (achievement.description === vm.dashboardBadgeName)
       })
     }
-
   }
 })()

app/directives/page-state-header/page-state-header.jade

@@ -16,5 +16,6 @@
           p.number(ng-bind="vm.moneyEarned | currency:'$':0")
         .title
           p Won in Prizes
-      .badgeItem(ng-if="vm.dashboardBadge")
-        .badge(ng-class="(vm.dashboardBadge.specificClass || vm.dashboardBadge.groupClass) + ' ' + (vm.dashboardBadge.type) + 'Badge'" title='{{vm.dashboardBadgeName}}')
+      .badgeItem(ng-if="vm.dashboardAchievement")
+        .dashboardBadge(title='{{vm.dashboardBadgeName}}')
+        

app/services/badge.service.js

@@ -648,17 +648,8 @@ 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
         }
       ]
     }
-
   }
-
-
 })()

assets/css/directives/badge-tooltip.scss

@@ -679,6 +679,9 @@ span.subBadge.selected {
   background-position: 0 0;
 }
 
-.SRM-Engagement-Honor-Badge {
-    background-position: -146px -671px;
-}
+.dashboardBadge {
+    background: url(../../images/badge05-70x70.png) no-repeat;
+    width: 70px;
+    height: 70px;
+}
+

assets/css/directives/page-state-header.directive.scss

@@ -29,7 +29,7 @@
         flex-direction: column;
         justify-content: space-between;
         align-items: flex-end;
-
+        height: 39px;
         position: relative;
         margin-left: 40px;
         margin-right: 20px;