EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2344 from crazyserver/MOBILE-3346 

MOBILE-3346 workshop: Show current user assessments when closed
main
Juan Leyva 2020-04-27 17:46:46 +02:00 committed by GitHub
parent 16873e7a64 df906f91e9
commit 394cd8275c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/addon/mod/workshop/pages/submission/submission.ts
View File

@ -234,16 +234,16 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
this.canDelete = !assessment; this.canDelete = !assessment;
} }
assessment.userid = assessment.reviewerid; assessment = this.parseAssessment(assessment);
assessment = this.workshopHelper.realGradeValue(this.workshop, assessment);
if (this.currentUserId == assessment.userid) {
this.ownAssessment = assessment;
assessment.ownAssessment = true;
}
this.submissionInfo.reviewedby = [assessment]; this.submissionInfo.reviewedby = [assessment];
})); }));
} else if (this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED && this.userId == this.currentUserId) {
this.workshopProvider.getSubmissionAssessments(this.workshopId, this.submissionId).then((assessments) => {
this.submissionInfo.reviewedby = assessments.map((assessment) => {
return this.parseAssessment(assessment);
});
});
} }
if (this.canAddFeedback || this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED) { if (this.canAddFeedback || this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED) {
@ -324,6 +324,24 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
}); });
} }
/**
* Parse assessment to be shown.
*
* @param assessment Original assessment.
* @return Parsed assessment.
*/
protected parseAssessment(assessment: any): any {
assessment.userid = assessment.reviewerid;
assessment = this.workshopHelper.realGradeValue(this.workshop, assessment);
if (this.currentUserId == assessment.userid) {
this.ownAssessment = assessment;
assessment.ownAssessment = true;
}
return assessment;
}
/** /**
* Force leaving the page, without checking for changes. * Force leaving the page, without checking for changes.
*/ */