Fixed wording issues and removed button from rekey journey

dvsa · Sep 17, 2024 · a426dbc · a426dbc
1 parent cc115b9
commit a426dbc
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 4 deletions.
diff --git a/...ents/alternate-mot-evidence-description/alternate-mot-evidence-description.component.html b/...ents/alternate-mot-evidence-description/alternate-mot-evidence-description.component.html
@@ -1,6 +1,6 @@
 <ion-row class="spacing-padding" [class.mes-row-separator]="shouldHaveSeparator" [formGroup]="formGroup">
   <ion-col class="component-label ion-align-self-start col-padding" size="33">
-    <label>Alternative evidence details</label>
+    <label>Alternative MOT evidence details</label>
   </ion-col>
 
   <ion-col size="58" class="ion-align-self-center ion-padding-start">

diff --git a/src/app/pages/view-test-result/components/vehicle-details-card/vehicle-details-card.html b/src/app/pages/view-test-result/components/vehicle-details-card/vehicle-details-card.html
@@ -75,7 +75,7 @@ <h2 class="des-header-style-4" id="view-test-result-vehicle-details-title">Vehic
 
       <data-row
         *ngIf="data.motEvidenceProvided"
-        [label]="'Alternative evidence details'"
+        [label]="'Alternative MOT evidence details'"
         [value]="data.motEvidence"
       ></data-row>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-a-mod1/waiting-room-to-car.cat-a-mod1.page.html b/src/app/pages/waiting-room-to-car/cat-a-mod1/waiting-room-to-car.cat-a-mod1.page.html
@@ -47,6 +47,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-a-mod2/waiting-room-to-car.cat-a-mod2.page.html b/src/app/pages/waiting-room-to-car/cat-a-mod2/waiting-room-to-car.cat-a-mod2.page.html
@@ -67,6 +67,7 @@
                   [formGroup]="form"
                   [isPracticeMode]="isEndToEndPracticeMode"
                   [vehicleRegistration]="pageState.registrationNumber$ | async"
+                  [isRekeyMode]="pageState.isRekeyMode$ | async"
                 >
                 </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-adi-part2/waiting-room-to-car.cat-adi-part2.page.html b/src/app/pages/waiting-room-to-car/cat-adi-part2/waiting-room-to-car.cat-adi-part2.page.html
@@ -63,6 +63,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-adi-part3/waiting-room-to-car.cat-adi-part3.page.html b/src/app/pages/waiting-room-to-car/cat-adi-part3/waiting-room-to-car.cat-adi-part3.page.html
@@ -33,6 +33,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-b/waiting-room-to-car.cat-b.page.html b/src/app/pages/waiting-room-to-car/cat-b/waiting-room-to-car.cat-b.page.html
@@ -53,6 +53,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-c/waiting-room-to-car.cat-c.page.html b/src/app/pages/waiting-room-to-car/cat-c/waiting-room-to-car.cat-c.page.html
@@ -43,6 +43,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-cpc/waiting-room-to-car.cat-cpc.page.html b/src/app/pages/waiting-room-to-car/cat-cpc/waiting-room-to-car.cat-cpc.page.html
@@ -43,6 +43,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
             <ion-row *ngIf="(pageState.motEvidenceProvided$ | async) === false">

diff --git a/src/app/pages/waiting-room-to-car/cat-d/waiting-room-to-car.cat-d.page.html b/src/app/pages/waiting-room-to-car/cat-d/waiting-room-to-car.cat-d.page.html
@@ -43,6 +43,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-home-test/waiting-room-to-car.cat-home-test.page.html b/src/app/pages/waiting-room-to-car/cat-home-test/waiting-room-to-car.cat-home-test.page.html
@@ -56,6 +56,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/cat-manoeuvre/waiting-room-to-car.cat-manoeuvre.page.html b/src/app/pages/waiting-room-to-car/cat-manoeuvre/waiting-room-to-car.cat-manoeuvre.page.html
@@ -34,6 +34,7 @@
               [formGroup]="form"
               [isPracticeMode]="isEndToEndPracticeMode"
               [vehicleRegistration]="pageState.registrationNumber$ | async"
+              [isRekeyMode]="pageState.isRekeyMode$ | async"
             >
             </vehicle-registration>
 

diff --git a/src/app/pages/waiting-room-to-car/components/vehicle-registration/vehicle-registration.html b/src/app/pages/waiting-room-to-car/components/vehicle-registration/vehicle-registration.html
@@ -14,7 +14,7 @@
   <ion-col class="ion-align-self-center mes-padding-left">
     <ion-row class="spacing-row"></ion-row>
     <ion-row>
-      <ion-col class="display-flex" size="45">
+      <ion-col class="display-flex" [size]="isRekeyMode ? 57 : 45">
         <ion-input
           type="text"
           id="registration"
@@ -31,7 +31,7 @@
           pasteSanitiser
         ></ion-input>
       </ion-col>
-      <ion-col size="35">
+      <ion-col *ngIf="!isRekeyMode" size="35">
         <ion-button
           [disabled]="!((formControl.valid) && (networkState.getNetworkState() == ConnectionStatus.ONLINE || isPracticeMode))"
           class="mes-grey-button"

diff --git a/src/app/pages/waiting-room-to-car/components/vehicle-registration/vehicle-registration.ts b/src/app/pages/waiting-room-to-car/components/vehicle-registration/vehicle-registration.ts
@@ -29,6 +29,8 @@ export class VehicleRegistrationComponent implements OnChanges {
   formGroup: UntypedFormGroup;
   @Input()
   isPracticeMode: boolean;
+  @Input()
+  isRekeyMode: boolean;
 
   @Output()
   vehicleRegistrationChange = new EventEmitter<string>();

diff --git a/.../shared/classes/test-flow-base-pages/waiting-room-to-car/waiting-room-to-car-base-page.ts b/.../shared/classes/test-flow-base-pages/waiting-room-to-car/waiting-room-to-car-base-page.ts
@@ -85,6 +85,8 @@ import {
   getMotEvidenceProvided,
   getRegistrationNumber,
 } from '@store/tests/vehicle-details/vehicle-details.selector';
+import { getRekeyIndicator } from '@store/tests/rekey/rekey.reducer';
+import { isRekey } from '@store/tests/rekey/rekey.selector';
 
 export interface CommonWaitingRoomToCarPageState {
   candidateName$: Observable<string>;
@@ -103,6 +105,7 @@ export interface CommonWaitingRoomToCarPageState {
   motEvidenceProvided$: Observable<boolean>;
   isOffline$: Observable<boolean>;
   motEvidenceDescription$: Observable<string>;
+  isRekeyMode$: Observable<boolean>;
 }
 
 export const wrtcDestroy$ = new Subject<{}>();
@@ -168,6 +171,12 @@ export abstract class WaitingRoomToCarBasePageComponent extends PracticeableBase
       motEvidenceProvided$: currentTest$.pipe(select(getVehicleDetails), select(getMotEvidenceProvided)),
       motEvidenceDescription$: currentTest$.pipe(select(getVehicleDetails), select(getMotEvidence)),
       isOffline$: this.networkStateProvider.isOffline$,
+      isRekeyMode$: this.store$.pipe(
+        select(getTests),
+        select(getCurrentTest),
+        select(getRekeyIndicator),
+        select(isRekey)
+      ),
     };
   }