From 92c134b91c24eec797b2fb5c42b06c255056d202 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 31 May 2023 06:02:29 +0200 Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20ultimos=203=20dias=20al=20select?= =?UTF-8?q?or=20de=20fecha?= 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 | 9 ++++++++- .../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.pl.xlf | 4 ++++ 5 files changed, 21 insertions(+), 1 deletion(-) 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 43cd4de6..7eb410bc 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 @@ -26,6 +26,7 @@ export class DateUtils { case 'monthFullPreviousYear': return this.setMonthFullPreviousYear(); case 'yearStart': return this.setYearStart(); case 'yearStartPreviousYear': return this.setYearStartPreviousYear(); + case 'last3': return this.setLast3(); case 'last7': return this.setLast7(); case 'last15': return this.setLast15(); case 'last30': return this.setLast30(); @@ -163,12 +164,18 @@ export class DateUtils { return [yearStart, today]; } + public setLast3(): Array { + const today = new Date(); + const last3 = new Date(today.getTime() - (2 * 24 * 60 * 60 * 1000)); + return [last3, today]; + } + public setLast7(): Array { const today = new Date(); const last7 = new Date(today.getTime() - (6 * 24 * 60 * 60 * 1000)); return [last7, today]; } - + public setLast15(): Array { const today = new Date(); const last15 = new Date(today.getTime() - (14 * 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 e9c0278b..c05f21a0 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 @@ -41,6 +41,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`:@@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' }, { label: $localize`:@@DatePickerLast30:Últimos 30 días`, value: 'last30' }, diff --git a/eda/eda_app/src/locale/messages.ca.xlf b/eda/eda_app/src/locale/messages.ca.xlf index 0926c517..99ef9ba6 100644 --- a/eda/eda_app/src/locale/messages.ca.xlf +++ b/eda/eda_app/src/locale/messages.ca.xlf @@ -2792,6 +2792,10 @@ Entrar Últimos 7 días Últims 7 dies + + Últimos 3 días +Últims 3 dies + Últimos 15 días Últims 15 dies diff --git a/eda/eda_app/src/locale/messages.en.xlf b/eda/eda_app/src/locale/messages.en.xlf index 637ff72e..203aefa1 100644 --- a/eda/eda_app/src/locale/messages.en.xlf +++ b/eda/eda_app/src/locale/messages.en.xlf @@ -2788,6 +2788,10 @@ Login Últimos 7 días Last 7 days + + Últimos 3 días +Last 3 days + Últimos 15 días Last 15 days diff --git a/eda/eda_app/src/locale/messages.pl.xlf b/eda/eda_app/src/locale/messages.pl.xlf index 0266a064..b758f20d 100644 --- a/eda/eda_app/src/locale/messages.pl.xlf +++ b/eda/eda_app/src/locale/messages.pl.xlf @@ -2768,6 +2768,10 @@ Login Últimos 7 días Last 7 days + + Últimos 3 días +Last 3 days + Últimos 15 días Last 15 days