-
Elementos internos
-
-
- {{ crumb }}
- >
-
-
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts
index c68ba3d..da86861 100644
--- a/ogWebconsole/src/app/components/groups/groups.component.ts
+++ b/ogWebconsole/src/app/components/groups/groups.component.ts
@@ -13,8 +13,11 @@ import {ToastrService} from "ngx-toastr";
import {TreeViewComponent} from "./tree-view/tree-view.component";
import {MatBottomSheet} from "@angular/material/bottom-sheet";
import {LegendComponent} from "./legend/legend.component";
-import { ClassroomViewComponent } from './classroom-view/classroom-view.component';
import { ClassroomViewDialogComponent } from './classroom-view/classroom-view-modal';
+import {HttpClient} from "@angular/common/http";
+import {PageEvent} from "@angular/material/paginator";
+import { SaveFiltersDialogComponent } from './save-filters-dialog/save-filters-dialog.component';
+import { AcctionsModalComponent } from './acctions-modal/acctions-modal.component';
@Component({
selector: 'app-groups',
@@ -24,23 +27,55 @@ import { ClassroomViewDialogComponent } from './classroom-view/classroom-view-mo
export class GroupsComponent implements OnInit {
organizationalUnits: UnidadOrganizativa[] = [];
selectedUnidad: UnidadOrganizativa | null = null;
- selectedDetail: any | null = null; // Nueva variable para el detalle del elemento seleccionado
+ selectedDetail: any | null = null;
children: any[] = [];
breadcrumb: string[] = [];
- clientsData: any[] = []; // Nueva variable para almacenar los datos de clients
- breadcrumbData: any[] = []; // Almacenar datos de breadcrumb para navegar
+ clientsData: any[] = [];
+ breadcrumbData: any[] = [];
loading:boolean = false;
loadingChildren:boolean = false;
searchTerm: string = '';
-constructor(
+ selectedFilter1: string = 'none';
+ selectedFilter2: string = 'none';
+
+ selectedFilterOS: string[] = [];
+ selectedFilterStatus: string[] = [];
+ filterIP: string = '';
+ filterMAC: string = '';
+
+ filterName: string = '';
+ filteredResults: any[] = [];
+ savedFilterNames: any[] = [];
+ length: number = 0;
+ itemsPerPage: number = 10;
+ page: number = 1;
+ pageSizeOptions: number[] = [5, 10, 25, 100];
+ selectedElements: string[] = [];
+ isAllSelected: boolean = false;
+
+
+ constructor(
private dataService: DataService,
public dialog: MatDialog,
private toastService: ToastrService,
- private _bottomSheet: MatBottomSheet
+ private _bottomSheet: MatBottomSheet,
+ private http: HttpClient
) {}
ngOnInit(): void {
this.search();
+ this.getFilters();
+ }
+
+ getFilters(): void {
+ this.dataService.getFilters().subscribe(
+ data => {
+ this.savedFilterNames = data.map((filter: any) => [filter.name, filter.uuid]);
+ },
+ error => {
+ console.error('Error fetching filters:', error);
+ }
+ );
}
search(): void {
@@ -48,11 +83,11 @@ constructor(
this.dataService.getOrganizationalUnits(this.searchTerm).subscribe(
data => {
this.organizationalUnits = data;
- this.loading = false; // Desactivar el spinner después de obtener los datos
+ this.loading = false;
},
error => {
console.error('Error fetching unidades organizativas', error);
- this.loading = false; // Desactivar el spinner en caso de error
+ this.loading = false;
}
);
}
@@ -60,14 +95,14 @@ constructor(
onSelectUnidad(unidad: UnidadOrganizativa): void {
this.selectedUnidad = unidad;
- this.selectedDetail = unidad; // Mostrar detalles de la unidad seleccionada
+ this.selectedDetail = unidad;
this.breadcrumb = [unidad.name];
this.breadcrumbData = [unidad];
this.loadChildrenAndClients(unidad.id);
}
onSelectChild(child: any): void {
- this.selectedDetail = child; // Mostrar detalles del niño seleccionado
+ this.selectedDetail = child;
if (child.type !== 'client' && child.uuid && child.id) {
this.breadcrumb.push(child.name || child.name);
this.breadcrumbData.push(child);
@@ -93,27 +128,27 @@ constructor(
console.log('Children data:', childrenData);
this.dataService.getClients(id).subscribe(
clientsData => {
- this.clientsData = clientsData; // Almacenar clientsData para pasarlo al componente hijo
+ this.clientsData = clientsData;
const newChildren = [...childrenData, ...clientsData];
if (newChildren.length > 0) {
this.children = newChildren;
} else {
- this.children = []; // Limpiar card2 cuando no hay elementos
+ this.children = [];
}
this.loadingChildren = false
},
error => {
console.error('Error fetching clients', error);
- this.clientsData = []; // Limpiar clientsData en caso de error
- this.children = []; // Limpiar card2 en caso de error
+ this.clientsData = [];
+ this.children = [];
this.loadingChildren = false
}
);
},
error => {
console.error('Error fetching children', error);
- this.children = []; // Limpiar card2 en caso de error
+ this.children = [];
this.loadingChildren = false
}
);
@@ -138,7 +173,6 @@ constructor(
const dialogRef = this.dialog.open(CreateClientComponent, { data: { organizationalUnit }, width: '700px'});
- // Subscribirse al evento unitAdded del componente de creación después de cerrar el diálogo
dialogRef.afterClosed().subscribe(() => {
this.dataService.getOrganizationalUnits().subscribe(
data => {
@@ -267,4 +301,117 @@ constructor(
});
}
}
+
+ applyFilter() {
+ this.dataService.getFilteredResults(this.selectedFilter1, this.selectedFilter2, this.filterName, this.page, this.itemsPerPage)
+ .subscribe(
+ response => {
+ this.filteredResults = response.results;
+ this.length = response.total;
+ },
+ error => {
+ console.error('Error al obtener los resultados filtrados', error);
+ this.filteredResults = [];
+ }
+ );
+ }
+
+ onPageChange(event: PageEvent) {
+ this.page = event.pageIndex;
+ this.itemsPerPage = event.pageSize;
+ this.applyFilter();
+ }
+
+
+ saveFilters() {
+ const dialogRef = this.dialog.open(SaveFiltersDialogComponent);
+
+ dialogRef.afterClosed().subscribe(result => {
+ if (result) {
+ const filters = {
+ name: result,
+ favourite: true,
+ filters: {
+ filter0: this.filterName,
+ filter1: this.selectedFilter1,
+ filter2: this.selectedFilter2,
+ filter3: this.selectedFilterOS,
+ filter4: this.selectedFilterStatus,
+ filter5: this.filterIP,
+ filter6: this.filterMAC,
+
+ }
+ };
+
+ this.http.post('http://127.0.0.1:8080/views', filters).subscribe(response => {
+ console.log('Response from server:', response);
+ this.toastService.success('Se ha guardado el filtro correctamente');
+ }, error => {
+ console.error('Error:', error);
+ this.toastService.error(error);
+ });
+ }
+ });
+ }
+
+ loadSelectedFilter(savedFilter: any) {
+ const url = 'http://127.0.0.1:8080/views/' + savedFilter[1];
+ console.log('llamando a:', url);
+
+ this.dataService.getFilter(savedFilter[1]).subscribe(response => {
+ console.log('Response from server:', response.filters);
+ if (response) {
+ console.log('Filter1:', response.filters);
+ this.filterName = response.filters.filter0 || '';
+ this.selectedFilter1 = response.filters.filter1 || null;
+ this.selectedFilter2 = response.filters.filter2 || '';
+
+ this.selectedFilterOS = response.filters.filter3 || [];
+ this.selectedFilterStatus = response.filters.filter4 || [];
+ this.filterIP = response.filters.filter5 || '';
+ this.filterMAC = response.filters.filter6 || '';
+
+ this.applyFilter();
+ }
+ }, error => {
+ console.error('Error:', error);
+ });
+
+ }
+
+
+ onCheckboxChange(event: any, name: string) {
+ if (event.checked) {
+ this.selectedElements.push(name);
+ } else {
+ const index = this.selectedElements.indexOf(name);
+ if (index > -1) {
+ this.selectedElements.splice(index, 1);
+ }
+ }
+
+ this.isAllSelected = this.selectedElements.length === this.filteredResults.length;
+ console.log(this.selectedElements);
+ }
+
+ toggleSelectAll() {
+ this.isAllSelected = !this.isAllSelected;
+
+ if (this.isAllSelected) {
+ this.selectedElements = this.filteredResults.map(result => result.name);
+ } else {
+ this.selectedElements = [];
+ }
+ console.log(this.selectedElements);
+ }
+
+ isSelected(name: string): boolean {
+ return this.selectedElements.includes(name);
+ }
+
+
+ sendActions() {
+ const dialogRef = this.dialog.open(AcctionsModalComponent, { data: { selectedElements: this.selectedElements }, width: '700px'});
+ }
+
}
diff --git a/ogWebconsole/src/app/components/groups/legend/legend.component.html b/ogWebconsole/src/app/components/groups/legend/legend.component.html
index 24929b2..9c1ecd5 100644
--- a/ogWebconsole/src/app/components/groups/legend/legend.component.html
+++ b/ogWebconsole/src/app/components/groups/legend/legend.component.html
@@ -1,22 +1,22 @@
apartment
- Unidad organizativa
+ Unidad organizativa
meeting_room
- Grupos de aula
+ Grupos de aula
school
- Aula
+ Aula
lan
- Grupos de clientes
+ Grupos de clientes
computer
- Cliente
+ Cliente
diff --git a/ogWebconsole/src/app/components/groups/organizational-units/create-organizational-unit/create-organizational-unit.component.html b/ogWebconsole/src/app/components/groups/organizational-units/create-organizational-unit/create-organizational-unit.component.html
index 21d080c..e076917 100644
--- a/ogWebconsole/src/app/components/groups/organizational-units/create-organizational-unit/create-organizational-unit.component.html
+++ b/ogWebconsole/src/app/components/groups/organizational-units/create-organizational-unit/create-organizational-unit.component.html
@@ -1,13 +1,13 @@
-
Añadir Unidad Organizativa
+
Añadir Unidad Organizativa
@@ -38,20 +38,20 @@
@@ -59,14 +59,14 @@
@@ -74,82 +74,82 @@
-
+
diff --git a/ogWebconsole/src/app/components/groups/organizational-units/edit-organizational-unit/edit-organizational-unit.component.html b/ogWebconsole/src/app/components/groups/organizational-units/edit-organizational-unit/edit-organizational-unit.component.html
index 3160f95..f2ff39d 100644
--- a/ogWebconsole/src/app/components/groups/organizational-units/edit-organizational-unit/edit-organizational-unit.component.html
+++ b/ogWebconsole/src/app/components/groups/organizational-units/edit-organizational-unit/edit-organizational-unit.component.html
@@ -1,32 +1,32 @@
-
Editar Unidad Organizativa
+
Editar Unidad Organizativa
@@ -34,20 +34,20 @@
@@ -55,14 +55,14 @@
@@ -70,83 +70,83 @@
-
+
diff --git a/ogWebconsole/src/app/components/groups/organizational-units/show-organizational-unit/show-organizational-unit.component.html b/ogWebconsole/src/app/components/groups/organizational-units/show-organizational-unit/show-organizational-unit.component.html
index 61639be..93406cd 100644
--- a/ogWebconsole/src/app/components/groups/organizational-units/show-organizational-unit/show-organizational-unit.component.html
+++ b/ogWebconsole/src/app/components/groups/organizational-units/show-organizational-unit/show-organizational-unit.component.html
@@ -1,42 +1,42 @@
-
Propiedades unidad organizativa
+
Propiedades unidad organizativa
-
+
- | Propiedad |
+ Propiedad |
{{ element.property }} |
- Valor |
+ Valor |
{{ element.value }} |
|
|
-
+
- | Propiedad |
+ Propiedad |
{{ element.property }} |
- Valor |
+ Valor |
{{ element.value }} |
|
|
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.css b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.html b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.html
new file mode 100644
index 0000000..c02fcb8
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.html
@@ -0,0 +1 @@
+
save-filters-dialog works!
diff --git a/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.spec.ts b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.spec.ts
new file mode 100644
index 0000000..1a1622b
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SaveFiltersDialogComponent } from './save-filters-dialog.component';
+
+describe('SaveFiltersDialogComponent', () => {
+ let component: SaveFiltersDialogComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [SaveFiltersDialogComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(SaveFiltersDialogComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.ts b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.ts
new file mode 100644
index 0000000..9707c63
--- /dev/null
+++ b/ogWebconsole/src/app/components/groups/save-filters-dialog/save-filters-dialog.component.ts
@@ -0,0 +1,38 @@
+import { Component } from '@angular/core';
+import { MatDialogRef } from '@angular/material/dialog';
+import { FormControl, Validators } from '@angular/forms';
+
+@Component({
+ selector: 'app-save-filters-dialog',
+ template: `
+ Guardar filtros
+
+
+ Nombre del filtro
+
+
+ El nombre es obligatorio
+
+
+
+
+
+
+
+ `
+})
+export class SaveFiltersDialogComponent {
+ filterNameControl = new FormControl('', [Validators.required]);
+
+ constructor(public dialogRef: MatDialogRef) {}
+
+ onCancel(): void {
+ this.dialogRef.close(null);
+ }
+
+ onSave(): void {
+ if (this.filterNameControl.valid) {
+ this.dialogRef.close(this.filterNameControl.value);
+ }
+ }
+}
diff --git a/ogWebconsole/src/app/components/groups/tree-view/tree-view.component.html b/ogWebconsole/src/app/components/groups/tree-view/tree-view.component.html
index 4c4e7ec..e15be5b 100644
--- a/ogWebconsole/src/app/components/groups/tree-view/tree-view.component.html
+++ b/ogWebconsole/src/app/components/groups/tree-view/tree-view.component.html
@@ -1,4 +1,4 @@
-Visualizar arbol unidad Organizativa
+Visualizar árbol unidad Organizativa
@@ -17,7 +17,8 @@
+ 
+