diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html index e841376..398bc79 100644 --- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html +++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html @@ -1,5 +1,8 @@

Trazas de comandos y procedimientos

+
+ +
diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts index 96f46f5..eb4d751 100644 --- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts +++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts @@ -149,6 +149,12 @@ export class TaskLogsComponent implements OnInit { ); } + resetFilters() { + this.loading = true; + this.filters = {}; + this.loadTraces(); + } + groupByCommandId(traces: any[]): any[] { const grouped: { [key: string]: any[] } = {}; @@ -167,8 +173,9 @@ export class TaskLogsComponent implements OnInit { } onPageChange(event: any): void { - this.page = event.pageIndex + 1; + this.page = event.pageIndex; this.itemsPerPage = event.pageSize; + this.length = event.length; this.loadTraces(); } } diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html index 5f9c6bc..944582c 100644 --- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html +++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html @@ -25,10 +25,6 @@ - - - - diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts index a21b6d4..469f9f0 100644 --- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts +++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.ts @@ -50,7 +50,7 @@ export class AdvancedSearchComponent { savedFilterNames: any[] = []; length: number = 0; itemsPerPage: number = 10; - page: number = 1; + page: number = 0; pageSizeOptions: number[] = [5, 10, 25, 100]; selectedElements: any[] = []; isAllSelected: boolean = false; @@ -301,7 +301,7 @@ export class AdvancedSearchComponent { } applyFilter() { - this.dataService.getFilteredResults(this.selectedFilter1, this.selectedFilter2, this.filterName, this.filterIP, this.filterMAC, this.page, this.itemsPerPage) + this.dataService.getFilteredResults(this.selectedFilter1, this.selectedFilter2, this.filterName, this.filterIP, this.filterMAC, this.page + 1, this.itemsPerPage) .subscribe( response => { this.filteredResults = response.results; @@ -317,6 +317,7 @@ export class AdvancedSearchComponent { onPageChange(event: PageEvent) { this.page = event.pageIndex; this.itemsPerPage = event.pageSize; + this.length = event.length; this.applyFilter(); } diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.css b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.css index 27cd5b5..63f11ba 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.css +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.css @@ -12,15 +12,23 @@ display: flex; justify-content: space-between; align-items: center; + width: 100%; padding: 0 5px; box-sizing: border-box; } - .search-string { flex: 1; padding: 5px; } +.divider { + margin: 20px 0; +} + +.mat-elevation-z8 { + box-shadow: 0px 0px 0px rgba(0,0,0,0.2); +} + .search-boolean { flex: 1; padding: 5px; diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html index a1dcd77..46af9fb 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html @@ -34,7 +34,7 @@
- +
{{ column.header }} diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts index 1e178cd..9b5f7b9 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.ts @@ -142,7 +142,7 @@ export class ClientTabViewComponent { loadOrganizationalUnits() { this.loading = true; - this.http.get( `${this.baseUrl}/organizational-units?&page=1&itemsPerPage=10000`).subscribe( + this.http.get( `${this.baseUrl}/organizational-units?&page=1&itemsPerPage=10`).subscribe( response => { this.organizationalUnits = response['hydra:member']; this.loading = false; diff --git a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.css b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.css index e4feb8b..b0c2217 100644 --- a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.css +++ b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.css @@ -12,6 +12,7 @@ display: flex; justify-content: space-between; align-items: center; + width: 100%; padding: 0 5px; box-sizing: border-box; } @@ -26,6 +27,10 @@ padding: 5px; } +.mat-elevation-z8 { + box-shadow: 0px 0px 0px rgba(0,0,0,0.2); +} + .search-select { flex: 2; padding: 5px; diff --git a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html index 8f8479b..f11561d 100644 --- a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html @@ -24,7 +24,7 @@ - +
{{ column.header }} diff --git a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.ts b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.ts index 81bb8aa..20829c4 100644 --- a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.ts +++ b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.ts @@ -91,7 +91,7 @@ export class OrganizationalUnitTabViewComponent { this.length = data['hydra:totalItems']; }, (error) => { - console.error('Error fetching commands', error); + console.error('Error fetching ou', error); } ); } diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts index 8e0e7a7..133e09b 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.ts +++ b/ogWebconsole/src/app/components/groups/groups.component.ts @@ -161,7 +161,7 @@ export class GroupsComponent implements OnInit { this.dataService.getOrganizationalUnits().subscribe( data => { this.organizationalUnits = data - this.loadChildrenAndClients(parent.id); + this.loadChildrenAndClients(parent?.id); }, error => console.error('Error fetching unidades organizativas', error) ); diff --git a/ogWebconsole/src/app/components/groups/shared/acctions-modal/acctions-modal.component.html b/ogWebconsole/src/app/components/groups/shared/acctions-modal/acctions-modal.component.html index deaae91..393ae5d 100644 --- a/ogWebconsole/src/app/components/groups/shared/acctions-modal/acctions-modal.component.html +++ b/ogWebconsole/src/app/components/groups/shared/acctions-modal/acctions-modal.component.html @@ -1,10 +1,10 @@

Acciones

-