Merge pull request #139 in TEA/mina-sidor-fa-web from feature/TV-633-fix to develop

Squashed commit of the following:

commit 540a53d92a2680e1e950a3731b23ef864e0d28d4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Sun Sep 26 22:04:09 2021 +0200

    TV-633 confirm dialog input for report name

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

@@ -37,8 +37,7 @@
           (change)="setOrsakerChanged()"
         ></msfa-deltagare-orsaks-form>
 
-        <ng-container *ngIf="showDescription">
+        <div *ngIf="showDescription" class="deltagare-avvikelse__description">
-          <div class="deltagare-avvikelse__description">
           <digi-ng-form-textarea
             [formControlName]="descriptionFormControlName"
             afLabel="Beskriv frånvaro"
@@ -55,17 +54,15 @@
             Beskrivning är obligatoriskt
           </digi-form-validation-message>
         </div>
-        </ng-container>
 
-        <ng-container *ngIf="showFragor">
         <msfa-deltagare-fragor-form
+          *ngIf="showFragor"
           [fragor1]="fragor1$ | async"
           [fragor2]="fragor2$ | async"
           [fragorFormGroup]="avvikelseFormGroup.get('fragorFormGroup')"
           [avvikelseFormGroup]="avvikelseFormGroup"
           [selectedOrsaksKod]="selectedOrsaksKod"
         ></msfa-deltagare-fragor-form>
-        </ng-container>
 
         <div *ngIf="showDatePicker" class="deltagare-avvikelse__datepicker">
           <digi-ng-form-datepicker
@@ -87,12 +84,11 @@
           ></digi-ng-form-radiobutton-group>
         </div>
 
-        <ng-container *ngIf="showTimePicker">
         <msfa-deltagare-time-picker
+          *ngIf="showTimePicker"
           [timepickerFormGroup]="avvikelseFormGroup.get('timepickerFormGroup')"
           [avvikelseFormGroup]="avvikelseFormGroup"
         ></msfa-deltagare-time-picker>
-        </ng-container>
       </form>
     </ng-container>
 
@@ -108,8 +104,8 @@
 
     <div class="deltagare-avvikelse__step-buttons-wrapper">
       <ng-container *ngIf="(showSuccessNotification$ | async) !== true">
-        <ng-container *ngIf="currentStep > 1">
         <digi-button
+          *ngIf="currentStep > 1"
           class="deltagare-avvikelse__step-buttons-wrapper--space-right"
           af-variation="secondary"
           af-size="m"
@@ -117,20 +113,23 @@
         >
           Tillbaka
         </digi-button>
+        <digi-button *ngIf="currentStep === totalAmountOfSteps" af-size="m" (afOnClick)="openConfirmDialog = true">
+          Skicka in
+        </digi-button>
       </ng-container>
-        <ng-container *ngIf="currentStep === totalAmountOfSteps">
+      <digi-button *ngIf="currentStep === (totalAmountOfSteps -1)" af-size="m" (afOnClick)="nextStep">
-          <digi-button af-size="m" (afOnClick)="openConfirmDialog = true;"> Skicka in </digi-button>
+        Förhandsgranska
-        </ng-container>
+      </digi-button>
-      </ng-container>
+      <digi-button *ngIf="showSuccessNotification$ | async" af-size="m" (afOnClick)="backToDeltagare()">
-      <ng-container *ngIf="currentStep === (totalAmountOfSteps -1)">
+        Tillbaka till deltagaren
-        <digi-button af-size="m" (afOnClick)="nextStep"> Förhandsgranska </digi-button>
+      </digi-button>
-      </ng-container>
-      <ng-container *ngIf="showSuccessNotification$ | async">
-        <digi-button af-size="m" (afOnClick)="backToDeltagare()"> Tillbaka till deltagaren </digi-button>
-      </ng-container>
     </div>
   </msfa-report-layout>
 
-  <msfa-confirm-dialog [openConfirmDialog]="openConfirmDialog" (confirmDialogChanged)="setConfirmDialogChanged($event)">
+  <msfa-confirm-dialog
+    [openConfirmDialog]="openConfirmDialog"
+    reportToConfirm="avvikelserapport"
+    (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 att du vill skicka in en avvikelserapport'"
+  [afAriaLabel]="'Bekräfta att skicka in en ' + reportToConfirm"
   afPrimaryButtonText="Skicka"
   afSecondaryButtonText="Avbryt"
 >
-  <p>Är du säker på att du vill skicka in en avvikelserapport?</p>
+  <p>Är du säker på att du vill skicka in en {{reportToConfirm}}?</p>
 </digi-ng-dialog>

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

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