diff --git a/CHANGELOG.md b/CHANGELOG.md
index f51a7e8..ef43bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
## 2.1.1 (2021-10-11)
+### Features
+
+- **reporting:** Added more information inside confirmation-dialogs when submitting reports. [TV-744](https://jira.arbetsformedlingen.se/browse/TV-744)
+
### Bug Fixes
- **reporting:** Added better a11y texts for "Avbryt" buttons inside reporting pages. [TV-740](https://jira.arbetsformedlingen.se/browse/TV-740)
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html
index c127379..f5ee58d 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/components/report-layout/report-layout.component.html
@@ -7,8 +7,6 @@
- Namn
- {{avrop.fullName}}
-
-
- Personnummer
-
-
-
-
-
- - Orsak till avvikelse:
- - {{(chosenReason$ | async)?.name }}
-
-
- - {{getCurrentQuestionFromId(question.fraga).name}}
- - {{question.svar.length === 0 ? 'Inget svar' : question.svar }}
+
+
+ - Namn
+ - {{avrop.fullName}}
+ - Personnummer
+ -
+
+
+ - Tjänst
+ - {{avrop.tjanst}}
+ - Startdatum
+ -
+
+
+ - Slutdatum
+ -
+
+
+ - Orsak till avvikelse:
+ - {{(chosenReason$ | async)?.name }}
+
+
+ - {{getCurrentQuestionFromId(question.fraga).name}}
+ - {{question.svar.length === 0 ? 'Inget svar' : question.svar }}
+
+ - Dag för avvikelse:
+ - {{avvikelseSubmitData.avvikelseAlternativ.rapporteringsdatum }}
- - Dag för avvikelse:
- - {{avvikelseSubmitData.avvikelseAlternativ.rapporteringsdatum }}
-
-
+
-
-
+
+
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts
index 1d70ee9..92a71ed 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.module.ts
@@ -1,22 +1,23 @@
+import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
import { DigiNgFormDatepickerModule } from '@af/digi-ng/_form/form-datepicker';
+import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input';
import { DigiNgFormRadiobuttonGroupModule } from '@af/digi-ng/_form/form-radiobutton-group';
+import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
import { DigiNgFormTextareaModule } from '@af/digi-ng/_form/form-textarea';
import { DigiNgProgressProgressbarModule } from '@af/digi-ng/_progress/progressbar';
+import { DigiNgSkeletonBaseModule } from '@af/digi-ng/_skeleton/skeleton-base';
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
-import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
+import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module';
+import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module';
+import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
+import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { ReportLayoutModule } from '../components/report-layout/report-layout.module';
import { DeltagareAvvikelserapportComponent } from './deltagare-avvikelserapport.component';
import { DeltagareAvvikelserapportService } from './deltagare-avvikelserapport.service';
-import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
-import { DigiNgSkeletonBaseModule } from '@af/digi-ng/_skeleton/skeleton-base';
-import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select';
-import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
-import { DigiNgFormInputModule } from '@af/digi-ng/_form/form-input';
-import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -36,6 +37,7 @@ import { DigiNgDialogModule } from '@af/digi-ng/_dialog/dialog';
DigiNgSkeletonBaseModule,
DigiNgFormSelectModule,
LoaderModule,
+ HideTextModule,
DigiNgFormInputModule,
DigiNgDialogModule,
],
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.html
index ef39b58..6a27c13 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.component.html
@@ -105,6 +105,23 @@
(confirmDialogChanged)="closeConfirmDialogAndProceed($event, genomforandeReferens)"
>
+ - Namn
+ - {{avrop.fullName}}
+ - Personnummer
+ -
+
+
+ - Tjänst
+ - {{avrop.tjanst}}
+ - Avser period
+ -
+ -
+
+
- Deltar arbetssökande på distans?
- {{gpFormGroup.value.distance ? 'Ja' : 'Nej'}}
- Aktiviteter
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module.ts
index 2c43c72..0082b86 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-gemensam-planering/deltagare-gemensam-planering.module.ts
@@ -8,6 +8,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module';
+import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { ReportLayoutModule } from '../components/report-layout/report-layout.module';
@@ -27,6 +28,7 @@ import { DeltagareGemensamPlaneringComponent } from './deltagare-gemensam-planer
ConfirmDialogModule,
BackLinkModule,
LoaderModule,
+ HideTextModule,
DigiNgSkeletonBaseModule,
DigiNgFormCheckboxModule,
],
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html
index d383118..10a6325 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.html
@@ -276,10 +276,28 @@
(confirmDialogChanged)="closeConfirmDialogAndProceed($event, genomforandeReferens)"
>
-
- - Orsak till frånvaro
- - {{getReasonNameFromValue(reasons, reasonFormControl.value)}}
-
+ - Namn
+ - {{avrop.fullName}}
+ - Personnummer
+ -
+
+
+ - Tjänst
+ - {{avrop.tjanst}}
+ - Startdatum
+ -
+
+
+ - Slutdatum
+ -
+
+
+ - Orsak till frånvaro
+ - {{getReasonNameFromValue(reasons, reasonFormControl.value)}}
- Annan känd orsak
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.module.ts
index a229ba5..6472e0d 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.module.ts
@@ -11,6 +11,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { BackLinkModule } from '@msfa-shared/components/back-link/back-link.module';
import { ConfirmDialogModule } from '@msfa-shared/components/confirm-dialog/confirm-dialog.module';
+import { HideTextModule } from '@msfa-shared/components/hide-text/hide-text.module';
import { LayoutModule } from '@msfa-shared/components/layout/layout.module';
import { LoaderModule } from '@msfa-shared/components/loader/loader.module';
import { ReportLayoutModule } from '../components/report-layout/report-layout.module';
@@ -29,6 +30,7 @@ import { FranvaroReportService } from './franvaro-report.service';
LoaderModule,
BackLinkModule,
ConfirmDialogModule,
+ HideTextModule,
DigiNgFormSelectModule,
DigiNgFormDatepickerModule,
DigiNgFormRadiobuttonGroupModule,
diff --git a/apps/mina-sidor-fa/src/assets/CHANGELOG.md b/apps/mina-sidor-fa/src/assets/CHANGELOG.md
index 9652c2d..dadc48a 100644
--- a/apps/mina-sidor-fa/src/assets/CHANGELOG.md
+++ b/apps/mina-sidor-fa/src/assets/CHANGELOG.md
@@ -1,5 +1,9 @@
## 2.1.1 (2021-10-11)
+### Features
+
+- **reporting:** Added more information inside confirmation-dialogs when submitting reports. [TV-744](https://jira.arbetsformedlingen.se/browse/TV-744)
+
### Bug Fixes
- **reporting:** Added better a11y texts for "Avbryt" buttons inside reporting pages. [TV-740](https://jira.arbetsformedlingen.se/browse/TV-740)