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

MOBILE-4553 quiz: Hide ungraded marks 

This makes it consistent with the way it works in the LMS, we're also
relying on attempt.sumgrades because grade item marks are never null.
See MDL-81599.
main
Noel De Martin 2024-04-18 12:21:17 +02:00
parent 222a6ebce2
commit 59aac915a2
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons/mod/quiz/pages/attempt/attempt.html
View File

@ -30,7 +30,7 @@
<p *ngFor="let sentence of attempt.readableState">{{ sentence }}</p> <p *ngFor="let sentence of attempt.readableState">{{ sentence }}</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ng-container *ngIf="attempt.finished"> <ng-container *ngIf="attempt.finished && attempt.sumgrades !== null">
<ion-item *ngFor="let gradeItemMark of attempt.gradeitemmarks ?? []" class="ion-text-wrap"> <ion-item *ngFor="let gradeItemMark of attempt.gradeitemmarks ?? []" class="ion-text-wrap">
<ion-label> <ion-label>
<p class="item-heading">{{ gradeItemMark.name }} / {{ gradeItemMark.maxgrade }}</p> <p class="item-heading">{{ gradeItemMark.name }} / {{ gradeItemMark.maxgrade }}</p>
@ -38,7 +38,7 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
</ng-container> </ng-container>
<ion-item class="ion-text-wrap" *ngIf="quiz!.showMarkColumn && attempt.readableMark !== ''"> <ion-item class="ion-text-wrap" *ngIf="quiz!.showMarkColumn && attempt.readableMark !== '' && attempt.sumgrades !== null">
<ion-label> <ion-label>
<p class="item-heading">{{ 'addon.mod_quiz.marks' | translate }} / {{ quiz!.sumGradesFormatted }}</p> <p class="item-heading">{{ 'addon.mod_quiz.marks' | translate }} / {{ quiz!.sumGradesFormatted }}</p>
<p>{{ attempt.readableMark }}</p> <p>{{ attempt.readableMark }}</p>

2
src/addons/mod/quiz/pages/review/review.html
View File

@ -60,7 +60,7 @@
<p>{{ gradeItemMark.grade }}</p> <p>{{ gradeItemMark.grade }}</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item class="ion-text-wrap" *ngIf="readableMark"> <ion-item class="ion-text-wrap" *ngIf="readableMark && attempt?.sumgrades !== null">
<ion-label> <ion-label>
<p class="item-heading">{{ 'addon.mod_quiz.marks' | translate }}</p> <p class="item-heading">{{ 'addon.mod_quiz.marks' | translate }}</p>
<p>{{ readableMark }}</p> <p>{{ readableMark }}</p>

18
src/addons/mod/quiz/pages/review/review.ts
View File

@ -286,13 +286,17 @@ export class AddonModQuizReviewPage implements OnInit {
} }
// Treat grade item marks. // Treat grade item marks.
this.gradeItemMarks = this.attempt.gradeitemmarks?.map((gradeItemMark) => ({ if (this.attempt.sumgrades === null || !this.attempt.gradeitemmarks) {
name: gradeItemMark.name, this.gradeItemMarks = [];
grade: Translate.instant('addon.mod_quiz.outof', { $a: { } else {
grade: AddonModQuiz.formatGrade(gradeItemMark.grade, this.quiz?.decimalpoints), this.gradeItemMarks = this.attempt.gradeitemmarks.map((gradeItemMark) => ({
maxgrade: AddonModQuiz.formatGrade(gradeItemMark.maxgrade, this.quiz?.decimalpoints), name: gradeItemMark.name,
} }), grade: Translate.instant('addon.mod_quiz.outof', { $a: {
})) ?? []; grade: AddonModQuiz.formatGrade(gradeItemMark.grade, this.quiz?.decimalpoints),
maxgrade: AddonModQuiz.formatGrade(gradeItemMark.maxgrade, this.quiz?.decimalpoints),
} }),
}));
}
// Treat grade. // Treat grade.
if (this.options && this.options.someoptions.marks >= AddonModQuizProvider.QUESTION_OPTIONS_MARK_AND_MAX && if (this.options && this.options.someoptions.marks >= AddonModQuizProvider.QUESTION_OPTIONS_MARK_AND_MAX &&