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

SUP-2389, Style fixes for toaster

Author: vikasrohit

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

@@ -67,7 +67,7 @@
         filter: "platforms=ios&technologies=swift&status=active",
         limit: 3,
         offset: 0,
-        orderBy: 'submissionEndDate desc'
+        orderBy: 'submissionEndDate asc'
       }).then(function(challenges) {
         if (challenges.length > 0) {
           vm.challenges = challenges.slice(0, 3);

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

@@ -3,9 +3,9 @@
 
   angular.module('tc.myDashboard').controller('SubtrackStatsController', SubtrackStatsController);
 
-  SubtrackStatsController.$inject = ['$filter', 'ProfileService', 'userIdentity'];
+  SubtrackStatsController.$inject = ['$filter', 'ProfileService', 'UserStatsService', 'userIdentity'];
 
-  function SubtrackStatsController($filter, ProfileService, userIdentity) {
+  function SubtrackStatsController($filter, ProfileService, UserStatsService, userIdentity) {
     var vm = this;
     vm.loading = true;
 
@@ -17,9 +17,9 @@
       ProfileService.getUserStats(vm.handle)
       .then(function(stats) {
         var trackRanks = ProfileService.getRanks(stats);
-        var subtrackRanks = compileSubtracks(trackRanks);
+        var subtrackRanks = UserStatsService.compileSubtracks(trackRanks);
 
-        processStats(subtrackRanks);
+        UserStatsService.processStats(subtrackRanks);
         // sort subtrack ranks
         subtrackRanks = $filter('orderBy')(subtrackRanks, 'mostRecentEventDate', true);
 
@@ -33,37 +33,5 @@
         vm.loading = false;
       });
     }
-
-    function compileSubtracks(trackRanks) {
-      return _.reduce(trackRanks, function(result, subtracks, track) {
-        if (Array.isArray(subtracks) && subtracks.length) {
-          if (track === 'DEVELOP') {
-            _.remove(subtracks, function(subtrackObj) {
-              return subtrackObj.subTrack === 'COPILOT_POSTING';
-            });
-          }
-
-          return result.concat(subtracks);
-
-        } else {
-          return result;
-        }
-      }, []);
-    }
-
-    function processStats(subtrackRanks) {
-      angular.forEach(subtrackRanks, function(subtrack) {
-        if (subtrack.track === 'DESIGN') {
-          subtrack.stat = subtrack.wins;
-          subtrack.statType = 'Wins';
-        } else if (subtrack.track === 'COPILOT') {
-          subtrack.stat = subtrack.activeContests;
-          subtrack.statType = 'Challenges';
-        } else {
-          subtrack.stat = subtrack.rating;
-          subtrack.statType = 'Rating';
-        }
-      });
-    }
   }
 })();

app/profile/about/about.jade

@@ -77,7 +77,7 @@
 
                 .tag Ranking
 
-              .ranking(ng-if="subtrack.wins && !subtrack.rank && !subtrack.rating")
+              .ranking(ng-if="subtrack.wins !== null && subtrack.rank === null && !subtrack.rating")
                 .number(style="color: #21B2F1") {{subtrack.wins}}
 
                 .tag Wins

app/services/userStats.service.js

@@ -12,7 +12,9 @@
   function UserStatsService($filter) {
 
     var service = {
-      getIterableStats: getIterableStats
+      getIterableStats: getIterableStats,
+      processStats: processStats,
+      compileSubtracks: compileSubtracks
     };
 
     var percentageFunc = function(n) { return $filter('percentage')(n);};
@@ -109,17 +111,25 @@
       }, []);
     }
 
-    function processStats(subtrackRanks) {
-      angular.forEach(subtrackRanks, function(subtrack) {
-        if (subtrack.track === 'DESIGN') {
-          subtrack.stat = subtrack.wins;
-          subtrack.statType = 'Wins';
-        } else if (subtrack.track === 'COPILOT') {
-          subtrack.stat = subtrack.activeContests;
-          subtrack.statType = 'Challenges';
+    function processStats(ranks) {
+      angular.forEach(ranks, function(rank) {
+        if (rank.track === 'DESIGN') {
+          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';
+          }
         } else {
-          subtrack.stat = subtrack.rating;
-          subtrack.statType = 'Rating';
+          rank.stat = rank.rating;
+          rank.statType = 'Rating';
         }
       });
     }

assets/css/topcoder.scss

@@ -93,7 +93,11 @@ body {
   line-height: 20px;
 }
 
-
+#toast-container > div {
+  width: 400px;
+  opacity: 0.95;
+  @include sofia-pro-light;
+}
 
 @media (max-width: 767px) {
   .form-errors {