opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop
testing/ogGui-multibranch/pipeline/head There was a failure building this commit Details

pull/24/head
Manuel Aranda Rosales 2025-05-23 13:28:33 +02:00
parent fcfcd58d93 faf3fa0613
commit 4e6dbde59c
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.css
View File

@ -44,15 +44,10 @@ table {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 1.5rem 0rem 1.5rem 0rem; margin: 1.5rem 0rem 0.5rem 0rem;
box-sizing: border-box; box-sizing: border-box;
} }
.search-string {
flex: 1;
padding: 5px;
}
.search-boolean { .search-boolean {
flex: 1; flex: 1;
padding: 5px; padding: 5px;
@ -63,6 +58,11 @@ table {
padding: 5px; padding: 5px;
} }
.search-date {
flex: 1;
padding: 5px;
}
.mat-elevation-z8 { .mat-elevation-z8 {
box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
} }

2
ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.spec.ts
View File

@ -13,6 +13,7 @@ import { LoadingComponent } from 'src/app/shared/loading/loading.component';
import { MatPaginatorModule } from '@angular/material/paginator'; import { MatPaginatorModule } from '@angular/material/paginator';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatInputModule } from '@angular/material/input';
describe('ClientTaskLogsComponent', () => { describe('ClientTaskLogsComponent', () => {
let component: ClientTaskLogsComponent; let component: ClientTaskLogsComponent;
@ -32,6 +33,7 @@ describe('ClientTaskLogsComponent', () => {
TranslateModule.forRoot(), TranslateModule.forRoot(),
MatFormFieldModule, MatFormFieldModule,
MatPaginatorModule, MatPaginatorModule,
MatInputModule,
MatSelectModule, MatSelectModule,
BrowserAnimationsModule BrowserAnimationsModule
], ],

9
ogWebconsole/src/app/components/task-logs/client-task-logs/client-task-logs.component.ts
View File

@ -148,6 +148,10 @@ export class ClientTaskLogsComponent implements OnInit {
const start = this.filters['startDate']; const start = this.filters['startDate'];
const end = this.filters['endDate']; const end = this.filters['endDate'];
if (!start || !end) {
return;
}
if (start && end && start > end) { if (start && end && start > end) {
this.toastService.warning('La fecha de inicio no puede ser mayor que la fecha de fin'); this.toastService.warning('La fecha de inicio no puede ser mayor que la fecha de fin');
return; return;
@ -204,11 +208,11 @@ export class ClientTaskLogsComponent implements OnInit {
}; };
if (params['startDate']) { if (params['startDate']) {
params['executed_at[after]'] = this.datePipe.transform(params['startDate'], 'yyyy-MM-dd'); params['executedAt[after]'] = this.datePipe.transform(params['startDate'], 'yyyy-MM-dd');
delete params['startDate']; delete params['startDate'];
} }
if (params['endDate']) { if (params['endDate']) {
params['executed_at[before]'] = this.datePipe.transform(params['endDate'], 'yyyy-MM-dd'); params['executedAt[before]'] = this.datePipe.transform(params['endDate'], 'yyyy-MM-dd');
delete params['endDate']; delete params['endDate'];
} }
console.log('🌐 GET', `${this.baseUrl}/traces`, params); console.log('🌐 GET', `${this.baseUrl}/traces`, params);
@ -247,6 +251,7 @@ export class ClientTaskLogsComponent implements OnInit {
clientSearchCommandInput.value = null; clientSearchCommandInput.value = null;
clientSearchStatusInput.value = null; clientSearchStatusInput.value = null;
this.filters = {}; this.filters = {};
this.page = 0;
this.loadTraces(); this.loadTraces();
} }