From 1515e2b6781e5e75d25126e643521362c38b31ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Jul 2018 16:30:53 +0200
Subject: [PATCH] MOBILE-2359 workshop: Display correct number of dimensions

---
 ...shop-assessment-strategy-accumulative.html | 56 ++++++++++---------
 ...workshop-assessment-strategy-comments.html | 32 ++++++-----
 ...orkshop-assessment-strategy-numerrors.html | 52 ++++++++---------
 ...d-workshop-assessment-strategy-rubric.html | 26 +++++----
 ...ddon-mod-workshop-assessment-strategy.html |  2 +-
 5 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
index 919989570..07e2967a8 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
+++ b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
@@ -1,27 +1,29 @@
-<ion-card *ngFor="let field of assessment.form.fields; let n = index">
-    <ion-item text-wrap>
-        <h2>{{ field.dimtitle }}</h2>
-        <core-format-text [text]="field.description"></core-format-text>
-    </ion-item>
-    <ion-item *ngIf="edit && field.grades">
-        <ion-label [core-mark-required]="true" stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</ion-label>
-        <ion-select [(ngModel)]="selectedValues[n].grade" interface="popover">
-            <ion-option *ngFor="let grade of field.grades" [value]="grade.value">{{grade.label}}</ion-option>
-        </ion-select>
-        <core-input-errors item-content *ngIf="fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
-    </ion-item>
-    <ion-item *ngIf="!edit && field.grades" text-wrap>
-        <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</h2>
-        <ng-container *ngFor="let grade of field.grades">
-            <p *ngIf="grade.value === selectedValues[n].grade">{{grade.label}}</p>
-        </ng-container>
-    </ion-item>
-    <ion-item *ngIf="edit">
-        <ion-label stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
-        <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" core-auto-rows></ion-textarea>
-    </ion-item>
-    <ion-item *ngIf="!edit" text-wrap>
-        <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-        <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
-    </ion-item>
-</ion-card>
+<ng-container *ngFor="let field of assessment.form.fields; let n = index">
+    <ion-card *ngIf="n < assessment.form.dimenssionscount">
+        <ion-item text-wrap>
+            <h2>{{ field.dimtitle }}</h2>
+            <core-format-text [text]="field.description"></core-format-text>
+        </ion-item>
+        <ion-item *ngIf="edit && field.grades">
+            <ion-label [core-mark-required]="true" stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</ion-label>
+            <ion-select [(ngModel)]="selectedValues[n].grade" interface="popover">
+                <ion-option *ngFor="let grade of field.grades" [value]="grade.value">{{grade.label}}</ion-option>
+            </ion-select>
+            <core-input-errors item-content *ngIf="fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
+        </ion-item>
+        <ion-item *ngIf="!edit && field.grades" text-wrap>
+            <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</h2>
+            <ng-container *ngFor="let grade of field.grades">
+                <p *ngIf="grade.value === selectedValues[n].grade">{{grade.label}}</p>
+            </ng-container>
+        </ion-item>
+        <ion-item *ngIf="edit">
+            <ion-label stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
+            <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" core-auto-rows></ion-textarea>
+        </ion-item>
+        <ion-item *ngIf="!edit" text-wrap>
+            <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
+            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
+        </ion-item>
+    </ion-card>
+</ng-container>
diff --git a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
index e161192d8..0eb9b23cb 100644
--- a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
+++ b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
@@ -1,15 +1,17 @@
-<ion-card *ngFor="let field of assessment.form.fields; let n = index">
-    <ion-item text-wrap>
-        <h2>{{ field.dimtitle }}</h2>
-        <core-format-text [text]="field.description"></core-format-text>
-    </ion-item>
-    <ion-item *ngIf="edit">
-        <ion-label stacked [core-mark-required]="true">{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
-        <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" core-auto-rows></ion-textarea>
-        <core-input-errors item-content *ngIf="fieldErrors['peercomment_' + n]" [errorText]="fieldErrors['peercomment_' + n]"></core-input-errors>
-    </ion-item>
-    <ion-item *ngIf="!edit" text-wrap>
-        <h2>{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-        <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
-    </ion-item>
-</ion-card>
+<ng-container *ngFor="let field of assessment.form.fields; let n = index">
+    <ion-card *ngIf="n < assessment.form.dimenssionscount">
+        <ion-item text-wrap>
+            <h2>{{ field.dimtitle }}</h2>
+            <core-format-text [text]="field.description"></core-format-text>
+        </ion-item>
+        <ion-item *ngIf="edit">
+            <ion-label stacked [core-mark-required]="true">{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
+            <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" core-auto-rows></ion-textarea>
+            <core-input-errors item-content *ngIf="fieldErrors['peercomment_' + n]" [errorText]="fieldErrors['peercomment_' + n]"></core-input-errors>
+        </ion-item>
+        <ion-item *ngIf="!edit" text-wrap>
+            <h2>{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
+            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
+        </ion-item>
+    </ion-card>
+</ng-container>
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
index f98777c83..925db72d1 100644
--- a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
+++ b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
@@ -1,28 +1,30 @@
-<ion-card *ngFor="let field of assessment.form.fields; let n = index">
-    <ion-item text-wrap>
-        <h2>{{ field.dimtitle }}</h2>
-        <core-format-text [text]="field.description"></core-format-text>
-    </ion-item>
-    <ion-list radio-group [(ngModel)]="selectedValues[n].grade" [name]="'grade_' + n">
-        <ion-item>
-            <ion-label stacked [core-mark-required]="edit">{{ 'addon.mod_workshop.yourassessmentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
-            <core-input-errors item-content *ngIf="edit && fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
+<ng-container *ngFor="let field of assessment.form.fields; let n = index">
+    <ion-card *ngIf="n < assessment.form.dimenssionscount">
+        <ion-item text-wrap>
+            <h2>{{ field.dimtitle }}</h2>
+            <core-format-text [text]="field.description"></core-format-text>
         </ion-item>
-        <ion-item>
-            <ion-label><core-format-text [text]="field.grade0"></core-format-text></ion-label>
-            <ion-radio [value]="-1" [disabled]="!edit"></ion-radio>
+        <ion-list radio-group [(ngModel)]="selectedValues[n].grade" [name]="'grade_' + n">
+            <ion-item>
+                <ion-label stacked [core-mark-required]="edit">{{ 'addon.mod_workshop.yourassessmentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
+                <core-input-errors item-content *ngIf="edit && fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
+            </ion-item>
+            <ion-item>
+                <ion-label><core-format-text [text]="field.grade0"></core-format-text></ion-label>
+                <ion-radio [value]="-1" [disabled]="!edit"></ion-radio>
+            </ion-item>
+            <ion-item>
+                <ion-label><core-format-text [text]="field.grade1"></core-format-text></ion-label>
+                <ion-radio [value]="1" [disabled]="!edit"></ion-radio>
+            </ion-item>
+        </ion-list>
+        <ion-item *ngIf="edit">
+            <ion-label stacked>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
+            <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" [name]="'peercomment_' + n" core-auto-rows></ion-textarea>
         </ion-item>
-        <ion-item>
-            <ion-label><core-format-text [text]="field.grade1"></core-format-text></ion-label>
-            <ion-radio [value]="1" [disabled]="!edit"></ion-radio>
+        <ion-item *ngIf="!edit" text-wrap>
+            <h2>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
+            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
         </ion-item>
-    </ion-list>
-    <ion-item *ngIf="edit">
-        <ion-label stacked>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
-        <ion-textarea aria-multiline="true" [(ngModel)]="selectedValues[n].peercomment" [name]="'peercomment_' + n" core-auto-rows></ion-textarea>
-    </ion-item>
-    <ion-item *ngIf="!edit" text-wrap>
-        <h2>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-        <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
-    </ion-item>
-</ion-card>
+    </ion-card>
+</ng-container>
diff --git a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
index ad4a76917..2d1f0be61 100644
--- a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
+++ b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
@@ -1,13 +1,15 @@
-<ion-card *ngFor="let field of assessment.form.fields; let n = index">
-    <ion-item text-wrap>
-        <h2 [core-mark-required]="edit">{{ field.dimtitle }}</h2>
-        <core-format-text [text]="field.description"></core-format-text>
-        <core-input-errors *ngIf="edit && fieldErrors['chosenlevelid_' + n]" [errorText]="fieldErrors['chosenlevelid_' + n]"></core-input-errors>
-    </ion-item>
-    <ion-list radio-group [(ngModel)]="selectedValues[n].chosenlevelid" [name]="'chosenlevelid_' + n">
-        <ion-item *ngFor="let subfield of field.fields">
-            <ion-label><p><core-format-text [text]="subfield.definition"></core-format-text></p></ion-label>
-            <ion-radio [value]="subfield.levelid" [disabled]="!edit"></ion-radio>
+<ng-container *ngFor="let field of assessment.form.fields; let n = index">
+    <ion-card *ngIf="n < assessment.form.dimenssionscount">
+        <ion-item text-wrap>
+            <h2 [core-mark-required]="edit">{{ field.dimtitle }}</h2>
+            <core-format-text [text]="field.description"></core-format-text>
+            <core-input-errors *ngIf="edit && fieldErrors['chosenlevelid_' + n]" [errorText]="fieldErrors['chosenlevelid_' + n]"></core-input-errors>
         </ion-item>
-    </ion-list>
-</ion-card>
+        <ion-list radio-group [(ngModel)]="selectedValues[n].chosenlevelid" [name]="'chosenlevelid_' + n">
+            <ion-item *ngFor="let subfield of field.fields">
+                <ion-label><p><core-format-text [text]="subfield.definition"></core-format-text></p></ion-label>
+                <ion-radio [value]="subfield.levelid" [disabled]="!edit"></ion-radio>
+            </ion-item>
+        </ion-list>
+    </ion-card>
+</ng-container>
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 5bfddf2e8..1e400d8c3 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
@@ -17,7 +17,7 @@
             <ion-item stacked *ngIf="edit">
                 <ion-label stacked [core-mark-required]="overallFeedkbackRequired">{{ 'addon.mod_workshop.feedbackauthor' | translate }}</ion-label>
                 <core-rich-text-editor item-content [control]="feedbackControl" [component]="component" [componentId]="workshop.coursemodule" (contentChanged)="onFeedbackChange($event)"></core-rich-text-editor>
-                <core-input-errors item-content *ngIf="overallFeedkbackRequired && fieldErrors['feedbackauthor']" [errorText]="fieldErrors['feedbackauthor']"></core-input-errors>
+                <core-input-errors item-content *ngIf="overallFeedkbackRequired && fieldErrors && fieldErrors['feedbackauthor']" [errorText]="fieldErrors['feedbackauthor']"></core-input-errors>
             </ion-item>
             <core-attachments *ngIf="edit && workshop.overallfeedbackfiles" [files]="data.assessment.feedbackattachmentfiles" [maxSize]="workshop.overallfeedbackmaxbytes"
                 [maxSubmissions]="workshop.overallfeedbackfiles" [component]="component" [componentId]="componentId" [allowOffline]="true"></core-attachments>