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

MOBILE-3320 workshop: Display '-' if no assessment grade

main
Dani Palou 2021-06-17 11:07:58 +02:00
parent c2e82f7ad1
commit 247505f2ba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/workshop/pages/assessment/assessment.html
View File

@ -70,7 +70,7 @@
<ion-item class="ion-text-wrap"> <ion-item class="ion-text-wrap">
<ion-label> <ion-label>
<h2>{{ 'addon.mod_workshop.gradinggradecalculated' | translate }}</h2> <h2>{{ 'addon.mod_workshop.gradinggradecalculated' | translate }}</h2>
<p>{{ assessment.gradinggrade }}</p> <p>{{ gradingGrade }}</p>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item class="ion-text-wrap" *ngIf="access?.canoverridegrades"> <ion-item class="ion-text-wrap" *ngIf="access?.canoverridegrades">

4
src/addons/mod/workshop/pages/assessment/assessment.ts
View File

@ -73,7 +73,8 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
weights: number[] = []; weights: number[] = [];
evaluateByProfile?: CoreUserProfile; evaluateByProfile?: CoreUserProfile;
evaluationGrades: CoreGradesMenuItem[] =[]; evaluationGrades: CoreGradesMenuItem[] = [];
gradingGrade?: string | number;
protected workshopId!: number; protected workshopId!: number;
protected originalEvaluation: AddonModWorkshopAssessmentEvaluation = { protected originalEvaluation: AddonModWorkshopAssessmentEvaluation = {
@ -193,6 +194,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy, CanLea
this.assessment = AddonModWorkshopHelper.realGradeValue(this.workshop, assessment); this.assessment = AddonModWorkshopHelper.realGradeValue(this.workshop, assessment);
this.evaluate.text = this.assessment.feedbackreviewer || ''; this.evaluate.text = this.assessment.feedbackreviewer || '';
this.evaluate.weight = this.assessment.weight; this.evaluate.weight = this.assessment.weight;
this.gradingGrade = this.assessment.gradinggrade ?? '-';
if (this.evaluating) { if (this.evaluating) {
if (this.access.canallocate) { if (this.access.canallocate) {