From 3c85aacab27aa5bed0a5dd300e2d24149123548f Mon Sep 17 00:00:00 2001
From: vikasrohit <vikas.agarwal@appirio.com>
Date: Mon, 21 Dec 2015 15:51:48 +0530
Subject: [PATCH] SUP-2881, Show placements on challenge cards only for
 "Contest Submission" type submissions

-- Added filter for submission type being 'Contest Submission' for calculating highest placement for the design challenges
-- Fixed use of calculation of highest placement, it was using _.max while we should use _.min instead.
-- Fixed style in case we are not showing placement for past challenges
---
 .../challenge-user-place.directive.js         |  4 ++-
 app/services/challenge.service.js             |  2 +-
 app/topcoder.constants.js                     |  3 ++-
 .../design-challenge-user-place.scss          |  2 +-
 config.js                                     | 25 +++++++++++++++----
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/directives/challenge-user-place/challenge-user-place.directive.js b/app/directives/challenge-user-place/challenge-user-place.directive.js
index 402ce6f8e..23add31a8 100644
--- a/app/directives/challenge-user-place/challenge-user-place.directive.js
+++ b/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;
diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js
index fddb91c48..8e4fe5c08 100644
--- a/app/services/challenge.service.js
+++ b/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) {
diff --git a/app/topcoder.constants.js b/app/topcoder.constants.js
index fddccd379..037784533 100644
--- a/app/topcoder.constants.js
+++ b/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"
 })
 
 ;
\ No newline at end of file
diff --git a/assets/css/directives/design-challenge-user-place.scss b/assets/css/directives/design-challenge-user-place.scss
index bcba91355..133a86446 100644
--- a/assets/css/directives/design-challenge-user-place.scss
+++ b/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;
diff --git a/config.js b/config.js
index f35fc241e..a4659bbe3 100644
--- a/config.js
+++ b/config.js
@@ -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'
 
       }
     }