Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 129ca21

Browse files
author
vikasrohit
committedDec 22, 2015
Merge pull request #620 from appirio-tech/feature/sup-2881-show-placement-for-content-submissions-only
SUP-2881, Show placements on challenge cards only for "Contest Submis…
2 parents a0d3bc5 + 3c85aac commit 129ca21

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed
 

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
$scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full;
6060
$scope.selectedImage = $scope.imageURL;
6161

62-
$scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;
62+
$scope.challenge.highestPlacement = _.min($scope.challenge.userDetails.submissions.filter(function(submission) {
63+
return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
64+
}), 'placement').placement;
6365

6466
if ($scope.challenge.highestPlacement == 1) {
6567
$scope.challenge.wonFirst = true;

‎app/services/challenge.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
challenge.thumbnailId = challenge.userDetails.submissions[0].id;
191191

192192
challenge.highestPlacement = _.min(challenge.userDetails.submissions.filter(function(submission) {
193-
return submission.placement;
193+
return submission.type === CONSTANTS.SUBMISSION_TYPE_CONTEST && submission.placement;
194194
}), 'placement').placement;
195195

196196
if (challenge.highestPlacement == 1) {

‎app/topcoder.constants.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ angular.module("CONSTANTS", [])
3232
"BUSY_PROGRESS_MESSAGE": "Processing..",
3333
"REGISTRATION": "REGISTRATION",
3434
"CODING": "CODING",
35-
"REGISTERED": "REGISTERED"
35+
"REGISTERED": "REGISTERED",
36+
"SUBMISSION_TYPE_CONTEST": "Contest Submission"
3637
})
3738

3839
;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ design-challenge-user-place {
1111
.place {
1212
&.completed, &.passed, &.didnt {
1313
margin-bottom: -36px;
14-
margin-top: 40px;
14+
margin-top: 52px;
1515
}
1616
margin-bottom: 8px;
1717
margin-top: 8px;

‎config.js

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ module.exports = function() {
4242
CODING: 'CODING',
4343

4444
// users' status
45-
REGISTERED: 'REGISTERED'
45+
REGISTERED: 'REGISTERED',
46+
47+
// submission type
48+
SUBMISSION_TYPE_CONTEST: 'Contest Submission'
4649

4750
}
4851
},
@@ -88,7 +91,10 @@ module.exports = function() {
8891
CODING: 'CODING',
8992

9093
// users' status
91-
REGISTERED: 'REGISTERED'
94+
REGISTERED: 'REGISTERED',
95+
96+
// submission type
97+
SUBMISSION_TYPE_CONTEST: 'Contest Submission'
9298

9399
}
94100
},
@@ -134,7 +140,10 @@ module.exports = function() {
134140
CODING: 'CODING',
135141

136142
// users' status
137-
REGISTERED: 'REGISTERED'
143+
REGISTERED: 'REGISTERED',
144+
145+
// submission type
146+
SUBMISSION_TYPE_CONTEST: 'Contest Submission'
138147

139148
}
140149
},
@@ -180,7 +189,10 @@ module.exports = function() {
180189
CODING: 'CODING',
181190

182191
// users' status
183-
REGISTERED: 'REGISTERED'
192+
REGISTERED: 'REGISTERED',
193+
194+
// submission type
195+
SUBMISSION_TYPE_CONTEST: 'Contest Submission'
184196

185197
}
186198
},
@@ -226,7 +238,10 @@ module.exports = function() {
226238
CODING: 'CODING',
227239

228240
// users' status
229-
REGISTERED: 'REGISTERED'
241+
REGISTERED: 'REGISTERED',
242+
243+
// submission type
244+
SUBMISSION_TYPE_CONTEST: 'Contest Submission'
230245

231246
}
232247
}

0 commit comments

Comments
 (0)
This repository has been archived.