From df4dc427a44a6c1bd7c4cad4c79f9d7f45b8430f Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 10 Nov 2021 10:00:19 +0100 Subject: [PATCH] Added last month to PR if avrop enddate is past --- .../periodisk-redovisning-form/extract-avrop-periods.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/extract-avrop-periods.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/extract-avrop-periods.ts index 4b176b7..af66eda 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/extract-avrop-periods.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/extract-avrop-periods.ts @@ -15,7 +15,7 @@ export function extractAvropPeriods(avropStartDate: Date, avropEndDate: Date): A throw new Error('Avropets startdatum måste komma innan slutdatumet.'); } - const previousPeriod = dateToPeriodId(subMonths(today, 1)); + const previousPeriod = dateToPeriodId(today >= avropEndDate ? avropEndDate : subMonths(today, 1)); const periods: AvropPeriod[] = [] as AvropPeriod[]; let dateCounter = avropStartDate; @@ -24,7 +24,7 @@ export function extractAvropPeriods(avropStartDate: Date, avropEndDate: Date): A const endDate = endOfMonth(dateCounter) > avropEndDate ? avropEndDate : endOfMonth(dateCounter); const period: AvropPeriod = { startDate, endDate, periodId: dateToPeriodId(dateCounter) }; periods.push(period); - dateCounter = addMonths(dateCounter, 1); + dateCounter = startOfMonth(addMonths(dateCounter, 1)); } return periods; }