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

Commit a695b28

Browse files
author
vikasrohit
committed
SUP-1815, Past Challenge Cards showing incorrect information when there is no winner
-- Added parsing function call for processing past challenges.
1 parent ff6bd80 commit a695b28

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@
7575
p BLAH
7676

7777
.challenge-details(ng-switch-when="DEVELOP")
78-
p.place(ng-class="{ 'first-place': challenge.wonFirst }") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
78+
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
79+
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
80+
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
7981

80-
.challenge-score
82+
.challenge-score(ng-show="challenge.userStatus !== 'NOT_FINISHED'")
8183
p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
8284

8385
p Review Score

app/my-challenges/my-challenges.controller.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@
8181

8282
return ChallengeService.getUserChallenges(handle, params)
8383
.then(function(challenges){
84-
ChallengeService.processActiveDevDesignChallenges(challenges);
84+
if (vm.statusFilter == 'active') {
85+
ChallengeService.processActiveDevDesignChallenges(challenges);
86+
} else {
87+
ChallengeService.processPastChallenges(challenges);
88+
}
8589
if (challenges.length > 0) {
8690
vm.myChallenges = challenges;
8791
vm.userHasChallenges = true;

app/services/challenge.service.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,22 @@
171171

172172
function processPastChallenges(challenges) {
173173
angular.forEach(challenges, function(challenge) {
174-
if (challenge.userDetails && Array.isArray(challenge.userDetails.winningPlacements)) {
175-
challenge.highestPlacement = _.max(challenge.userDetails.winningPlacements);
176-
challenge.wonFirst = challenge.highestPlacement == 1;
174+
if (challenge.userDetails) {
175+
if (Array.isArray(challenge.userDetails.winningPlacements)) {
176+
challenge.highestPlacement = _.max(challenge.userDetails.winningPlacements);
177+
challenge.wonFirst = challenge.highestPlacement == 1;
178+
if (challenge.highestPlacement === 0) {
179+
challenge.highestPlacement = null;
180+
}
181+
}
182+
183+
if (challenge.userDetails.hasUserSubmittedForReview) {
184+
if (!challenge.highestPlacement) {
185+
challenge.userStatus = "PASSED_SCREENING";
186+
}
187+
} else {
188+
challenge.userStatus = "NOT_FINISHED";
189+
}
177190
}
178191
});
179192
}

0 commit comments

Comments
 (0)