Reword TR title; Update debrief selectors with SC; Update FaultCountP…

…rovider (#1026)
dvsa · Feb 8, 2023 · 38abeb7 · 38abeb7
1 parent f582aef
commit 38abeb7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/app/pages/debrief/debrief.page.ts b/src/app/pages/debrief/debrief.page.ts
@@ -325,14 +325,14 @@ export class DebriefPage extends PracticeableBasePageComponent {
       ),
       grade$: currentTest$.pipe(
         withLatestFrom(testCategory$),
-        filter(([, category]) => category === TestCategory.ADI3),
+        filter(([, category]) => isAnyOf(category, [TestCategory.ADI3, TestCategory.SC])),
         map(([data, category]) => this.testDataByCategoryProvider.getTestDataByCategoryCode(category)(data)),
         select(getReview),
         select(getGrade),
       ),
       immediateDanger$: currentTest$.pipe(
         withLatestFrom(testCategory$),
-        filter(([, category]) => category === TestCategory.ADI3),
+        filter(([, category]) => isAnyOf(category, [TestCategory.ADI3, TestCategory.SC])),
         map(([data, category]) => this.testDataByCategoryProvider.getTestDataByCategoryCode(category)(data)),
         select(getReview),
         select(getImmediateDanger),

diff --git a/src/app/pages/test-report-dashboard/test-report-dashboard.page.html b/src/app/pages/test-report-dashboard/test-report-dashboard.page.html
@@ -15,7 +15,7 @@
     <ion-row class="mes-full-width-card-small-top ion-nowrap">
         <ion-col size="60">
             <h2 id="adi-pt3-dashboard-title" class="normal-font-weight ion-padding-start">
-                {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}}
+                {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment
             </h2>
         </ion-col>
         <ion-col>

diff --git a/src/app/pages/test-report/cat-adi-part3/test-report.cat-adi-part3.page.html b/src/app/pages/test-report/cat-adi-part3/test-report.cat-adi-part3.page.html
@@ -13,7 +13,7 @@
         <ion-row class="mes-full-width-card-small-top ion-nowrap">
             <ion-col size="60">
                 <h2 id="adi-pt3-assessment-lesson-theme-title" class="normal-font-weight ion-padding-start">
-                    {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}}
+                    {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment
                 </h2>
             </ion-col>
             <ion-col size="36">
@@ -40,7 +40,7 @@ <h2 id="adi-pt3-lesson-theme-title" class="ion-float-right normal-font-weight io
         <ion-row class="mes-full-width-card-small-top ion-nowrap">
             <ion-col size="60">
                 <h2 id="adi-pt3-assessment-test-report-title" class="normal-font-weight ion-padding-start">
-                    {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}}
+                    {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment
                 </h2>
             </ion-col>
             <ion-col size="36">

diff --git a/src/app/providers/fault-count/fault-count.ts b/src/app/providers/fault-count/fault-count.ts
@@ -31,10 +31,10 @@ export class FaultCountProvider {
       case TestCategory.ADI2:
         return FaultCountADIPart2Helper.getDrivingFaultSumCountCatADIPart2(data);
       case TestCategory.ADI3:
-      case TestCategory.BE:
-        return FaultCountBEHelper.getDrivingFaultSumCountCatBE(data);
       case TestCategory.SC:
         return 0;
+      case TestCategory.BE:
+        return FaultCountBEHelper.getDrivingFaultSumCountCatBE(data);
       case TestCategory.B:
         return FaultCountBHelper.getDrivingFaultSumCountCatB(data);
       case TestCategory.C1: