Merge pull request #188 from sunil07t/develop

Fixed Leaderboard issue and Heatmap tab padding
e-mission · Dec 1, 2016 · 1ca2289 · 1ca2289
2 parents a75d4fe + 3e75b1d
commit 1ca2289
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/www/js/goals.js b/www/js/goals.js
@@ -521,7 +521,6 @@ angular.module('emission.main.goals',['emission.services', 'emission.plugin.logg
             $scope.topThreeUsers.push(threeUsers[0]);
             $scope.topThreeUsers.push(threeUsers[2]);
             $scope.usersUnderTopThree = users.slice(3);
-            console.log($scope.topThreeUsers);
             getPartyForAllUsers(users);
             setRank(partyList);
         }, function(error){
@@ -571,7 +570,7 @@ angular.module('emission.main.goals',['emission.services', 'emission.plugin.logg
         partyList.forEach(function(party){
             var totalLvl = 0;
             var totalExp = 0;
-            var memberCount = 0; //Can't use member count of the partyObj because of invisible member count bug
+            var memberCount = 0; //Can't use member count of the partyObj, when a member is deleted from DB there is an invisible member count
             party.members.forEach(function(member) {
                 totalLvl += member.stats.lvl;
                 totalExp += member.stats.exp;
@@ -581,8 +580,8 @@ angular.module('emission.main.goals',['emission.services', 'emission.plugin.logg
             party.stats.exp = totalExp;
             party.memberCount = memberCount;
             if(party._id === $scope.profile.party._id){
-                $scope.userParty = addRank(party.members);
-                console.log($scope.userParty);
+                var dupMember = angular.copy(party.members);
+                $scope.userParty = addRank(dupMember);
             }
         });
         partyList = partyList.filter(function(obj){
@@ -591,7 +590,6 @@ angular.module('emission.main.goals',['emission.services', 'emission.plugin.logg
         sortForLeaderboard(partyList);
         partyList = addRank(partyList);
         $scope.partys = partyList;
-        console.log(partyList);
     };
 
     var getChallenges = function() {

diff --git a/www/templates/main-heatmap.html b/www/templates/main-heatmap.html
@@ -5,7 +5,7 @@
       <button class="button button-icon ion-help" ng-click="startWalkthrough()"></button>
   </ion-nav-buttons>
   <ion-content class="has-header padding" scroll="false">
-    <div style="height: 40px; width: 100%; padding: 10px;"> <!-- visualization control -->
+    <div style="height: 40px; width: 100%;"> <!-- visualization control -->
       <div class="metric-half">
         <div ng-class="countButtonClass()" ng-click="showCounts()">Counts</div>
         <div ng-class="stressButtonClass()" ng-click="showStress()">Stress</div>