mes-9250-VehicleCheckWording

src/app/pages/debrief/components/vehicle-checks-card-cat-b/__tests__/vehicle-checks-card.cat-b.spec.ts

@@ -98,7 +98,7 @@ describe('VehicleChecksCardCatBComponent', () => {
           store$.dispatch(TellMeQuestionDrivingFault());
           fixture.detectChanges();
           const tellMeQuestionText = fixture.debugElement.query(By.css('#tell-me-question')).nativeElement;
-          expect(tellMeQuestionText.innerHTML.trim()).toBe('Tell me question - Driving fault');
+          expect(tellMeQuestionText.innerHTML.trim()).toBe('Tell me question - Incorrect');
         });
         it('should indicate a tell me fault in Welsh for a Welsh test', (done) => {
           fixture.detectChanges();
@@ -107,10 +107,9 @@ describe('VehicleChecksCardCatBComponent', () => {
           translate.use('cy').subscribe(() => {
             fixture.detectChanges();
             const tellMeQuestionText = fixture.debugElement.query(By.css('#tell-me-question')).nativeElement;
-            const questionText = (<any>welshTranslations).debrief.tellMeQuestion;
-            const drvingFaultText = (<any>welshTranslations).debrief.drivingFault;
+            const { tellMeQuestion, incorrect } = (<any>welshTranslations).debrief;
             expect(tellMeQuestionText.innerHTML.trim())
-              .toBe(`${questionText} - ${drvingFaultText}`);
+              .toBe(`${tellMeQuestion} - ${incorrect}`);
             done();
           });
         });
@@ -122,7 +121,7 @@ describe('VehicleChecksCardCatBComponent', () => {
           translate.use('en').subscribe(() => {
             fixture.detectChanges();
             const showMeQuestionText = fixture.debugElement.query(By.css('#show-me-question-outcome-df')).nativeElement;
-            expect(showMeQuestionText.innerHTML.trim()).toBe('Show me question - Driving fault');
+            expect(showMeQuestionText.innerHTML.trim()).toBe('Show me question - Incorrect');
           });
         });
         it('should indicate a show me driving fault in Welsh for a Welsh test', (done) => {
@@ -132,8 +131,8 @@ describe('VehicleChecksCardCatBComponent', () => {
           translate.use('cy').subscribe(() => {
             fixture.detectChanges();
             const showMeQuestionText = fixture.debugElement.query(By.css('#show-me-question-outcome-df')).nativeElement;
-            const { showMeQuestion, drivingFault } = (<any>welshTranslations).debrief;
-            const expectedTranslation = `${showMeQuestion} - ${drivingFault}`;
+            const { showMeQuestion, incorrect } = (<any>welshTranslations).debrief;
+            const expectedTranslation = `${showMeQuestion} - ${incorrect}`;
             expect(showMeQuestionText.innerHTML.trim()).toBe(expectedTranslation);
             done();
           });

src/app/pages/debrief/components/vehicle-checks-card-cat-b/vehicle-checks-card.cat-b.html

@@ -8,16 +8,15 @@
         </ion-col>
         <ion-col class="down-padding ion-align-items-start">
           <div id="tell-me-question" *ngIf="componentState.tellMeQuestionHasFault$ | async">
-            {{ 'debrief.tellMeQuestion' | translate }} - {{ displayIncorrect ? ('debrief.incorrect' | translate) :
-            ('debrief.drivingFault' | translate) }}
+            {{ 'debrief.tellMeQuestion' | translate }} - {{ 'debrief.incorrect' | translate }}
           </div>
           <div
             id="show-me-question"
             *ngIf="componentState.hasShowMeFault$ | async"
             [ngSwitch]="componentState.showMeQuestionOutcome$ | async"
           >
             <span *ngSwitchCase="'DF'" id="show-me-question-outcome-df">
-              {{ 'debrief.showMeQuestion' | translate }} - {{ 'debrief.drivingFault' | translate }}
+              {{ 'debrief.showMeQuestion' | translate }} - {{ 'debrief.incorrect' | translate }}
             </span>
             <span *ngSwitchCase="'S'" id="show-me-question-outcome-s">
               {{ 'debrief.showMeQuestion' | translate }} - {{ 'debrief.seriousFault' | translate }}

src/app/pages/debrief/components/vehicle-checks-card-cat-b/vehicle-checks-card.cat-b.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Store, select } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -28,9 +28,6 @@ export class VehicleChecksCardCatBComponent implements OnInit {
 
   componentState: VehicleChecksCardComponentState;
 
-  @Input()
-  displayIncorrect: boolean = false;
-
   constructor(private store$: Store<StoreModel>) { }
 
   ngOnInit(): void {

src/app/pages/debrief/debrief.page.html

@@ -41,11 +41,7 @@
   >
   </eco-debrief-card>
 
-  <vehicle-checks-card-cat-b
-    *ngIf="isCategoryBTest()"
-    [displayIncorrect]="pageState.vehicleChecksShowIncorrect$ | async"
-  >
-  </vehicle-checks-card-cat-b>
+  <vehicle-checks-card-cat-b *ngIf="isCategoryBTest()"> </vehicle-checks-card-cat-b>
 
   <vehicle-checks-card
     *ngIf="showVehicleChecksArrayCard()"

src/app/pages/debrief/debrief.page.ts

@@ -71,7 +71,6 @@ interface DebriefPageState {
   seriousFaults$: Observable<string[]>;
   dangerousFaults$: Observable<string[]>;
   drivingFaults$: Observable<(FaultSummary)[]>;
-  vehicleChecksShowIncorrect$: Observable<boolean>;
   drivingFaultCount$: Observable<number>;
   etaFaults$: Observable<ETA>;
   ecoFaults$: Observable<Eco>;
@@ -171,13 +170,6 @@ export class DebriefPage extends PracticeableBasePageComponent implements OnInit
         map(([data, category]) => this.faultSummaryProvider.getDrivingFaultsList(data, category as TestCategory)),
         take(1),
       ),
-      vehicleChecksShowIncorrect$: currentTest$.pipe(
-        select(getTestData),
-        withLatestFrom(testCategory$),
-        map(([data, category]) => this.faultSummaryProvider
-          .shouldShowIncorrect(data, category as TestCategory)),
-        take(1),
-      ),
       drivingFaultCount$: currentTest$.pipe(
         select(getTestData),
         withLatestFrom(testCategory$),

src/app/pages/office/components/fault-comment/fault-comment.html

@@ -1,7 +1,12 @@
 <ion-grid>
   <ion-row class="padding">
     <div class="validation-bar" [class.ng-invalid]="invalid"></div>
-    <ion-col class="fault-badge ion-align-self-start ion-no-padding" size="4" [ngSwitch]="faultType">
+    <ion-col
+      [class.fault-badge-top-padding]="accessibilityService.getTextZoomClass() !== 'text-zoom-regular'"
+      class="fault-badge ion-align-self-start ion-no-padding"
+      size="4"
+      [ngSwitch]="faultType"
+    >
       <dangerous-fault-badge
         [showBadge]="true"
         *ngSwitchCase="'dangerous'"

src/app/pages/office/components/fault-comment/fault-comment.scss

@@ -1,9 +1,12 @@
 :host {
   .fault-badge {
-    padding-top: 5px;
     padding-left: 10px;
   }
 
+  .fault-badge-top-padding {
+    padding-top: 5px;
+  }
+
   .padding {
     padding-top: 15px;
   }

src/app/pages/office/components/fault-comment/fault-comment.ts

@@ -8,6 +8,7 @@ import {
   OutcomeBehaviourMapProvider,
   VisibilityType,
 } from '@providers/outcome-behaviour-map/outcome-behaviour-map';
+import { AccessibilityService } from '@providers/accessibility/accessibility.service';
 
 enum ValidFaultTypes {
   DRIVING = 'driving',
@@ -58,7 +59,9 @@ export class FaultCommentComponent implements OnChanges {
 
   faultCommentCharsRemaining: number = null;
   static readonly fieldName: string = 'faultComment';
-  constructor(private outcomeBehaviourProvider: OutcomeBehaviourMapProvider) { }
+  constructor(private outcomeBehaviourProvider: OutcomeBehaviourMapProvider,
+    protected accessibilityService: AccessibilityService
+  ) { }
 
   ngOnChanges(): void {
     // mes 2393 - need to remove validations if < 16 faults as comments can

src/app/pages/view-test-result/components/debrief-card/debrief-card.html

@@ -76,7 +76,6 @@ <h2 class="des-header-style-4" id="view-test-result-debrief-title">Debrief</h2>
 
       <vehicle-checks-data-row
         *ngIf="!delegatedTest && !isMod1() && !isMod2()"
-        [shouldDisplayIncorrect]="displayIncorrectText"
         [label]="'Tell me question(s)'"
         [data]="tellMeQuestions"
       >

src/app/pages/view-test-result/components/debrief-card/debrief-card.ts

@@ -46,9 +46,6 @@ export class DebriefCardComponent implements OnInit {
   @Input()
   delegatedTest: boolean = false;
 
-  @Input()
-  displayIncorrectText: boolean = false;
-
   showMeQuestion: VehicleChecksQuestion;
   tellMeQuestion: VehicleChecksQuestion;
   manoeuvres: string[];

src/app/pages/view-test-result/components/vehicle-checks-data-row/vehicle-checks-data-row.html

@@ -8,10 +8,7 @@
       <div *ngFor="let item of data;">
         <div class="mes-data large">
           <span class="mes-data large bold">{{item.code}} </span>- {{item.description}}
-          <span class="mes-data large bold" *ngIf="shouldShowFault(item.outcome) && !shouldDisplayIncorrect">
-            (1 driving fault)
-          </span>
-          <span class="mes-data large bold" *ngIf="shouldDisplayIncorrect"> (Incorrect) </span>
+          <span class="mes-data large bold" *ngIf="shouldShowFault(item.outcome)"> (Incorrect) </span>
         </div>
       </div>
     </ng-template>

src/app/pages/view-test-result/view-test-result.page.html

@@ -72,7 +72,6 @@
       [dangerousFaults]="getDangerousFaults()"
       [data]="testResult.testData"
       [category]="testResult.category"
-      [displayIncorrectText]="displayIncorrectText"
       [delegatedTest]="testResult['delegatedTest']"
     >
     </debrief-card>

src/app/pages/view-test-result/view-test-result.page.ts

@@ -60,7 +60,6 @@ export class ViewTestResultPage extends BasePageComponent implements OnInit {
   additionalErrorText: boolean;
   reEnterEmailSubscription: Subscription;
   reEnterEmail: RegeneratedEmails = null;
-  displayIncorrectText: boolean = false;
 
   constructor(
     public modalCtrl: ModalController,
@@ -91,10 +90,6 @@ export class ViewTestResultPage extends BasePageComponent implements OnInit {
       .pipe(
         map((response: HttpResponse<any>): string => response.body),
         map((data) => this.testResult = this.compressionProvider.extract<TestResultSchemasUnion>(data)),
-        tap((testResult) => {
-          this.displayIncorrectText = this.faultSummaryProvider
-            .shouldShowIncorrect(testResult.testData, testResult.category as TestCategory);
-        }),
         tap(async () => this.handleLoadingUI(false)),
         catchError(async (err) => {
           this.store$.dispatch(SaveLog({