From babe54fe7750df2f05eb65741cf8dc43048f6f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Jan 2019 11:52:25 +0100
Subject: [PATCH] MOBILE-2855 workshop: Show received grades on closed phase

---
 .../components/submission/addon-mod-workshop-submission.html | 2 +-
 src/addon/mod/workshop/pages/assessment/assessment.html      | 2 +-
 src/addon/mod/workshop/pages/assessment/assessment.ts        | 4 ++--
 src/addon/mod/workshop/pages/submission/submission.ts        | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 2637cc500..180f298c8 100644
--- a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -1,7 +1,7 @@
 <core-loading [hideUntil]="loaded">
     <div *ngIf="!summary">
         <ion-list-header text-wrap>
-            <ion-avatar core-user-avatar [user]="profile" item-start></ion-avatar>
+            <ion-avatar core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile && profile.id" item-start></ion-avatar>
             <h2>{{submission.title}}</h2>
             <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
             <p *ngIf="showGrade(submission.submissiongrade)" [class.addon-has-overriden-grade]="showGrade(submission.submissiongradeover)">
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html
index 4834ab4ca..ecc8b3fd3 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.html
+++ b/src/addon/mod/workshop/pages/assessment/assessment.html
@@ -36,7 +36,7 @@
             </ion-badge>
         </ion-item>
 
-        <addon-mod-workshop-assessment-strategy *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access && profile" [workshop]="workshop" [access]="access" [assessmentId]="assessmentId" [userId]="profile.id" [strategy]="strategy"></addon-mod-workshop-assessment-strategy>
+        <addon-mod-workshop-assessment-strategy *ngIf="assessment && assessmentId && showGrade(assessment.grade) && workshop && access" [workshop]="workshop" [access]="access" [assessmentId]="assessmentId" [userId]="profile && profile.id" [strategy]="strategy"></addon-mod-workshop-assessment-strategy>
 
         <form ion-list [formGroup]="evaluateForm" *ngIf="evaluating">
             <ion-item text-wrap>
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.ts b/src/addon/mod/workshop/pages/assessment/assessment.ts
index 22c1b2bde..09b6a1e3f 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addon/mod/workshop/pages/assessment/assessment.ts
@@ -164,8 +164,8 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
 
             if (this.evaluating || this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED) {
                 // Get all info of the assessment.
-                return this.workshopHelper.getReviewerAssessmentById(this.workshopId, this.assessmentId, this.profile.id)
-                        .then((assessment) => {
+                return this.workshopHelper.getReviewerAssessmentById(this.workshopId, this.assessmentId,
+                        this.profile && this.profile.id).then((assessment) => {
                     let defaultGrade, promise;
 
                     this.assessment = this.workshopHelper.realGradeValue(this.workshop, assessment);
diff --git a/src/addon/mod/workshop/pages/submission/submission.ts b/src/addon/mod/workshop/pages/submission/submission.ts
index 218bfe2c7..b058e1d05 100644
--- a/src/addon/mod/workshop/pages/submission/submission.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.ts
@@ -202,7 +202,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
                 this.workshop.phase < AddonModWorkshopProvider.PHASE_CLOSED && this.access.canoverridegrades;
             this.ownAssessment = false;
 
-            if (this.access.canviewallassessments) {
+            if (this.access.canviewallassessments || this.currentUserId == this.userId) {
                 // Get new data, different that came from stateParams.
                 promises.push(this.workshopProvider.getSubmissionAssessments(this.workshopId, this.submissionId)
                         .then((subAssessments) => {
@@ -291,7 +291,8 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
                         this.feedbackForm.controls['text'].setValue(this.evaluate.text);
                     });
                 }));
-            } else if (this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED && submissionData.gradeoverby) {
+            } else if (this.workshop.phase == AddonModWorkshopProvider.PHASE_CLOSED && submissionData.gradeoverby &&
+                    this.evaluate && this.evaluate.text) {
                 promises.push(this.userProvider.getProfile(submissionData.gradeoverby, this.courseId, true).then((profile) => {
                     this.evaluateByProfile = profile;
                 }));