arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added last month to PR if avrop enddate is past

Browse Source
This commit is contained in:
Erik Tiekstra
2021-11-10 10:00:19 +01:00
parent 873b6a0c0d
commit df4dc427a4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/extract-avrop-periods.ts
View File

@@ -15,7 +15,7 @@ export function extractAvropPeriods(avropStartDate: Date, avropEndDate: Date): A
throw new Error('Avropets startdatum måste komma innan slutdatumet.'); 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[]; const periods: AvropPeriod[] = [] as AvropPeriod[];
let dateCounter = avropStartDate; let dateCounter = avropStartDate;
@@ -24,7 +24,7 @@ export function extractAvropPeriods(avropStartDate: Date, avropEndDate: Date): A
const endDate = endOfMonth(dateCounter) > avropEndDate ? avropEndDate : endOfMonth(dateCounter); const endDate = endOfMonth(dateCounter) > avropEndDate ? avropEndDate : endOfMonth(dateCounter);
const period: AvropPeriod = { startDate, endDate, periodId: dateToPeriodId(dateCounter) }; const period: AvropPeriod = { startDate, endDate, periodId: dateToPeriodId(dateCounter) };
periods.push(period); periods.push(period);
dateCounter = addMonths(dateCounter, 1); dateCounter = startOfMonth(addMonths(dateCounter, 1));
} }
return periods; return periods;
} }