feat(avvikelserapport): show selected questions in preview, renaming. TV-633-2

Squashed commit of the following:

commit a6bb12c71204074f5c7c8b753ca12e8cb779c90e
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Sep 23 11:51:53 2021 +0200

    TV-633-2 show selected questions in preview, renaming

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/deltagare-avvikelse/components/deltagare-confirm-form/deltagare-confirm-form.component.html

@@ -28,7 +28,7 @@
     <p>{{formGroup.get('dayOrPartOfDay').value === 'HELDAG' ? 'Heldag' : 'Del av dag'}}</p>
 
     <ng-container *ngIf="formGroup.get('dayOrPartOfDay').value === 'DEL_AV_DAG'">
-      <h3 class="deltagare-confirm-header">Startid</h3>
+      <h3 class="deltagare-confirm__header" class="deltagare-confirm-header">Startid</h3>
       <p>{{formGroup?.get('timepickerFormGroup').get('startTime').value}}</p>
 
       <h3 class="deltagare-confirm-header">Sluttid</h3>
@@ -37,20 +37,32 @@
   </ng-container>
 
   <ng-container *ngIf="formGroup?.get('alternative').value === 'avvikelse'">
-    <h3 class="deltagare-confirm-header">Avvikelseoorsak</h3>
+    <h3 class="deltagare-confirm__header" class="deltagare-confirm-header">Avvikelseoorsak</h3>
     <ng-container *ngFor="let orsak of avvikelseOrsaker">
       <p *ngIf="orsak.value == formGroup?.get('orsakerFormGroup').get('orsaker').value">{{orsak.name}}</p>
     </ng-container>
 
-    <h3 class="deltagare-confirm-header">Fråga 1</h3>
+    <ng-container *ngFor="let fraga of fragor1">
+      <h3
+        *ngIf="fraga.id.includes(formGroup?.get('orsakerFormGroup').get('orsaker').value)"
+        class="deltagare-confirm__header"
+      >
+        {{fraga.name}}
+      </h3>
+    </ng-container>
     <p>{{formGroup?.get('fragorFormGroup').get('fraga1').value}}</p>
 
-    <ng-container *ngIf="formGroup?.get('fragorFormGroup').get('fraga2').value">
+    <ng-container *ngFor="let fraga of fragor2">
-      <h3 class="deltagare-confirm-header">Fråga 2</h3>
+      <h3
-      <p>{{formGroup?.get('fragorFormGroup').get('fraga2').value}}</p>
+        *ngIf="formGroup?.get('fragorFormGroup').get('fraga2').value && fraga.id.includes(formGroup?.get('orsakerFormGroup').get('orsaker').value)"
+        class="deltagare-confirm__header"
+      >
+        {{fraga.name}}
+      </h3>
     </ng-container>
+    <p>{{formGroup?.get('fragorFormGroup').get('fraga2').value}}</p>
 
-    <h3 class="deltagare-confirm-header">Datum</h3>
+    <h3 class="deltagare-confirm__header" class="deltagare-confirm-header">Datum</h3>
     <p>{{formGroup?.get('date').value}}</p>
   </ng-container>
 </section>

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/deltagare-avvikelse/components/deltagare-confirm-form/deltagare-confirm-form.component.ts

@@ -1,5 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
+import { FragorForAvvikelser } from '@msfa-models/fragor-for-avvikelser.model';
 import { OrsaksKoderAvvikelse } from '@msfa-models/orsaks-koder-avvikelse.model';
 import { KandaAvvikelseKoder, OrsaksKoderFranvaro } from '@msfa-models/orsaks-koder-franvaro.model';
 
@@ -14,4 +15,6 @@ export class DeltagareConfirmFormComponent {
   @Input() orsakskoderfranvaro: OrsaksKoderFranvaro[];
   @Input() andraKandaOrsaker: KandaAvvikelseKoder[];
   @Input() avvikelseOrsaker: OrsaksKoderAvvikelse[];
+  @Input() fragor1: FragorForAvvikelser[];
+  @Input() fragor2: FragorForAvvikelser[];
 }

apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/deltagare-avvikelse/deltagare-avvikelse.component.html

@@ -102,6 +102,8 @@
       [orsakskoderfranvaro]="franvaroOrsaker$ | async"
       [andraKandaOrsaker]="andraKandaOrsaker$ | async"
       [avvikelseOrsaker]="avvikelseOrsaker$ | async"
+      [fragor1]="fragor1$ | async"
+      [fragor2]="fragor2$ | async"
     ></msfa-deltagare-confirm-form>
 
     <div class="deltagare-avvikelse__step-buttons-wrapper">
@@ -129,10 +131,6 @@
     </div>
   </msfa-report-layout>
 
-  <msfa-confirm-dialog
+  <msfa-confirm-dialog [openConfirmDialog]="openConfirmDialog" (confirmDialogChanged)="setConfirmDialogChanged($event)">
-    [openConfirmDialog]="openConfirmDialog"
-    [itemToConfirm]="alternativeFormControl.value === 'avvikelse' ? 'avvikelse' : 'frånvaro' + 'rapport'"
-    (confirmDialogChanged)="setConfirmDialogChanged($event)"
-  >
   </msfa-confirm-dialog>
 </msfa-layout>

apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.html

@@ -6,9 +6,9 @@
   (afOnInactive)="closeConfirmDialog()"
   afHeading="Bekräfta"
   afHeadingLevel="h2"
-  [afAriaLabel]="'Bekräfta skicka in ' + itemToConfirm"
+  [afAriaLabel]="'Bekräfta att du vill skicka in en avvikelserapport'"
   afPrimaryButtonText="Skicka"
   afSecondaryButtonText="Avbryt"
 >
-  <p>Är du säker på att du vill skicka in en {{itemToConfirm}}?</p>
+  <p>Är du säker på att du vill skicka in en avvikelserapport?</p>
 </digi-ng-dialog>

apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.ts

@@ -9,7 +9,6 @@ import { ConfirmDialog } from '@msfa-enums/confirm-dialog.enum';
 })
 export class ConfirmDialogComponent {
   @Input() openConfirmDialog: boolean;
-  @Input() itemToConfirm: string;
   @Output() confirmDialogChanged = new EventEmitter<ConfirmDialog>();
 
   sendRequest(): void {