diff --git a/src/app/pages/debrief/debrief.page.ts b/src/app/pages/debrief/debrief.page.ts index bfc23fcd2..1b228e588 100644 --- 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 index c33ad5dfe..22452fe2c 100644 --- 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 @@

- {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}} + {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment

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 index 43c501990..de8b15a9c 100644 --- 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 @@

- {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}} + {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment

@@ -40,7 +40,7 @@

- {{testCategory === 'SC' ? 'Standards check':'ADI Part 3 Assessment'}} + {{testCategory === 'SC' ? 'Standards check':'ADI Part 3'}} assessment

diff --git a/src/app/providers/fault-count/fault-count.ts b/src/app/providers/fault-count/fault-count.ts index 44e01a1fb..fb45e83a6 100644 --- 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: