From 09b95dbd97f1960798a819a10d064b72da48c623 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 30 May 2019 11:12:36 +0200
Subject: [PATCH 1/5] MOBILE-3039 data: Fix required textarea fields offline

---
 src/addon/mod/data/fields/textarea/providers/handler.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/addon/mod/data/fields/textarea/providers/handler.ts b/src/addon/mod/data/fields/textarea/providers/handler.ts
index 1c1a0bc0d..28ad00b9a 100644
--- a/src/addon/mod/data/fields/textarea/providers/handler.ts
+++ b/src/addon/mod/data/fields/textarea/providers/handler.ts
@@ -103,11 +103,9 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
                 return this.translate.instant('addon.mod_data.errormustsupplyvalue');
             }
 
-            const found = inputData.some((input) => {
-                return !input.subfield && this.textUtils.htmlIsBlank(input.value);
-            });
+            const value = inputData.find((value) => value.subfield == '');
 
-            if (!found) {
+            if (!value || this.textUtils.htmlIsBlank(value.value)) {
                 return this.translate.instant('addon.mod_data.errormustsupplyvalue');
             }
         }

From b7088b6886de096c4bdda8b0e7c066c5348a27c5 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 30 May 2019 11:44:47 +0200
Subject: [PATCH 2/5] MOBILE-3039 data: Don't display error when comments are
 disabled

---
 src/addon/mod/data/pages/entry/entry.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/data/pages/entry/entry.html b/src/addon/mod/data/pages/entry/entry.html
index ebbc2e2fa..4bc24c4a6 100644
--- a/src/addon/mod/data/pages/entry/entry.html
+++ b/src/addon/mod/data/pages/entry/entry.html
@@ -31,7 +31,7 @@
         <core-rating-rate *ngIf="data && entry && ratingInfo && (!data.approval || entry.approved)" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="data.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="courseId" [aggregateMethod]="data.assessed" [scaleId]="data.scale" [userId]="entry.userid" (onLoading)="setLoadingRating($event)" (onUpdate)="ratingUpdated()"></core-rating-rate>
         <core-rating-aggregate *ngIf="data && entry && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="data.coursemodule" [itemId]="entry.id" [courseId]="courseId" [aggregateMethod]="data.assessed" [scaleId]="data.scale"></core-rating-aggregate>
 
-        <ion-item *ngIf="data && entry && entry.id > 0 && commentsEnabled">
+        <ion-item *ngIf="data && data.comments && entry && entry.id > 0 && commentsEnabled">
             <core-comments contextLevel="module" [instanceId]="data.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [displaySpinner]="false" (onLoading)="setLoadingComments($event)"></core-comments>
         </ion-item>
 

From 5143897570b51ebd3641e4a06871c453ddea4da5 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 30 May 2019 14:44:41 +0200
Subject: [PATCH 3/5] MOBILE-3039 workshop: Hide save button if user can't edit
 assessment

---
 src/addon/mod/workshop/pages/submission/submission.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html
index 7a77c3f44..70fdbb714 100644
--- a/src/addon/mod/workshop/pages/submission/submission.html
+++ b/src/addon/mod/workshop/pages/submission/submission.html
@@ -2,7 +2,7 @@
     <ion-navbar core-back-button>
         <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
         <ion-buttons end [hidden]="!loaded">
-            <button *ngIf="assessmentId" ion-button clear (click)="saveAssessment()" [attr.aria-label]="'core.save' | translate">
+            <button *ngIf="assessmentId && access.assessingallowed" ion-button clear (click)="saveAssessment()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
             </button>
             <button *ngIf="canAddFeedback" ion-button clear (click)="saveEvaluation()" [attr.aria-label]="'core.save' | translate">

From 4481d816d6ef466e28dacf2fcf30d64dd924d5b1 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 30 May 2019 15:53:21 +0200
Subject: [PATCH 4/5] MOBILE-3039 workshop: Fix template errors

---
 .../addon-mod-workshop-assessment-strategy.html                 | 2 +-
 .../components/submission/addon-mod-workshop-submission.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index 1ae7628aa..e74d57ded 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -10,7 +10,7 @@
             {{ 'addon.mod_workshop.assessmentstrategynotsupported' | translate:{$a: strategy} }}
         </div>
 
-        <ion-card *ngIf="assessmentStrategyLoaded && overallFeedkback && (edit || data.assessment.feedbackauthor || data.assessment.feedbackattachmentfiles.length) ">
+        <ion-card *ngIf="assessmentStrategyLoaded && overallFeedkback && (edit || data.assessment.feedbackauthor || data.assessment.feedbackattachmentfiles && data.assessment.feedbackattachmentfiles.length) ">
             <ion-item text-wrap>
                 <h2>{{ 'addon.mod_workshop.overallfeedback' | translate }}</h2>
             </ion-item>
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 180f298c8..7a3cf4d86 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
@@ -32,7 +32,7 @@
             <core-local-file *ngIf="attachment.name" [file]="attachment"></core-local-file>
         </ion-item>
         <ion-item text-wrap *ngIf="viewDetails && submission.feedbackauthor">
-            <ion-avatar core-user-avatar [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
+            <ion-avatar *ngIf="evaluateByProfile" core-user-avatar [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
 
             <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}</h2>
             <core-format-text [text]="submission.feedbackauthor"></core-format-text>

From e4e91bd150e72b5f002d721131c547fe07937500 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 30 May 2019 15:54:54 +0200
Subject: [PATCH 5/5] MOBILE-3039 workshop: Fix viewing assessment offline

---
 src/addon/mod/workshop/providers/helper.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/addon/mod/workshop/providers/helper.ts b/src/addon/mod/workshop/providers/helper.ts
index 4007b223a..c4d6560b0 100644
--- a/src/addon/mod/workshop/providers/helper.ts
+++ b/src/addon/mod/workshop/providers/helper.ts
@@ -159,7 +159,7 @@ export class AddonModWorkshopHelperProvider {
      * @return {Promise<any>}        Resolved with the assessment.
      */
     getReviewerAssessmentById(workshopId: number, assessmentId: number, userId: number = 0, siteId?: string): Promise<any> {
-        return this.workshopProvider.getAssessment(workshopId, assessmentId, siteId).catch(() => {
+        return this.workshopProvider.getAssessment(workshopId, assessmentId, siteId).catch((error) => {
             return this.workshopProvider.getReviewerAssessments(workshopId, userId, undefined, undefined, siteId)
                     .then((assessments) => {
                 for (const x in assessments) {
@@ -168,13 +168,10 @@ export class AddonModWorkshopHelperProvider {
                     }
                 }
 
-                return false;
+                // Not found, return original error.
+                return Promise.reject(error);
             });
         }).then((assessment) => {
-            if (!assessment) {
-                return false;
-            }
-
             return this.workshopProvider.getAssessmentForm(workshopId, assessmentId, undefined, undefined, undefined, siteId)
                     .then((assessmentForm) => {
                 assessment.form = assessmentForm;