Merge commit 'b5193b3c40050cc5824233371ae570c69ef64264' into HEAD

Author: Jenkins Continuous Integration Server

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

@@ -59,7 +59,9 @@
             $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full;
             $scope.selectedImage = $scope.imageURL;
 
-            $scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;
+            $scope.challenge.highestPlacement = _.min($scope.challenge.userDetails.submissions.filter(function(submission) {
+              return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
+            }), 'placement').placement;
 
             if ($scope.challenge.highestPlacement == 1) {
               $scope.challenge.wonFirst = true;

app/directives/external-account/external-web-links.directive.js

@@ -38,6 +38,9 @@
             $log.debug("Web link added: " + JSON.stringify(data));
             data.data.provider = data.provider;
             $scope.linkedAccounts.push(data.data);
+            // reset the form when it is successfully added
+            $scope.addWebLinkFrm.$setPristine();
+            $scope.url = null;
             toaster.pop('success', "Success", "Your link has been added. Data from your link will be visible on your profile shortly.");
           })
           .catch(function(resp) {

app/directives/external-account/external-web-links.directive.spec.js

@@ -90,24 +90,29 @@ describe('ExternalWebLinks Directive', function() {
       });
       expect(topcoderLink).to.exist;
       expect(topcoderLink.status).to.exist.to.equal('PENDING');
+      expect(element.isolateScope().url).not.to.exist;
       expect(toasterSvc.pop).to.have.been.calledWith('success').calledOnce;
     });
 
     it('should NOT add new weblink to linkedAccounts', function() {
+      var urlToAdd = 'https://www.topcoder.com';
       element.isolateScope().userHandle = 'throwError';
-      element.isolateScope().url = 'https://www.topcoder.com';
+      element.isolateScope().url = urlToAdd;
       element.isolateScope().addWebLink();
       scope.$digest();
       expect(scope.linkedAccounts).to.have.length(1);
+      expect(element.isolateScope().url).to.exist.to.equal(urlToAdd);
       expect(toasterSvc.pop).to.have.been.calledWith('error').calledOnce;
     });
 
     it('should NOT add new weblink to linkedAccounts', function() {
+      var urlToAdd = 'https://www.topcoder.com';
       element.isolateScope().userHandle = 'alreadyExistsError';
-      element.isolateScope().url = 'https://www.topcoder.com';
+      element.isolateScope().url = urlToAdd;
       element.isolateScope().addWebLink();
       scope.$digest();
       expect(scope.linkedAccounts).to.have.length(1);
+      expect(element.isolateScope().url).to.exist.to.equal(urlToAdd);
       expect(toasterSvc.pop).to.have.been.calledWith('error').calledOnce;
     });
 

app/services/challenge.service.js

@@ -190,7 +190,7 @@
             challenge.thumbnailId = challenge.userDetails.submissions[0].id;
 
             challenge.highestPlacement = _.min(challenge.userDetails.submissions.filter(function(submission) {
-              return submission.placement;
+              return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
             }), 'placement').placement;
 
             if (challenge.highestPlacement == 1) {

app/topcoder.constants.js

@@ -32,7 +32,8 @@ angular.module("CONSTANTS", [])
 	"BUSY_PROGRESS_MESSAGE": "Processing..",
 	"REGISTRATION": "REGISTRATION",
 	"CODING": "CODING",
-	"REGISTERED": "REGISTERED"
+	"REGISTERED": "REGISTERED",
+	"SUBMISSION_TYPE_CONTEST": "Contest Submission"
 })
 
 ;

assets/css/directives/design-challenge-user-place.scss

@@ -11,7 +11,7 @@ design-challenge-user-place {
     .place {
       &.completed, &.passed, &.didnt {
         margin-bottom: -36px;
-        margin-top: 40px;
+        margin-top: 52px;
       }
       margin-bottom: 8px;
       margin-top: 8px;

assets/images/skills/id-109.svg renamed to assets/images/skills/id-110.svg

@@ -42,7 +42,10 @@ module.exports = function() {
         CODING: 'CODING',
 
         // users' status
-        REGISTERED: 'REGISTERED'
+        REGISTERED: 'REGISTERED',
+
+        // submission type
+        SUBMISSION_TYPE_CONTEST: 'Contest Submission'
 
       }
     },
@@ -88,7 +91,10 @@ module.exports = function() {
         CODING: 'CODING',
 
         // users' status
-        REGISTERED: 'REGISTERED'
+        REGISTERED: 'REGISTERED',
+
+        // submission type
+        SUBMISSION_TYPE_CONTEST: 'Contest Submission'
 
       }
     },
@@ -134,7 +140,10 @@ module.exports = function() {
         CODING: 'CODING',
 
         // users' status
-        REGISTERED: 'REGISTERED'
+        REGISTERED: 'REGISTERED',
+
+        // submission type
+        SUBMISSION_TYPE_CONTEST: 'Contest Submission'
 
       }
     },
@@ -180,7 +189,10 @@ module.exports = function() {
         CODING: 'CODING',
 
         // users' status
-        REGISTERED: 'REGISTERED'
+        REGISTERED: 'REGISTERED',
+
+        // submission type
+        SUBMISSION_TYPE_CONTEST: 'Contest Submission'
 
       }
     },
@@ -226,7 +238,10 @@ module.exports = function() {
         CODING: 'CODING',
 
         // users' status
-        REGISTERED: 'REGISTERED'
+        REGISTERED: 'REGISTERED',
+
+        // submission type
+        SUBMISSION_TYPE_CONTEST: 'Contest Submission'
 
       }
     }