MES-7630 / CP (#495)

* Add Accompanied by and Vehicle details fields to office page for Cat B

* fix linting

src/app/pages/office/cat-b/__tests__/office.cat-b.page.spec.ts

@@ -44,6 +44,14 @@ import { ActivityCodeDescription, ActivityCodeModel } from '@shared/constants/ac
 import { ActivityCodeComponent } from '@components/common/activity-code/activity-code';
 import { ReactiveFormsModule } from '@angular/forms';
 import { ToastControllerMock } from '@shared/mocks/toast-controller.mock';
+import {
+  VehicleDetailsCardComponent,
+} from '@pages/waiting-room-to-car/components/vehicle-details-card/vehicle-details-card';
+import { VehicleDetailsComponent } from '@pages/waiting-room-to-car/components/vehicle-details/vehicle-details';
+import {
+  AccompanimentCardComponent,
+} from '@pages/waiting-room-to-car/components/accompaniment-card/accompaniment-card';
+import { AccompanimentComponent } from '@pages/waiting-room-to-car/components/accompaniment/accompaniment';
 import { DateOfTest } from '../../components/date-of-test/date-of-test';
 import { CandidateSectionComponent } from '../../components/candidate-section/candidate-section';
 import { OfficeCatBPage } from '../office.cat-b.page';
@@ -80,6 +88,10 @@ describe('OfficeCatBPage', () => {
         MockComponent(CandidateSectionComponent),
         MockComponent(DateOfTest),
         MockComponent(TrueLikenessComponent),
+        MockComponent(VehicleDetailsCardComponent),
+        MockComponent(VehicleDetailsComponent),
+        MockComponent(AccompanimentCardComponent),
+        MockComponent(AccompanimentComponent),
       ],
       imports: [
         IonicModule,

src/app/pages/office/cat-b/office.cat-b.module.ts

@@ -7,6 +7,9 @@ import { OfficeCatBPageRoutingModule } from '@pages/office/cat-b/office.cat-b-ro
 import { IonicModule } from '@ionic/angular';
 import { ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
+import {
+  WaitingRoomToCarComponentsModule,
+} from '@pages/waiting-room-to-car/components/waiting-room-to-car.components.module';
 import { OfficeEffects } from '../office.effects';
 import { OfficeAnalyticsEffects } from '../office.analytics.effects';
 import { OfficeCatBPage } from './office.cat-b.page';
@@ -26,6 +29,7 @@ import { OfficeCatBPage } from './office.cat-b.page';
     IonicModule,
     ReactiveFormsModule,
     CommonModule,
+    WaitingRoomToCarComponentsModule,
   ],
   providers: [
     FaultSummaryProvider,

src/app/pages/office/cat-b/office.cat-b.page.html

@@ -104,6 +104,24 @@ <h4>Test summary</h4>
                                             (weatherConditionsChange)="weatherConditionsChanged($event)">
                         </weather-conditions>
 
+                        <accompaniment-card [formGroup]="form"
+                                            [instructorAccompaniment]="pageState.instructorAccompaniment$ | async"
+                                            [supervisorAccompaniment]="pageState.supervisorAccompaniment$ | async"
+                                            [otherAccompaniment]="pageState.otherAccompaniment$ | async"
+                                            [interpreterAccompaniment]="pageState.interpreterAccompaniment$ | async"
+                                            (instructorAccompanimentChange)="instructorAccompanimentToggled()"
+                                            (supervisorAccompanimentChange)="supervisorAccompanimentToggled()"
+                                            (otherAccompanimentChange)="otherAccompanimentToggled()"
+                                            (interpreterAccompanimentChange)="interpreterAccompanimentToggled()">
+                        </accompaniment-card>
+
+                        <vehicle-details-card [formGroup]="form"
+                                              [schoolVehicleDetails]="pageState.schoolCar$ | async"
+                                              [dualVehicleDetails]="pageState.dualControls$ | async"
+                                              (schoolVehicleDetailsChange)="schoolCarToggled()"
+                                              (dualVehicleDetailsChange)="dualControlsToggled()">
+                        </vehicle-details-card>
+
                         <additional-information [display]="pageState.displayAdditionalInformation$ | async"
                                                 [additionalInformation]="pageState.additionalInformation$ | async"
                                                 [formGroup]="form" [outcome]="pageState.testOutcome$ | async"

src/app/shared/classes/test-flow-base-pages/office/office-base-page.ts

@@ -92,7 +92,11 @@ import {
   ProvisionalLicenseNotReceived,
   ProvisionalLicenseReceived,
 } from '@store/tests/pass-completion/pass-completion.actions';
-import { GearboxCategoryChanged } from '@store/tests/vehicle-details/vehicle-details.actions';
+import {
+  DualControlsToggled,
+  GearboxCategoryChanged,
+  SchoolCarToggled,
+} from '@store/tests/vehicle-details/vehicle-details.actions';
 import { HealthDeclarationAccepted } from '@store/tests/post-test-declarations/post-test-declarations.actions';
 import { getPostTestDeclarations } from '@store/tests/post-test-declarations/post-test-declarations.reducer';
 import { getHealthDeclarationStatus } from '@store/tests/post-test-declarations/post-test-declarations.selector';
@@ -102,6 +106,17 @@ import {
 } from '@store/tests/communication-preferences/communication-preferences.actions';
 import { getPassCompletion } from '@store/tests/pass-completion/pass-completion.reducer';
 import { getPassCertificateNumber } from '@store/tests/pass-completion/pass-completion.selector';
+import {
+  InstructorAccompanimentToggled, InterpreterAccompanimentToggled, OtherAccompanimentToggled,
+  SupervisorAccompanimentToggled,
+} from '@store/tests/accompaniment/accompaniment.actions';
+import { getVehicleDetails } from '@store/tests/vehicle-details/cat-b/vehicle-details.cat-b.reducer';
+import { getDualControls, getSchoolCar } from '@store/tests/vehicle-details/cat-b/vehicle-details.cat-b.selector';
+import { getAccompaniment } from '@store/tests/accompaniment/accompaniment.reducer';
+import {
+  getInstructorAccompaniment, getInterpreterAccompaniment, getOtherAccompaniment,
+  getSupervisorAccompaniment,
+} from '@store/tests/accompaniment/accompaniment.selector';
 
 export interface CommonOfficePageState {
   activityCode$: Observable<ActivityCodeModel>;
@@ -146,6 +161,12 @@ export interface CommonOfficePageState {
   ecoFaults$: Observable<string>;
   seriousFaultCount$: Observable<number>;
   dangerousFaultCount$: Observable<number>;
+  schoolCar$: Observable<boolean>;
+  dualControls$: Observable<boolean>;
+  instructorAccompaniment$: Observable<boolean>;
+  supervisorAccompaniment$: Observable<boolean>;
+  otherAccompaniment$: Observable<boolean>;
+  interpreterAccompaniment$: Observable<boolean>;
 }
 
 export abstract class OfficeBasePageComponent extends PracticeableBasePageComponent {
@@ -444,6 +465,30 @@ export abstract class OfficeBasePageComponent extends PracticeableBasePageCompon
         select(getEco),
         select(getEcoFaultText),
       ),
+      schoolCar$: currentTest$.pipe(
+        select(getVehicleDetails),
+        select(getSchoolCar),
+      ),
+      dualControls$: currentTest$.pipe(
+        select(getVehicleDetails),
+        select(getDualControls),
+      ),
+      instructorAccompaniment$: currentTest$.pipe(
+        select(getAccompaniment),
+        select(getInstructorAccompaniment),
+      ),
+      supervisorAccompaniment$: currentTest$.pipe(
+        select(getAccompaniment),
+        select(getSupervisorAccompaniment),
+      ),
+      otherAccompaniment$: currentTest$.pipe(
+        select(getAccompaniment),
+        select(getOtherAccompaniment),
+      ),
+      interpreterAccompaniment$: currentTest$.pipe(
+        select(getAccompaniment),
+        select(getInterpreterAccompaniment),
+      ),
     };
   }
 
@@ -543,6 +588,30 @@ export abstract class OfficeBasePageComponent extends PracticeableBasePageCompon
     );
   }
 
+  instructorAccompanimentToggled(): void {
+    this.store$.dispatch(InstructorAccompanimentToggled());
+  }
+
+  supervisorAccompanimentToggled(): void {
+    this.store$.dispatch(SupervisorAccompanimentToggled());
+  }
+
+  interpreterAccompanimentToggled(): void {
+    this.store$.dispatch(InterpreterAccompanimentToggled());
+  }
+
+  otherAccompanimentToggled(): void {
+    this.store$.dispatch(OtherAccompanimentToggled());
+  }
+
+  dualControlsToggled(): void {
+    this.store$.dispatch(DualControlsToggled());
+  }
+
+  schoolCarToggled(): void {
+    this.store$.dispatch(SchoolCarToggled());
+  }
+
   debriefWitnessedChanged(debriefWitnessed: boolean) {
     this.store$.dispatch(debriefWitnessed ? DebriefWitnessed() : DebriefUnWitnessed());
   }