filtrado por comunidad funciona

Frontend/client/src/app/app.component.html

@@ -15,6 +15,7 @@
 
                     
                      <h3 class="comunidades">Elementos de filtrado</h3>
+                     <br>
                     <span class="select_all_span">
                         <input id="allElements" type="checkbox" (change)="checkUncheckAll()" [(ngModel)]="seleccion "/>
                         <label for="allElements">Seleccionar todos</label>
@@ -24,8 +25,8 @@
                     <br>
             
                     <div class="filter_elements_container">
-                        <div *ngFor="let e of filterElements; index as i">
-                            <input id="checkbox{{i}}" type="checkbox" (change)="isAllSelected()" [(ngModel)]="e.isSelected"/>
+                        <div *ngFor="let e of elementsFilters; index as i">
+                            <input id="checkbox{{i}}" type="checkbox" (change)="select()" [(ngModel)]="e.isSelected"/>
                             <label for="checkbox{{i}}">{{e.value}}</label>
                         </div>
                     </div>
@@ -35,7 +36,7 @@
                  </div>
             </div>
             <div class="col-8">
-                <app-line-chart></app-line-chart>
+                <app-line-chart [filterElements]="elementsFilters"></app-line-chart>
             </div>
         </div>
     </div>

Frontend/client/src/app/app.component.ts

 import { Component, OnInit } from '@angular/core';
-import { DataService } from 'src/app/service/data.service';
+import { DataService } from 'src/app/service/comunidadData.service';
 
 @Component({
   selector: 'app-root',
@@ -9,7 +9,7 @@ import { DataService } from 'src/app/service/data.service';
 export class AppComponent implements OnInit {
   dataService: DataService = new DataService;
   seleccion!: boolean
-  filterElements!: any[]
+  elementsFilters!: any[] 
 
   ngOnInit(): void{
     this.seleccion = true
@@ -17,21 +17,20 @@ export class AppComponent implements OnInit {
   }
 
   inicializar(): void{ 
-    this.filterElements = []
-    //let comunidades: string[] = this.dataService.COMUNIDADES;
+    this.elementsFilters = []
     for(let element of this.dataService.COMUNIDADES ) {
-      this.filterElements.push({ value: element, isSelected: true })
+      this.elementsFilters.push({ value: element, isSelected: true })
     }
   }
 
   checkUncheckAll() {
-    for (let element of this.filterElements) {
+    for (let element of this.elementsFilters) {
       element.isSelected = this.seleccion
     }
-
   }
-  isAllSelected() {
-    this.seleccion = this.filterElements.every(e => e.isSelected === true)
+
+  select() {
+    this.seleccion = this.elementsFilters.every(e => e.isSelected === true)
   }
 
 }
\ No newline at end of file

Frontend/client/src/app/components/line-chart/line-chart.component.ts

-import { Component, OnInit } from '@angular/core';
-import { ChartDataset, ChartConfiguration} from 'chart.js';
-import { NgChartsModule} from 'ng2-charts';
+import { Component, OnInit, Input } from '@angular/core';
+import { ChartDataset} from 'chart.js';
 import { UniversidadService } from '../../service/universidad.service';
 import { Universidad } from '../../model/universidad';
 import { Comunidad } from '../../model/comunidad';
+import { Grafico } from '../../service/grafico.service';
 
 @Component({
   selector: 'app-line-chart',
@@ -13,54 +13,65 @@ import { Comunidad } from '../../model/comunidad';
 export class LineChartComponent implements OnInit{
   private universidades!: Universidad[]
   private comunidades!: Comunidad[]
+
   graphData!: any[]
   graphLabels!: any[]
 
+  tipoGrafico: Grafico = Grafico.COMUNIDADES
+ 
+  @Input() filterElements!: any[]
+
   // Estos datos están aquí por defecto
   lineChartData: ChartDataset[] = [];
-  lineChartLabels:string[] = [];
+  lineChartLabels:string[] = ["Publicaciones"];
   lineChartOptions = { responsive: true};
   lineChartLegend = true;
   lineChartPlugins = [];
   lineChartType = 'line';
 
+
   constructor(
     private UniversidadService: UniversidadService
   ) {}
+
+
    ngOnInit():void {
+   /*if(this.tipoGrafico==Grafico.COMUNIDADES){
+    this.Comunidades()
+   } else {
+    this.GUniversidades()
+   }*/
    this.Comunidades()
   }
 
    Comunidades() {
     this.graphData = []
     this.UniversidadService.getTotalPorComunidad().subscribe((comunidades: Comunidad[]) =>{
-      if(comunidades) {
         this.comunidades = comunidades
         this.createGraphCom()
-      }
     });
-    this.lineChartLabels = ["Publicaciones"]
+    // this.tipoGrafico = Grafico.UNIVERSIDADES
   }
 
   GUniversidades(){
     this.graphData = []
     this.UniversidadService.getAllUniversidades().subscribe((universidades: Universidad[]) =>{
-      if(universidades) {
         this.universidades = universidades
         this.createGraphUniv()
-      }
     });
-    this.lineChartLabels = ["Publicaciones"]
+    // this.tipoGrafico = Grafico.UNIVERSIDADES
   }
 
   createGraphCom(){
     this.graphData = []
     let auxData: number[] = []
     for(let com of this.comunidades) {
+      if(this.filtrado(com.comunidad)){ // Mejorar esto
         auxData.push(com.total)
         this.graphData.push({ data: auxData , label: com.comunidad })
         auxData=[]
       }
+    }
     this.lineChartData = this.graphData
   }
 
@@ -68,10 +79,23 @@ export class LineChartComponent implements OnInit{
     this.graphData = []
     let auxData: number[] = []
     for(let uni of this.universidades) {
+      if(this.filtrado(uni.comunidad)){ 
       auxData.push(uni.totalPublicaciones)
       this.graphData.push({ data: auxData , label:  uni.siglas })
       auxData=[]
       }
+    }
     this.lineChartData = this.graphData
   }
+
+  filtrado(com: string): boolean { 
+    for(let f of this.filterElements){
+      if(f.value==com){
+        console.log(f.isSelected)
+        return f.isSelected
+      }
+    }
+    return false
+  }
+
 }

Frontend/client/src/app/service/grafico.service.ts

+export enum Grafico {
+  COMUNIDADES = 0,
+  UNIVERSIDADES = 1
+}
\ No newline at end of file