diff --git a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java index 2614554..84830c3 100644 --- a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java @@ -121,9 +121,14 @@ public class PlanAnualView extends VerticalLayout { PlanAnualFilter planAnualFilter = new PlanAnualFilter(dataView); planAnualFilter.setExcludeRealizado(true); - yearFilter.addValueChangeListener(event -> - planAnualFilter.setYear(event.getValue()) - ); + // Aplicar el valor actual del ComboBox al filtro al inicializar + if (yearFilter != null && yearFilter.getValue() != null) { + planAnualFilter.setYear(yearFilter.getValue()); + } + + if (yearFilter != null) { + yearFilter.addValueChangeListener(event -> planAnualFilter.setYear(event.getValue())); + } HeaderRow headerRow = planAnualGrid.appendHeaderRow(); /*headerRow.getCell(planAnualGrid.getColumnByKey("smtColumnKey")) @@ -390,8 +395,10 @@ public class PlanAnualView extends VerticalLayout { .boxed().collect(Collectors.toList()); yearFilter.setItems(years); yearFilter.setPlaceholder("Año"); + yearFilter.setValue(currentYear); yearFilter.setClearButtonVisible(true); + List todosLosPlanes = databaseService.getPlanAnual();