From 2dc566852cd868265942f68d77e421897f0cc008 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Wed, 10 Nov 2021 10:32:46 +0100
Subject: [PATCH] Merge pull request #256 in TEA/mina-sidor-fa-web from
 bugfix/select-correct-period-in-pr to develop

Squashed commit of the following:

commit d61ed88d26ec821ad24dacdb22c399e57a05e7ba
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Nov 10 10:19:58 2021 +0100

    Select correct period inside PR

commit 977e9cd81c3d51d188650f8f4cc76d3e6025c54c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Nov 10 10:16:38 2021 +0100

    Select correct period inside PR
---
 .../periodisk-redovisning-form.component.ts          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
index d971e08..ed83fbb 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
@@ -15,10 +15,9 @@ import { capitalizeWords } from '@msfa-utils/capitalize-words.util';
 import { formatDate, formatToDate } from '@msfa-utils/format-to-date.util';
 import { RequiredValidator } from '@msfa-validators/required.validator';
 import { Radiobutton } from '@ui/radiobutton-group/radiobutton.model';
-import { subMonths } from 'date-fns';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { map, shareReplay, switchMap, take } from 'rxjs/operators';
-import { dateToPeriodId, extractAvropPeriods } from './extract-avrop-periods';
+import { extractAvropPeriods } from './extract-avrop-periods';
 import {
   ActivityFormErrors,
   PeriodiskRedovisningFormData,
@@ -76,10 +75,9 @@ export class PeriodiskRedovisningFormComponent implements OnInit {
   periods$: Observable<AvropPeriod[]> = this.avrop$.pipe(
     map(avrop => extractAvropPeriods(avrop.startDate, avrop.endDate))
   );
-  previousPeriod = dateToPeriodId(subMonths(new Date(), 1));
   formGroup = new FormGroup(
     {
-      [this.PERIOD_FORM_NAME]: new FormControl(this.previousPeriod, RequiredValidator()),
+      [this.PERIOD_FORM_NAME]: new FormControl(null, RequiredValidator()),
       [this.HAS_OFFERED_LANGUAGE_SUPPORT_FORM_NAME]: new FormControl(null, RequiredValidator()),
       [this.HAS_OFFERED_JOB_FORM_NAME]: new FormControl(null, RequiredValidator()),
       [this.ACTIVITES_FORM_NAME]: new FormArray([]),
@@ -110,7 +108,11 @@ export class PeriodiskRedovisningFormComponent implements OnInit {
   constructor(
     private periodiskRedovisningFormService: PeriodiskRedovisningFormService,
     private activatedRoute: ActivatedRoute
-  ) {}
+  ) {
+    this.periods$.pipe(take(1)).subscribe(periods => {
+      this.periodFormControl.setValue(periods[periods.length - 1].periodId);
+    });
+  }
 
   get periodFormControl(): AbstractControl | undefined {
     return this.formGroup.get(this.PERIOD_FORM_NAME);