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

SUP-2255, Remove "Didn't Finish" from past challenges where user was not a submitter #461

Merged
merged 1 commit into from
Oct 27, 2015
Merged

SUP-2255, Remove "Didn't Finish" from past challenges where user was not a submitter #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/directives/challenge-user-place/design-challenge-user-place.directive.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED

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

.winner-ribbon(ng-show="challenge.wonFirst")
Expand Down
2 changes: 2 additions & 0 deletions app/directives/challenge-user-place/dev-challenge-user-place.directive.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
p.place(ng-class="{ 'first-place': challenge.wonFirst }", ng-show="challenge.highestPlacement") {{challenge.highestPlacement}}#[span {{challenge.highestPlacement | ordinal:true}}] Place
p.place(ng-show="challenge.userStatus === 'NOT_FINISHED'") Didn't Finish
p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED

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

.winner-ribbon(ng-show="challenge.wonFirst")
Expand Down
19 changes: 19 additions & 0 deletions app/services/challenge.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,20 @@
}
}

challenge.userHasSubmitterRole = false;

// determines if user has submitter role or not
var roles = challenge.userDetails.roles;
if (roles.length > 0) {
var submitterRole = _.findIndex(roles, function(role) {
var lRole = role.toLowerCase();
return lRole === 'submitter';
});
if (submitterRole >= 0) {
challenge.userHasSubmitterRole = true;
}
}

if (challenge.userDetails.hasUserSubmittedForReview) {
if (!challenge.highestPlacement) {
challenge.userStatus = "PASSED_SCREENING";
Expand All @@ -205,6 +219,11 @@
} else {
challenge.userStatus = "NOT_FINISHED";
}

// if user does not has submitter role, just show Completed
if (!challenge.userHasSubmitterRole) {
challenge.userStatus = "COMPLETED";
}
}
});
}
Expand Down