From 98f049bb712033dd09c5415c292964b330308052 Mon Sep 17 00:00:00 2001
From: Evans Dianga <evans@itsevans.com>
Date: Thu, 25 Jul 2024 14:21:10 +0300
Subject: [PATCH] fix(client): When Student subtest report uses custom score,
 the value is the actual percentage value

Refs Tangerine-Community/Tangerine#3415
Refs Tangerine-Community/Tangerine#3416
---
 client/src/app/class/_services/dashboard.service.ts          | 2 +-
 .../student-subtest-report.component.html                    | 5 ++++-
 .../student-subtest-report.component.ts                      | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/app/class/_services/dashboard.service.ts b/client/src/app/class/_services/dashboard.service.ts
index 87995e4386..387ce1c545 100644
--- 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
index 6bc2c51987..285ef9035b 100644
--- 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
index cda13a7afd..95468e6695 100644
--- 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];