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

Commit d9fb432

Browse files
author
vikasrohit
committed
SUP-2255, Remove "Didn't Finish" from past challenges where user was not a submitter
-- Shown "Completed" for non submitter roles.
1 parent efdcca7 commit d9fb432

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
33
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
44
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
5+
p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
56

67
.thumbnail(ng-click="openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
78
img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
@@ -16,6 +17,7 @@
1617
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
1718
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
1819
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
20+
p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
1921
p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
2022

2123
.winner-ribbon(ng-show="challenge.wonFirst")

app/directives/challenge-user-place/dev-challenge-user-place.directive.jade

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
33
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
44
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
5+
p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
56

67
.challenge-score(ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
78
p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
@@ -13,6 +14,7 @@
1314
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
1415
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
1516
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
17+
p.place(ng-show="challenge.userStatus === 'COMPLETED'") Completed
1618
p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
1719

1820
.winner-ribbon(ng-show="challenge.wonFirst")

app/services/challenge.service.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,20 @@
196196
}
197197
}
198198

199+
challenge.userHasSubmitterRole = false;
200+
201+
// determines if user has submitter role or not
202+
var roles = challenge.userDetails.roles;
203+
if (roles.length > 0) {
204+
var submitterRole = _.findIndex(roles, function(role) {
205+
var lRole = role.toLowerCase();
206+
return lRole === 'submitter';
207+
});
208+
if (submitterRole >= 0) {
209+
challenge.userHasSubmitterRole = true;
210+
}
211+
}
212+
199213
if (challenge.userDetails.hasUserSubmittedForReview) {
200214
if (!challenge.highestPlacement) {
201215
challenge.userStatus = "PASSED_SCREENING";
@@ -205,6 +219,11 @@
205219
} else {
206220
challenge.userStatus = "NOT_FINISHED";
207221
}
222+
223+
// if user does not has submitter role, just show Completed
224+
if (!challenge.userHasSubmitterRole) {
225+
challenge.userStatus = "COMPLETED";
226+
}
208227
}
209228
});
210229
}

0 commit comments

Comments
 (0)