From 863604986688f24a69dc96155f840ac373103448 Mon Sep 17 00:00:00 2001 From: Daniel Appelgren Date: Fri, 26 Nov 2021 10:24:48 +0100 Subject: [PATCH] Pull request #281: TV-811 Because it's workdays and not calendar days we temporarily set this to much more. Merge in TEA/mina-sidor-fa-web from feature/TV-811-increase-dates-since-its-workdays-and-not-calendar-days to next Squashed commit of the following: commit cdafaee42c71d8d4e0bf0d87ffc6e542a02e9e82 Author: Daniel Appelgren Date: Fri Nov 26 10:11:14 2021 +0100 Because it's workdays and not calendar days we temporarily set this to much more. This date should be fetched from API in the future --- .../avvikelse-report-form/avvikelse-report-form.component.ts | 4 +++- .../gemensam-planering-form.component.ts | 4 +++- .../slutredovisning-form/slutredovisning-form.component.ts | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts index 7455ec8..1d38f62 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts @@ -139,7 +139,9 @@ export class AvvikelseReportFormComponent implements OnInit, OnDestroy { return new Date() > startDate; } private _isBeforeLastPossibleReportDay(endDate: Date): boolean { - const lastPossibleReportDay = addDays(endDate, 5); // Reporting is allowed at latest 5 days past avrop end date. + // Reporting is allowed at latest 5 days past avrop end date. + // Because it's workdays and not calendar days we temporarily set this to much more. This date should be fetched from API in the future + const lastPossibleReportDay = addDays(endDate, 15); return lastPossibleReportDay > new Date(); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts index 022beeb..a426c63 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/gemensam-planering-form/gemensam-planering-form.component.ts @@ -154,7 +154,9 @@ export class GemensamPlaneringFormComponent { return new Date() > startDate; } private _isBeforeLastPossibleReportDay(endDate: Date): boolean { - const lastPossibleReportDay = addDays(endDate, 5); // Reporting is allowed at latest 5 days past avrop end date. + // Reporting is allowed at latest 5 days past avrop end date. + // Because it's workdays and not calendar days we temporarily set this to much more. This date should be fetched from API in the future + const lastPossibleReportDay = addDays(endDate, 15); return lastPossibleReportDay > new Date(); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts index 8cd3e8d..2489eb3 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts @@ -64,7 +64,9 @@ export class SlutredovisningFormComponent { } private _isBeforeLastPossibleReportDay(date: Date): boolean { - const lastPossibleReportDay = addDays(date, 60); // Reporting is allowed at latest 60 days past avrop end date. + // Reporting is allowed at latest 60 days past avrop end date. + // Because it's workdays and not calendar days we temporarily set this to much more. This date should be fetched from API in the future + const lastPossibleReportDay = addDays(date, 100); return lastPossibleReportDay > new Date(); }