diff --git a/src/main/java/mx/gob/jumapacelaya/ui/ActDiariaView.java b/src/main/java/mx/gob/jumapacelaya/ui/ActDiariaView.java index 68c7afa..21a65f1 100644 --- a/src/main/java/mx/gob/jumapacelaya/ui/ActDiariaView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/ActDiariaView.java @@ -92,7 +92,7 @@ public class ActDiariaView extends VerticalLayout { return btnVer; }).setHeader("Descripcion").setAutoWidth(true); - grid.addColumn(buttonTicketComponentRenderer()).setHeader("Realizar").setFlexGrow(0).setAutoWidth(true); + //grid.addColumn(buttonTicketComponentRenderer()).setHeader("Realizar").setFlexGrow(0).setAutoWidth(true); grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); grid.getStyle().set("opacity", "0.8"); diff --git a/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java b/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java index eeed5b1..022ca4e 100644 --- a/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java @@ -187,7 +187,7 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse txtNombreEquipo.setReadOnly(true); - departamentoLayout.add(area, usuario, btnEnviarCorreo, txtNombreEquipo); + departamentoLayout.add(area, usuario/*, btnEnviarCorreo*/, txtNombreEquipo); departamentoLayout.setWidthFull(); createHardwareSection(databaseService); @@ -411,7 +411,7 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse private void signLayout() { VerticalLayout userSignLayout = new VerticalLayout(); userSignPad = new SignaturePad(); - userSignPad.setBackgroundColor(0, 0, 0, 0); + userSignPad.setBackgroundColor("#FFFFFF"); userSignPad.setHeight("200px"); userSignPad.setPenColor("#000000"); userSignPad.getElement().getStyle().set("border", "1px solid black"); @@ -426,9 +426,9 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse VerticalLayout smtSignLayout = new VerticalLayout(); smtSignPad = new SignaturePad(); smtSignPad.setHeight("200px"); - smtSignPad.setBackgroundColor(0, 0, 0, 0); + smtSignPad.setBackgroundColor("#FFFFFF"); smtSignPad.setPenColor("#000000"); - smtSignPad.getElement().getStyle().set("border", "1px solid black"); + smtSignPad.getElement().getStyle().set("border", "2px solid black"); String u = securityService.getAuthenticatedUser(); Span smtSignSpan = new Span(u); Span tituloSMT = new Span("Responsable de Soporte"); @@ -440,7 +440,7 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse VerticalLayout gcialSignLayout = new VerticalLayout(); gciatiSignPad = new SignaturePad(); - gciatiSignPad.setBackgroundColor(0, 0, 0, 0); + gciatiSignPad.setBackgroundColor("#FFFFFF"); gciatiSignPad.setHeight("200px"); gciatiSignPad.setPenColor("#000000"); gciatiSignPad.getElement().getStyle().set("border", "1px solid black"); diff --git a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java index caaa71a..f5231b5 100644 --- a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java +++ b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java @@ -65,6 +65,7 @@ public class PlanAnualView extends VerticalLayout { // Se crea el filtro para el grid. PlanAnualFilter planAnualFilter = new PlanAnualFilter(dataView); + planAnualFilter.setExcludeRealizado(true); HeaderRow headerRow = planAnualGrid.appendHeaderRow(); @@ -129,13 +130,18 @@ public class PlanAnualView extends VerticalLayout { btnInsertar.setVisible(false); VerticalLayout gridLayout = new VerticalLayout(); - gridLayout.add(planAnualGrid, upload, btnInsertar); + gridLayout.setSizeFull(); + gridLayout.add(planAnualGrid); + + HorizontalLayout uploadLayout = new HorizontalLayout(); + uploadLayout.add(upload, btnInsertar); this.setPadding(false); this.setMargin(false); this.setSpacing(false); - add(header, gridLayout); + this.setSizeFull(); + add(header, gridLayout, uploadLayout); } @@ -319,6 +325,7 @@ public class PlanAnualView extends VerticalLayout { private static class PlanAnualFilter { private final GridListDataView dataView; private String smt; + private boolean excludeRealizado = true; public PlanAnualFilter(GridListDataView dataView) { this.dataView = dataView; @@ -330,9 +337,15 @@ public class PlanAnualView extends VerticalLayout { this.dataView.refreshAll(); } + public void setExcludeRealizado(boolean excludeRealizado) { + this.excludeRealizado = excludeRealizado; + this.dataView.refreshAll(); + } + public boolean test(PlanAnual planAnual) { boolean matchesSmt = matches(planAnual.getSmt(), smt); - return matchesSmt; + boolean isNoRealizado = !excludeRealizado || !"REALIZADO".equalsIgnoreCase(planAnual.getEstado()); + return matchesSmt && isNoRealizado; } diff --git a/src/main/resources/META-INF/resources/icons/icon.png b/src/main/resources/META-INF/resources/icons/icon.png index df2ed4b..db03439 100644 Binary files a/src/main/resources/META-INF/resources/icons/icon.png and b/src/main/resources/META-INF/resources/icons/icon.png differ