fix(client): When Student subtest report uses

custom score, the value is the actual percentage value Refs #3415 Refs #3416
Tangerine-Community · Jul 25, 2024 · 98f049b · 98f049b
1 parent 27331d7
commit 98f049b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/client/src/app/class/_services/dashboard.service.ts b/client/src/app/class/_services/dashboard.service.ts
@@ -430,7 +430,7 @@ export class DashboardService {
         totalIncorrect: totalIncorrect,
         maxValueAnswer: maxValueAnswer,
         totalCorrect: totalCorrect,
-        scorePercentageCorrect: scorePercentageCorrect,
+        scorePercentageCorrect: customScore ? customScore : scorePercentageCorrect,
         duration: duration,
         customScore: customScore
       };

diff --git a/client/src/app/class/reports/student-subtest-report/student-subtest-report.component.html b/client/src/app/class/reports/student-subtest-report/student-subtest-report.component.html
@@ -74,9 +74,12 @@ <h2>{{subtestReport.label}}</h2>
                 <td>
               <span *ngFor="let res of generateArray(item.value)">
                <ng-container *ngIf="res.value">
-                 <ng-container *ngIf="res.value.percentage">
+                 <ng-container *ngIf="res.value.percentage && !res.value.customScore">
                  ({{tNumber(res.value.rawScore)}}/{{tNumber(res.value.totalGridAnswers)}}) {{tNumber(res.value.percentage)}}
                  </ng-container>
+                 <ng-container *ngIf="res.value.customScore">
+                 {{(tNumber(res.value.customScore))|number : '1.2-2'}}%
+                 </ng-container>
                  <ng-container *ngIf="!res.value.percentage">
                  ({{tNumber(res.value.rawScore)}}/{{tNumber(res.value.totalGridAnswers)}})
                  </ng-container>

diff --git a/client/src/app/class/reports/student-subtest-report/student-subtest-report.component.ts b/client/src/app/class/reports/student-subtest-report/student-subtest-report.component.ts
@@ -217,7 +217,8 @@ export class StudentSubtestReportComponent implements OnInit, AfterViewChecked {
           rawScore: result.score,
           totalGridAnswers: result.maxValueAnswer,
           percentage: percentage,
-          totalCorrect: totalCorrect
+          totalCorrect: totalCorrect,
+          customScore: result.customScore
         };
         resultObject[category] = scores;
         const currentTotal = this.totals[category];