Merge pull request #510 from appirio-tech/feature/quick-fixes-after-ga-release

Fixed p0

@parthshah @tladendo  fyi

Author: vikasrohit

app/my-dashboard/my-challenges/my-challenges.controller.js

@@ -39,7 +39,6 @@
         ChallengeService.getUserMarathonMatches(handle, marathonMatchParams),
         ChallengeService.getUserChallenges(handle, challengeParams)
       ]).then(function(challenges){
-        console.log('challenges: ', challenges);
         var marathonMatches = challenges[0];
         var devDesignChallenges = challenges[1];
 

app/my-dashboard/subtrack-stats/subtrack-stats.controller.js

@@ -20,6 +20,9 @@
         var subtrackRanks = UserStatsService.compileSubtracks(trackRanks);
 
         UserStatsService.processStats(subtrackRanks);
+        // filter stats based on processing done above
+        // filtering is a separate step to allow multiple pre-processings and filter out in single call
+        subtrackRanks = UserStatsService.filterStats(subtrackRanks);
         // sort subtrack ranks
         subtrackRanks = $filter('orderBy')(subtrackRanks, 'mostRecentEventDate', true);
 

app/profile/about/about.jade

@@ -48,7 +48,7 @@
 
           .track(
             ng-repeat="track in profileVm.profile.tracks",
-            ng-if="profileVm.categories[track].length > 0",
+            ng-if="profileVm.categories[track].showTrack",
             id="{{track}}_TRACK"
           )
 
@@ -63,6 +63,7 @@
               ng-repeat="subtrack in profileVm.categories[track] | orderBy:'mostRecentEventDate':true",
               ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
               class="{{$index == 0 && 'first'}}"
+              ng-if="subtrack.showStats"
             )
               .name {{subtrack.subTrack | track}}
 
@@ -77,7 +78,7 @@
 
                 .tag Ranking
 
-              .ranking(ng-if="subtrack.wins !== null && subtrack.rank === null && !subtrack.rating")
+              .ranking(ng-if="subtrack.statType === 'Wins'")
                 .number(style="color: #21B2F1") {{subtrack.wins}}
 
                 .tag Wins

app/profile/profile.controller.js

@@ -4,11 +4,11 @@
   angular.module('tc.profile').controller('ProfileCtrl', ProfileCtrl);
 
   ProfileCtrl.$inject = ['CONSTANTS', '$log', '$q',
-    'TcAuthService', 'UserService', 'ProfileService', 'ChallengeService', 'ExternalAccountService',
+    'TcAuthService', 'UserService', 'UserStatsService', 'ProfileService', 'ChallengeService', 'ExternalAccountService',
     'userHandle', 'profile', 'ngDialog', '$anchorScroll'
   ];
 
-  function ProfileCtrl(CONSTANTS, $log, $q, TcAuthService, UserService, ProfileService, ChallengeService, ExternalAccountService, userHandle, profile, ngDialog, $anchorScroll) {
+  function ProfileCtrl(CONSTANTS, $log, $q, TcAuthService, UserService, UserStatsService, ProfileService, ChallengeService, ExternalAccountService, userHandle, profile, ngDialog, $anchorScroll) {
     var vm = this;
     // set profile to the object that was resolved
     vm.profile = profile;
@@ -45,6 +45,19 @@
         vm.numProjects = vm.stats.challenges;
         vm.numWins = vm.stats.wins;
         vm.categories = ProfileService.getRanks(vm.stats);
+        for(var trackName in vm.categories) {
+          // trackStats is an array of subtrack rankings along with track stats properties (e.g showTrack)
+          var trackStats = vm.categories[trackName];
+          trackStats.showTrack = false;
+          if (trackStats && trackStats.length > 0) {
+            trackStats.forEach(function(subTrackRank) {
+              UserStatsService.processStatRank(subTrackRank);
+              if (subTrackRank.showStats) {
+                trackStats.showTrack = true;
+              }
+            });
+          }
+        }
       } else {
         vm.stats = false;
         // vm.profile.tracks = [];

app/services/profile.service.js

@@ -123,6 +123,7 @@
             'rank': false,
             'challenges': subTrack.challenges,
             'wins': subTrack.wins,
+            'submissions': (subTrack.submissions) || 0,
             'mostRecentEventDate': new Date(subTrack.mostRecentEventDate)
           };
         });

app/services/userStats.service.js

@@ -14,7 +14,9 @@
     var service = {
       getIterableStats: getIterableStats,
       processStats: processStats,
-      compileSubtracks: compileSubtracks
+      compileSubtracks: compileSubtracks,
+      filterStats: filterStats,
+      processStatRank: processStatRank
     };
 
     var percentageFunc = function(n) { return $filter('percentage')(n);};
@@ -111,27 +113,50 @@
       }, []);
     }
 
-    function processStats(ranks) {
-      angular.forEach(ranks, function(rank) {
-        if (rank.track === 'DESIGN') {
+    function processStatRank(rank) {
+      rank.showStats = true;
+      if (rank.track === 'DESIGN') {
+        rank.stat = rank.wins;
+        rank.statType = 'Wins';
+        // for non rated tracks, use submissions to filter out empty values
+        if(!rank.submissions) {
+          rank.showStats = false;
+        }
+      } else if (rank.track === 'COPILOT') {
+        rank.stat = rank.activeContests;
+        rank.statType = 'Challenges';
+      } else if (rank.track === 'DEVELOP') {
+        if (['CODE', 'FIRST_2_FINISH'].indexOf(rank.subTrack) != -1) {
           rank.stat = rank.wins;
           rank.statType = 'Wins';
-        } else if (rank.track === 'COPILOT') {
-          rank.stat = rank.activeContests;
-          rank.statType = 'Challenges';
-        } else if (rank.track === 'DEVELOP') {
-          if (['CODE', 'FIRST_2_FINISH'].indexOf(rank.subTrack) != -1) {
-            rank.stat = rank.wins;
-            rank.statType = 'Wins';
-          } else {
-            rank.stat = rank.rating;
-            rank.statType = 'Rating';
+          // for non rated tracks, use submissions to filter out empty values
+          if(!rank.submissions) {
+            rank.showStats = false;
           }
         } else {
           rank.stat = rank.rating;
           rank.statType = 'Rating';
         }
+      } else {
+        rank.stat = rank.rating;
+        rank.statType = 'Rating';
+      }
+    }
+
+    function processStats(ranks) {
+      angular.forEach(ranks, function(rank) {
+        processStatRank(rank);
+      });
+    }
+
+    function filterStats(ranks) {
+      var filtered = [];
+      angular.forEach(ranks, function(rank) {
+        if (rank.showStats) {
+          filtered.push(rank);
+        }
       });
+      return filtered;
     }