Merge branch 'qa-integration'

Author: Parth Shah

.gitignore

@@ -8,3 +8,4 @@ report
 .idea
 .settings
 .vscode
+styleguide

README.md

@@ -69,6 +69,7 @@ In general, follow this [AngularJS style guide](https://github.com/johnpapa/angu
 ### Pull Requests
 
 To contribute to the repository, please create a feature branch off of the dev branch. Once you're finished working on the feature, make a pull request to merge it into dev. Then, make sure to delete the branch when it's no longer used.
+Further, please make sure every pull request has passed the build checks, which appears just before the "Merge pull request" button in github. We are trying to show the unit tests results as well along with the build.
 
 ### Adding New Content
 

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -1,11 +1,12 @@
 .challenge.tile-view(ng-show="view === 'tile'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")
-    .challenge-track
 
     header
       .top
         a.name(ng-href="{{challenge|challengeLinks:'detail'}}") #[span {{challenge.name}}]
 
+        .challenge-track
+
         p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
       challenge-links(challenge="challenge", view="'tile'")

app/directives/challenge-user-place/challenge-user-place.directive.js

@@ -48,6 +48,9 @@
             $scope.challenge.userDetails.submissions = $scope.challenge.userDetails.submissions.filter(function(submission) {
               return submission && submission.submissionImage;
             });
+            $scope.challenge.userDetails.submissions = _.sortBy($scope.challenge.userDetails.submissions, function(submission) {
+              return submission.placement;
+            });
           }
           if (!$scope.challenge.isPrivate && $scope.challenge.userDetails && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) {
             $scope.numImages = $scope.challenge.userDetails.submissions.length;

app/directives/tc-sticky/tc-sticky.directive.js

@@ -8,63 +8,45 @@
     return {
       restrict: 'A',
       link: function(scope, element) {
-        scope.width = element.prop('offsetWidth');
-
-        var elWidth = scope.width + 'px';
-        var elChild = angular.element(element[0].querySelector(':first-child'));
-        // elChild.css('width', elWidth);
-
-        var hitBottom = false;
-
-        angular.element($window).bind("scroll", function() {
-          var affixElement = document.getElementById('affix');
-          var xPosition = 0;
-          var yPosition = 0;
-
-          function getPosition(element) {
-            while(element) {
-              yPosition += (element.offsetTop - element.scrollTop + element.clientTop);
-              element = element.offsetParent;
-            }
-          }
-
-          getPosition(affixElement);
-
-          var height = angular.element(affixElement).prop('offsetHeight');
-          var top = angular.element(affixElement).prop('offsetTop');
-
-          if (yPosition >= 0 || $window.innerHeight <= elChild[0].offsetHeight || $window.innerWidth < 768) {
-            elChild.removeClass('affix affix-bottom');
-          } else if ( yPosition < 0) {
-            var bodyRect = document.body.getBoundingClientRect()
-            var elChildRect = elChild[0].getBoundingClientRect()
-            var elChildAbsOffset = elChildRect.top - bodyRect.top;
-
+          scope.width = element.prop('offsetWidth');
+          var elWidth = scope.width + 'px',
+              elChild = angular.element(element[0].querySelector(':first-child'));
+          var hitBottom = false;
+          angular.element($window).bind("scroll", function() {
+            var affixElement = document.getElementById('affix');
             var affixElementRect = affixElement.getBoundingClientRect();
-            var affixElementAbsOffset = affixElementRect.top - bodyRect.top;
+            var elChildRect = elChild[0].getBoundingClientRect();
+            if (affixElementRect.top >= 0 || $window.innerHeight <= elChildRect.height || $window.innerWidth < 768) {
+                elChild.removeClass('affix affix-bottom');
+            } else if ( affixElementRect.top < 0) {
+              var bodyRect = document.body.getBoundingClientRect();
+              var elChildAbsOffset = elChildRect.top - bodyRect.top;
 
-            var elChildOffset = elChildAbsOffset - affixElementAbsOffset;
-            var elChildHeight = elChild[0].clientHeight;
-            var affixElementHeight = affixElement.clientHeight;
+              var affixElementRect = affixElement.getBoundingClientRect();
+              var affixElementAbsOffset = affixElementRect.top - bodyRect.top;
 
-            var pastBottom = elChildOffset + elChildHeight > affixElementHeight;
-            var topCovered = elChildRect.top > 10;
+              var elChildOffset = elChildAbsOffset - affixElementAbsOffset;
+              var elChildHeight = elChild[0].clientHeight;
+              var affixElementHeight = affixElement.clientHeight;
 
-            elChild.addClass('affix');
+              var pastBottom = elChildOffset + elChildHeight > affixElementHeight;
+              var topCovered = elChildRect.top > 10;
 
-            if (pastBottom && !hitBottom) {
-              hitBottom = true;
-              elChild.addClass('affix-bottom');
-              elChild.removeClass('affix');
-            }
-
-            if (topCovered) {
-              hitBottom = false;
-              elChild.removeClass('affix-bottom');
               elChild.addClass('affix');
+
+              if (pastBottom && !hitBottom) {
+                hitBottom = true;
+                elChild.addClass('affix-bottom');
+                elChild.removeClass('affix');
+              }
+
+              if (topCovered) {
+                hitBottom = false;
+                elChild.removeClass('affix-bottom');
+                elChild.addClass('affix');
+              }
             }
-          }
-        });
+          });
       }
     };
   }

app/directives/tc-tabs/tc-tabs.directive.jade

@@ -2,7 +2,7 @@
 
   ul.tab-set
     li.tab-pill(ng-repeat="tab in tabSet.tabs")
-      a(ng-click="tabSet.select(tab)")
+      a(ng-click="tabSet.select(tab)", ng-class="{'selected': tab.active}")
         .header(ng-class="{'selected': tab.active}") {{tab.heading}}
 
   .tab-view(ng-transclude)

app/profile/subtrack/subtrack.controller.js

@@ -75,6 +75,11 @@
         // user iterable stats
         vm.subTrackStats = UserStatsService.getIterableStats(vm.track, vm.subTrack, data);
         if (vm.track === 'DEVELOP') {
+          var reliability = vm.subTrackStats.filter(function(stat) { return stat.label === 'reliability'; });
+          if (reliability.length > 0) {
+            reliability = reliability[0];
+            reliability.link = 'http://community.' + vm.domain + '/tc?module=ReliabilityDetail&pt=2&cr=' + profileVm.profile.userId;
+          }
           var mustHaveMetrics = ["rank", "rating", "reliability"];
           // check if rating, rank & reliability are all set
           var _filteredObjs = _.filter(vm.subTrackStats, function(k) { return _.indexOf(mustHaveMetrics, k.label) > -1});

app/profile/subtrack/subtrack.jade

@@ -9,7 +9,7 @@
         .subtrack-stats
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
-              .flex-wrapper
+              a.flex-wrapper(ng-class="{'link': item.link, 'no-link': !item.link}", ng-href="{{item.link}}")
                 p.title(ng-hide="true") {{item.subTrack | track}}
 
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}

app/services/communityData.service.js

@@ -19,29 +19,29 @@
       var data = {
         "memberLeaderboard": [
         {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/iamtong_oct2015.png",
-          "name": "iamtong ",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/abedavera.jpg",
+          "name": "abedavera",
           "contestType": "Design",
-          "description": "Won $6500 in design challenges.",
+          "description": "TCO15 Design Champion!",
           "class": "design"
         }, {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/cjalmeida_oct2015.png",
-          "name": "cjalmeida",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/bonton.jpg",
+          "name": "bonton",
           "contestType": "Development",
-          "description": "Won $4500 in development challenges.",
+          "description": "Won $4200 with 4 wins in development challenges",
           "class": "develop"
         }, {
-          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/islands_oct2015.png",
-          "name": "islands",
+          "avatar": "//www.topcoder.com/wp-content/uploads/2015/05/maksay.jpg",
+          "name": "maksay",
           "contestType": "Data Science",
-          "description": "Advanced from Div 2 to Div 1 & total rating increase of 424 pts.",
+          "description": "Only participant to see a ratings increase in all four rounds in Sept.",
           "class": "data-science"
         }, {
-          "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg",
-          "name": "WinkTales",
-          "contestType": "Dev Rookie",
-          "description": "Already won 2 challenges in his short 2.5 month time with Topcoder",
-          "class": "develop"
+          "avatar": "https://www.topcoder.com/wp-content/uploads/2015/05/herlansyahs.jpg",
+          "name": "herlansyahs",
+          "contestType": "Design Rookie",
+          "description": "Won first and second placements within his first two months of becoming a member!",
+          "class": "design"
         }],
         "copilots": [{
           "avatar": "//community.topcoder.com/i/m/maroosh.jpeg",

app/services/userStats.service.js

@@ -100,9 +100,10 @@
       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';
+            var filtered = _.filter(subtracks, function(subtrackObj) {
+              return subtrackObj.subTrack !== 'COPILOT_POSTING';
             });
+            return result.concat(filtered);
           }
 
           return result.concat(subtracks);