From b55f15f16bb55f9a2c90ff794cec2db5b4a13765 Mon Sep 17 00:00:00 2001 From: Lucas Lara Date: Tue, 20 May 2025 14:29:11 +0200 Subject: [PATCH] refs #2049 enhance date filtering in task logs with max date constraint and validation --- .../client-task-logs.component.html | 7 +++--- .../client-task-logs.component.ts | 24 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html index 7fe70aa..843bd76 100644 --- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html +++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.html @@ -50,8 +50,8 @@ Desde - + @@ -59,10 +59,11 @@ Hasta + [max]="today"> + diff --git a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts index ca04052..aa0c6e2 100644 --- a/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts +++ b/ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts @@ -35,6 +35,7 @@ export class ClientTaskLogsComponent implements OnInit { mode: ProgressBarMode = 'buffer'; progress = 0; bufferValue = 0; + today = new Date(); filteredCommands2 = Object.keys(COMMAND_TYPES).map(key => ({ name: key, @@ -144,12 +145,15 @@ export class ClientTaskLogsComponent implements OnInit { } onDateFilterChange(): void { - if (this.filters['startDate'] && this.filters['endDate'] && this.filters['startDate'] > this.filters['endDate']) { - this.toastService.warning('La fecha de inicio no puede ser mayor que la fecha de fin'); - return; + const start = this.filters['startDate']; + const end = this.filters['endDate']; + + if (start && end && start > end) { + this.toastService.warning('La fecha de inicio no puede ser mayor que la fecha de fin'); + return; + } + this.loadTraces(); } - this.loadTraces(); -} openInputModal(inputData: any): void { this.dialog.open(InputDialogComponent, { @@ -196,9 +200,17 @@ export class ClientTaskLogsComponent implements OnInit { 'client.id': clientId, page: this.page + 1, itemsPerPage: this.itemsPerPage, - ...this.filters + ...this.filters }; + if (params['startDate']) { + params['executed_at[after]'] = this.datePipe.transform(params['startDate'], 'yyyy-MM-dd'); + delete params['startDate']; + } + if (params['endDate']) { + params['executed_at[before]'] = this.datePipe.transform(params['endDate'], 'yyyy-MM-dd'); + delete params['endDate']; + } console.log('🌐 GET', `${this.baseUrl}/traces`, params); const url = `${this.baseUrl}/traces`;