From d7f0adc6d87979465331bb7a6043d537d9a587d2 Mon Sep 17 00:00:00 2001 From: Armin Isenring Date: Wed, 15 Mar 2023 20:57:48 +0100 Subject: [PATCH] error message with start date enhanced --- .../date-from-to-fieldset.component.html | 4 ++-- .../date-from-to-fieldset.component.ts | 14 +++++++++----- src/assets/i18n/de.json | 2 +- src/assets/i18n/en.json | 2 +- src/assets/i18n/fr.json | 2 +- src/assets/i18n/it.json | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html b/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html index d07f40c..8a14b33 100644 --- a/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html +++ b/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html @@ -22,7 +22,7 @@ - {{ "reports.dateFromTo.dateTooSmall" | translate }} + {{ "reports.dateFromTo.dateTooSmall" | translate : { startDate: START_DATE } }} @@ -49,7 +49,7 @@ - {{ "reports.dateFromTo.dateTooSmall" | translate }} + {{ "reports.dateFromTo.dateTooSmall" | translate : { startDate: START_DATE } }} diff --git a/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts b/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts index 4a12b51..7638477 100644 --- a/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts +++ b/src/app/report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts @@ -16,12 +16,15 @@ export class DateFromToFieldsetComponent implements OnInit, OnDestroy { @Input() dateFromFormControl: UntypedFormControl; @Input() dateToFormControl: UntypedFormControl; @Input() label: string; - // ToDo final version needs to subtract 2 years. For testing we used 2 months - @Input() MIN_DATE = moment('2023-05-01'); + // temporary value for testing purposes + @Input() MIN_DATE = moment('2021-01-01'); + // original value + // @Input() MIN_DATE = moment('2021-05-01'); subscription: Subscription; readonly TODAY = moment(); + START_DATE = ''; constructor( public readonly translate: TranslateService, @@ -31,11 +34,12 @@ export class DateFromToFieldsetComponent implements OnInit, OnDestroy { ngOnInit() { const now = moment(); - // ToDo final version needs to subtract 2 years. For testing we used 2 months - const twoYearsAgo = now.subtract(2, 'months'); - if (twoYearsAgo.isBefore(this.MIN_DATE)) { + const twoYearsAgo = now.subtract(2, 'years'); + if (twoYearsAgo.isAfter(this.MIN_DATE)) { this.MIN_DATE = twoYearsAgo; } + this.START_DATE = this.MIN_DATE.clone().subtract(1, 'days').format('DD.MM.YYYY'); + this.subscription = this.reportService.reset$.subscribe(() => { this.dateFromFormControl.reset(); this.dateToFormControl.reset(); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index f7a5053..fead657 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -321,7 +321,7 @@ "reports.dataRoomSelection": "Ausgewählter Kanton/Bereich:", "reports.dateFromTo.date-from": "Anfangsdatum", "reports.dateFromTo.date-to": "Enddatum", - "reports.dateFromTo.dateTooSmall": "Das Datum muss nach dem 30.04.2021 liegen", + "reports.dateFromTo.dateTooSmall": "Das Datum muss nach dem {{startDate}} liegen", "reports.dateFromTo.maxPeriodDays": "Bitte reduzieren Sie den Ausstellungszeitraum auf maximal {{maxPeriodDays}} Tage", "reports.dateFromTo.startDateBeforeEndDate": "Anfangsdatum darf nicht nach dem Enddatum liegen", "reports.dateFromTo.text": "Bitte wählen Sie ein Anfangs- und ein Enddatum des Ausstellungszeitraums für den Report aus:", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index a6e1f3d..ecd261d 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -321,7 +321,7 @@ "reports.dataRoomSelection": "Canton/area selected:", "reports.dateFromTo.date-from": "Start date", "reports.dateFromTo.date-to": "End date", - "reports.dateFromTo.dateTooSmall": "The date must be after 30.04.2021", + "reports.dateFromTo.dateTooSmall": "The date must be after {{startDate}}", "reports.dateFromTo.maxPeriodDays": "Please limit the issuing period to no more than {{maxPeriodDays}} days", "reports.dateFromTo.startDateBeforeEndDate": "Start date must not be after the end date", "reports.dateFromTo.text": "Please select a start and end date for the issue period for the report:", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 2987761..a99d858 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -321,7 +321,7 @@ "reports.dataRoomSelection": "Canton/domaine sélectionné:", "reports.dateFromTo.date-from": "Date de début", "reports.dateFromTo.date-to": "Date de fin", - "reports.dateFromTo.dateTooSmall": "La date doit être située après le 30.04.2021", + "reports.dateFromTo.dateTooSmall": "La date doit être située après le {{startDate}}", "reports.dateFromTo.maxPeriodDays": "Veuillez limiter la période d'émission à un maximum de {{maxPeriodDays}} jours", "reports.dateFromTo.startDateBeforeEndDate": "La date de début ne doit pas être postérieure à la date de fin", "reports.dateFromTo.text": "Veuillez sélectionner une date de début et une date de fin de la période d’émission pour le rapport:", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 3b34273..a685a05 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -321,7 +321,7 @@ "reports.dataRoomSelection": "Cantone/settore selezionato:", "reports.dateFromTo.date-from": "Data di inizio", "reports.dateFromTo.date-to": "Data di fine", - "reports.dateFromTo.dateTooSmall": "La data deve essere successiva al 30.04.2021", + "reports.dateFromTo.dateTooSmall": "La data deve essere successiva al {{startDate}}", "reports.dateFromTo.maxPeriodDays": "Si prega di limitare il periodo di emissione a non più di {{maxPeriodDays}} giorni", "reports.dateFromTo.startDateBeforeEndDate": "La data di inizio non deve essere successiva alla data di fine", "reports.dateFromTo.text": "Selezionare una data di inizio e una data di fine del periodo di emissione per il rapporto:",