diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html
index 9b9cded..9f4d403 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-avvikelserapport/deltagare-avvikelserapport.component.html
@@ -13,10 +13,7 @@
af-variation="success"
class="deltagare-avvikelse__alert"
>
-
- Avvikelserapport för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen och inväntar
- godkännande.
-
+ Avvikelserapport (avvikelse) för deltagare {{avrop.fullName}} är nu inskickad till Arbetsförmedlingen.
- Datum
- {{submittedDate | date:'longDate'}} kl {{submittedDate | date:'shortTime'}}
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 636ba9c..4589209 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
@@ -313,9 +313,9 @@
- {{knownReasonCommentFormControl.value}}
- - Datum
+ - Dag för frånvaro
-
-
+
- Heldag eller del av dag
- {{dayOrPartOfDayFromValue}}
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.ts
index 871f293..de1dec2 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.ts
@@ -58,7 +58,9 @@ export class FranvaroReportComponent {
{ label: 'Del av dag', value: false },
];
- constructor(private franvaroReportService: FranvaroReportService, private activatedRoute: ActivatedRoute) {}
+ constructor(private franvaroReportService: FranvaroReportService, private activatedRoute: ActivatedRoute) {
+ this.dateFormControl.valueChanges.subscribe(value => console.log(value));
+ }
get showOtherKnownReasonsSelect(): boolean {
return this.reasonFormControl.value === ANNAN_KAND_ORSAK_ID;
@@ -112,6 +114,10 @@ export class FranvaroReportComponent {
return this.franvaroFormGroup.get('knownReasonComment') as FormControl;
}
+ get dateFormValueAsDate(): Date {
+ return new Date(this.dateFormControl.value);
+ }
+
getReasonNameFromValue(reasons: OrsaksKoderFranvaro[], value: string): string {
return reasons.find(reason => reason.value.toString() === value)?.name;
}