Merge branch 'feature/SUP-1773-order-track-ratings' into dev

appirio-tech · Oct 17, 2015 · 0941f31 · 0941f31
2 parents 1e8931d + a438f87
commit 0941f31
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/app/my-dashboard/community-updates/community-updates.jade b/app/my-dashboard/community-updates/community-updates.jade
@@ -11,4 +11,4 @@ header
     .description(ng-bind-html="blog.description")
 
 .blog-links(ng-hide="vm.loading")
-  a.tc-btn.tc-btn-s.tc-btn-secondary(ng-href="https://www.{{DOMAIN}}/blog/") View More
+  a.tc-btn(ng-href="https://www.{{DOMAIN}}/blog/") View More
diff --git a/app/my-dashboard/subtrack-stats/subtrack-stats.jade b/app/my-dashboard/subtrack-stats/subtrack-stats.jade
@@ -3,9 +3,9 @@
 
 .ratings(ng-if="vm.hasRanks && !vm.loading")
   .tracks
-    .track(ng-repeat="subtrack in vm.subtrackRanks | orderBy: ['track', 'rank']", ui-sref="profile.subtrack({userHandle: vm.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
+    .track(ng-repeat="subtrack in vm.subtrackRanks | orderBy:'mostRecentEventDate':true", ui-sref="profile.subtrack({userHandle: vm.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
       .flex-wrapper
-        p.subtrack {{subtrack.subTrack | underscoreStrip}}
+        p.subtrack {{subtrack.subTrack | underscoreStrip}} 
 
         p.rating(ng-if="subtrack.track !== 'DESIGN'", style="color: {{subtrack.stat | ratingColor}}") {{subtrack.stat | number}}
           span(style="background-color: {{subtrack.stat | ratingColor}}", ng-if="subtrack.track === 'DEVELOP' || subtrack.track === 'DATA_SCIENCE'")
@@ -16,7 +16,7 @@
 
   ul(rn-carousel, rn-carousel-controls)
     li(ng-repeat="subtracks in vm.subtrackRanksCollection")
-      .track(ng-repeat="subtrack in subtracks", ui-sref="profile.subtrack({userHandle: vm.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
+      .track(ng-repeat="subtrack in subtracks | orderBy:'mostRecentEventDate':true", ui-sref="profile.subtrack({userHandle: vm.handle, track: subtrack.track, subTrack: subtrack.subTrack})")
         .flex-wrapper
           p.subtrack {{subtrack.subTrack | underscoreStrip}}
 

diff --git a/app/profile/about/about.jade b/app/profile/about/about.jade
@@ -102,4 +102,4 @@
 
           .description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.
 
-          button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
+          button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
diff --git a/app/services/profile.service.js b/app/services/profile.service.js
@@ -102,7 +102,8 @@
             'subTrack': subTrack.name,
             'rank': subTrack.rank ? subTrack.rank.overallRank : 0,
             'rating': subTrack.rank.rating || 0,
-            'wins': subTrack.wins
+            'wins': subTrack.wins,
+            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate)
           };
         }).filter(function(subTrack) {
           return !(subTrack.subTrack == 'COPILOT_POSTING' && subTrack.track == 'DEVELOP');
@@ -115,7 +116,8 @@
             'track': 'DESIGN',
             'subTrack': subTrack.name,
             'rank': false,
-            'wins': subTrack.wins
+            'wins': subTrack.wins,
+            'mostRecentEventDate': new Date(subTrack.mostRecentEventDate)
           };
         });
       }
@@ -125,7 +127,8 @@
           'track': 'DATA_SCIENCE',
           'subTrack': 'SRM',
           'rank': srmStats.rank.rank,
-          'rating': srmStats.rank.rating
+          'rating': srmStats.rank.rating,
+          'mostRecentEventDate': new Date(srmStats.rank.mostRecentEventDate)
         });
       }
       if (stats.DATA_SCIENCE && stats.DATA_SCIENCE.MARATHON_MATCH && stats.DATA_SCIENCE.MARATHON_MATCH.rank) {
@@ -134,7 +137,8 @@
           'track': 'DATA_SCIENCE',
           'subTrack': 'MARATHON_MATCH',
           'rank': marathonStats.rank.rank,
-          'rating': marathonStats.rank.rating
+          'rating': marathonStats.rank.rating,
+          'mostRecentEventDate': new Date(marathonStats.rank.mostRecentEventDate)
         });
       }
       if (stats.COPILOT) {

diff --git a/assets/css/my-dashboard/community-updates.scss b/assets/css/my-dashboard/community-updates.scss
@@ -42,7 +42,7 @@
       border: 1px solid #F0F0F0;
       @media only screen and (min-width: 570px) {
         width: 270px;
-        height: 386px;
+        // height: 386px;
 
         &:nth-child(2n + 1) {
           margin-right: 10px;

diff --git a/assets/css/my-dashboard/programs.scss b/assets/css/my-dashboard/programs.scss
@@ -103,7 +103,6 @@
         display: inline-block;
         margin-top: 30px;
         font-size: 13px;
-        color: $white;
         text-decoration: none;
         text-transform: uppercase;
         @media only screen and (min-width: 1000px) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,4 +102,4 @@

		.description Show off your work and experience outside of Topcoder. Connect accounts from popular services and networks or add a link to any site.

		button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS
		button.tc-btn.tc-btn-l.link-button(ui-sref="settings.profile") CONNECT ACCOUNTS