Merge pull request #553 from appirio-tech/feature/SUP-2575

Fixed track and subtrack ordering

Author: tladendo

app/profile/about/about.jade

@@ -47,7 +47,7 @@
             empty-state-placeholder(state-name="profile-topcoder-activity", show="!profileVm.showTCActivity", theme="offwhite")
 
           .track(
-            ng-repeat="track in profileVm.profile.tracks",
+            ng-repeat="track in profileVm.tracks",
             ng-if="profileVm.categories[track].showTrack",
             id="{{track}}_TRACK"
           )
@@ -60,7 +60,7 @@
               span {{track | track | uppercase}} ACTIVITY
 
             a.subtrack(
-              ng-repeat="subtrack in profileVm.categories[track] | orderBy:'mostRecentEventDate':true",
+              ng-repeat="subtrack in profileVm.categories[track]",
               ui-sref="profile.subtrack({track: subtrack.track, subTrack: subtrack.subTrack})",
               class="{{$index == 0 && 'first'}}"
               ng-if="subtrack.showStats"

app/profile/profile.controller.js

@@ -40,6 +40,7 @@
       if (stats) {
         vm.stats = stats;
         vm.profile.tracks = vm.profile.tracks || [];
+        vm.tracks = ProfileService.getTracks(stats) || vm.profile.tracks;
         if (stats.COPILOT && stats.COPILOT.contests && vm.profile.tracks.indexOf('COPILOT') == -1) {
           vm.profile.tracks.push('COPILOT');
         }

app/services/profile.service.js

@@ -25,6 +25,7 @@
       getHistoryStats: getHistoryStats,
       // auxiliary functions for profile
       getRanks: getRanks,
+      sortByDate: sortByDate,
       getChallengeTypeStats: getChallengeTypeStats,
       getTracks: getTracks,
       getSubTracks: getSubTracks,
@@ -149,7 +150,7 @@
           'rank': marathonStats.rank.rank,
           'rating': marathonStats.rank.rating,
           'mostRecentEventDate': new Date(marathonStats.rank.mostRecentEventDate),
-          'mostRecentSubmissionDate': new Date(marathonStats.mostRecentSubmission)
+          'mostRecentSubmission': new Date(marathonStats.mostRecentSubmission)
         });
       }
       if (stats.COPILOT) {
@@ -159,6 +160,11 @@
         stats.COPILOT.track = 'COPILOT';
         stats.COPILOT.subTrack = 'COPILOT';
       }
+
+      sortByDate(dev);
+      sortByDate(design);
+      sortByDate(dataScience);
+
       var compiledStats = {
         'DEVELOP': removeRanklessNoSubmissions(dev),
         'DESIGN': removeRanklessNoSubmissions(design),
@@ -175,6 +181,18 @@
       return compiledStats;
     }
 
+
+    function sortByDate(arr) {
+      arr.sort(function(a, b) {
+        if (!(a.mostRecentSubmission || a.mostRecentEventDate)) return -1; 
+        if (!(b.mostRecentSubmission || b.mostRecentEventDate)) return 1;
+        a = new Date(a.mostRecentSubmission || a.mostRecentEventDate);
+        b = new Date(b.mostRecentSubmission || b.mostRecentEventDate);
+        return a > b ? -1 : a < b ? 1 : 0;
+      });
+    }
+
+
     function getChallengeTypeStats(stats, track, type) {
       track = track.toUpperCase().replace(/ /g, '_');
       track = track.replace(/-/g, '');
@@ -242,20 +260,31 @@
         {
           'name': 'DEVELOP',
           'challenges': stats.DEVELOP.challenges,
+          'mostRecentEventDate': new Date(stats.DEVELOP.mostRecentEventDate),
+          'mostRecentSubmission': new Date(stats.DEVELOP.mostRecentSubmision)
         },
         {
           'name': 'DESIGN',
           'challenges': stats.DESIGN.challenges,
+          'mostRecentEventDate': new Date(stats.DESIGN.mostRecentEventDate),
+          'mostRecentSubmission': new Date(stats.DESIGN.mostRecentSubmision)
         },
         {
           'name': 'DATA_SCIENCE',
           'challenges': stats.DATA_SCIENCE.challenges,
+          'mostRecentEventDate': new Date(stats.DATA_SCIENCE.mostRecentEventDate),
+          'mostRecentSubmission': new Date(stats.DATA_SCIENCE.mostRecentSubmision)
         }
       ].filter(function(track) {
         return track.challenges > 0;
-      }).map(function(track) {
+      });
+      sortByDate(tracks);
+      tracks = tracks.map(function(track) {
         return track.name;
       });
+      if (stats.COPILOT) {
+        tracks = ['COPILOT'].concat(tracks);
+      }
       return tracks;
     }