From ebbaafe9a17544e75c2870a002a3d7d1db745750 Mon Sep 17 00:00:00 2001 From: ronaldchavezjortilles Date: Tue, 16 Jul 2024 12:39:20 +0200 Subject: [PATCH] =?UTF-8?q?Mejora=20-=20EDA=20-=20Incluir=20filtro=20"A?= =?UTF-8?q?=C3=B1o=20pasado=20completo"=20#141=20-=20Agregado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eda/eda_app/src/app/services/utils/date-utils.service.ts | 7 +++++++ .../eda-date-picker/eda-date-picker.component.ts | 1 + eda/eda_app/src/locale/messages.ca.xlf | 4 ++++ eda/eda_app/src/locale/messages.en.xlf | 4 ++++ eda/eda_app/src/locale/messages.es.xlf | 5 +++++ eda/eda_app/src/locale/messages.gl.xlf | 6 ++++++ eda/eda_app/src/locale/messages.pl.xlf | 5 +++++ 7 files changed, 32 insertions(+) diff --git a/eda/eda_app/src/app/services/utils/date-utils.service.ts b/eda/eda_app/src/app/services/utils/date-utils.service.ts index eb9e2cde..434951af 100644 --- a/eda/eda_app/src/app/services/utils/date-utils.service.ts +++ b/eda/eda_app/src/app/services/utils/date-utils.service.ts @@ -28,6 +28,7 @@ export class DateUtils { case 'monthFullPreviousYear': return this.setMonthFullPreviousYear(); case 'yearStart': return this.setYearStart(); case 'yearStartPreviousYear': return this.setYearStartPreviousYear(); + case 'yearStartPreviousYearFull': return this.setYearStartPreviousYearFull(); case 'last3': return this.setLast3(); case 'last7': return this.setLast7(); case 'last15': return this.setLast15(); @@ -170,6 +171,12 @@ export class DateUtils { return [yearStart, today]; } + public setYearStartPreviousYearFull(): Array { + const pastYearStart = moment().subtract(1,'years').startOf('year').toDate(); + const pastYearEnd = moment().subtract(1,'years').endOf('year').toDate(); + return [pastYearStart, pastYearEnd]; + } + public setLast3(): Array { const today = new Date(); const last3 = new Date(today.getTime() - (2 * 24 * 60 * 60 * 1000)); diff --git a/eda/eda_app/src/app/shared/components/eda-date-picker/eda-date-picker.component.ts b/eda/eda_app/src/app/shared/components/eda-date-picker/eda-date-picker.component.ts index d8a985e8..b1051a76 100644 --- a/eda/eda_app/src/app/shared/components/eda-date-picker/eda-date-picker.component.ts +++ b/eda/eda_app/src/app/shared/components/eda-date-picker/eda-date-picker.component.ts @@ -39,6 +39,7 @@ export class EdaDatePickerComponent implements OnChanges { { label: $localize`:@@DatePickerMonthPreviousYearFull:Éste mes al completo del año pasado`, value: 'monthFullPreviousYear' }, { label: $localize`:@@DatePickerYear:Éste año`, value: 'yearStart' }, { label: $localize`:@@DatePickerYearPreviousYear:El año pasado`, value: 'yearStartPreviousYear' }, + { label: $localize`:@@DatePickerYearPreviousYearFull:El año pasado, completo`, value: 'yearStartPreviousYearFull' }, { label: $localize`:@@DatePickerLast3:Últimos 3 días`, value: 'last3' }, { label: $localize`:@@DatePickerLast7:Últimos 7 días`, value: 'last7' }, { label: $localize`:@@DatePickerLast15:Últimos 15 días`, value: 'last15' }, diff --git a/eda/eda_app/src/locale/messages.ca.xlf b/eda/eda_app/src/locale/messages.ca.xlf index e91c4c82..3e4a8758 100644 --- a/eda/eda_app/src/locale/messages.ca.xlf +++ b/eda/eda_app/src/locale/messages.ca.xlf @@ -4303,6 +4303,10 @@ Alias del filtro (opcional) Alias del filtre (opcional) + + El año pasado, completo + L'any passat, complet + diff --git a/eda/eda_app/src/locale/messages.en.xlf b/eda/eda_app/src/locale/messages.en.xlf index bdd93753..8d5b1e37 100644 --- a/eda/eda_app/src/locale/messages.en.xlf +++ b/eda/eda_app/src/locale/messages.en.xlf @@ -4277,6 +4277,10 @@ Alias del filtro (opcional) Filter alias (optional) + + El año pasado, completo + Last year, complete + diff --git a/eda/eda_app/src/locale/messages.es.xlf b/eda/eda_app/src/locale/messages.es.xlf index b95736f5..a7533ab4 100644 --- a/eda/eda_app/src/locale/messages.es.xlf +++ b/eda/eda_app/src/locale/messages.es.xlf @@ -4306,6 +4306,11 @@ Alias del filtro (opcional) Alias del filtro (opcional) + + + El año pasado, completo + El año pasado, completo + diff --git a/eda/eda_app/src/locale/messages.gl.xlf b/eda/eda_app/src/locale/messages.gl.xlf index 1b261c84..16102ff0 100644 --- a/eda/eda_app/src/locale/messages.gl.xlf +++ b/eda/eda_app/src/locale/messages.gl.xlf @@ -4307,6 +4307,12 @@ Alias del filtro (opcional) Filtrar alias (opcional) + + + El año pasado, completo + El año pasado, completo + + diff --git a/eda/eda_app/src/locale/messages.pl.xlf b/eda/eda_app/src/locale/messages.pl.xlf index 361640e7..f8827e0e 100644 --- a/eda/eda_app/src/locale/messages.pl.xlf +++ b/eda/eda_app/src/locale/messages.pl.xlf @@ -3930,6 +3930,11 @@ Login Alias del filtro (opcional) Alias ​​filtra (opcjonalnie) + + + El año pasado, completo + W zeszłym roku, kompletne +