Skip to content

Commit

Permalink
SAK-43321 Moved showPhoto check to sakai-grader.js (sakaiproject#8014)
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianfish authored and ern committed Apr 8, 2020
1 parent 01b0c12 commit f610502
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
<select aria-label="${this.i18n["student_selector_label"]}" @change=${this.studentSelected}>
${this.submissions.map(s => html`<option value="${s.id}" .selected=${this.submission.id === s.id}>${s.groupId ? s.groupTitle : s.firstSubmitterName}</option>`)}
</select>
${this.submission.showPhoto ? html`
${this.showPhoto() ? html`
<span class="profile-image">
<img src="/direct/profile/${this.submission.firstSubmitterId}/image/official?siteId=${portal.siteId}" alt="${this.submission.firstSubmitterName}${this.i18n["profile_image"]}"/>
</span>
Expand Down Expand Up @@ -196,7 +196,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
<div class="grader ${this.graderOnLeft ? "on-left" : ""}">
<div class="submitted-block">
<div style="display: flex;">
${this.submission.showPhoto ? html`
${this.showPhoto() ? html`
<div class="profile-image" style="flex: 1;">
<img src="/direct/profile/${this.submission.firstSubmitterId}/image/official?siteId=${portal.siteId}" alt="${this.submission.firstSubmitterName}${this.i18n["profile_image"]}" />
</div>
Expand Down Expand Up @@ -381,6 +381,10 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
`;
}

showPhoto() {
return this.showOfficialPhoto && !this.gradable.anonymousGrading && this.submission.firstSubmitterId && !this.submission.groupId;
}

fileNameFromRef(ref) { return ref.substring(ref.lastIndexOf("\/") + 1); }

toggleRubric(e) {
Expand Down
2 changes: 0 additions & 2 deletions webcomponents/tool/src/main/frontend/js/grader/submission.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ export class Submission {
this.feedbackComment = init.feedbackComment || "";

this.allowResubmitNumber = this.properties["allow_resubmit_number"];

this.showPhoto = this.showOfficalPhoto && !this.anonymousGrading && this.submission.firstSubmitterId && !this.submission.groupId;
} else {
this.id = "dummy";
}
Expand Down

0 comments on commit f610502

Please sign in to comment.