From 77bf327372ba8b14919940580400b4faf4cda038 Mon Sep 17 00:00:00 2001 From: mramirezg Date: Thu, 28 Nov 2024 15:09:10 -0600 Subject: [PATCH] ya se pasa el usuarioid en la url y se coloca en la etiqueta --- .../mx/gob/jumapacelaya/views/HomeView.java | 10 ++++++- .../gob/jumapacelaya/views/PgoTomasView.java | 23 ++++++++++++-- .../jumapacelaya/views/ReciboDgtalView.java | 23 ++++++++++++-- .../jumapacelaya/views/SolicitudDescView.java | 21 +++++++++++-- .../jumapacelaya/views/VerificacionView.java | 30 +++++++++++++------ 5 files changed, 88 insertions(+), 19 deletions(-) diff --git a/src/main/java/mx/gob/jumapacelaya/views/HomeView.java b/src/main/java/mx/gob/jumapacelaya/views/HomeView.java index 5acb588..46f1f42 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/HomeView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/HomeView.java @@ -129,7 +129,15 @@ public class HomeView extends VerticalLayout { H3 cardTitle = new H3(title); Paragraph description = new Paragraph(""); - card.addClickListener(event -> UI.getCurrent().navigate(route)); + card.addClickListener(event -> { + if (usuarioSeleccionado != null) { + String username = usuarioSeleccionado.getUsuarioId(); + UI.getCurrent().navigate(route + "?usuarioid=" + username); + + } else { + Notification.show("Por favor, selecciona un usuario primero."); + } + }); card.add(cardTitle, description); return card; diff --git a/src/main/java/mx/gob/jumapacelaya/views/PgoTomasView.java b/src/main/java/mx/gob/jumapacelaya/views/PgoTomasView.java index e511587..f08fb0c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/PgoTomasView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/PgoTomasView.java @@ -10,6 +10,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.NumberField; import com.vaadin.flow.component.textfield.TextField; +import com.vaadin.flow.router.BeforeEnterEvent; +import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; @@ -18,7 +20,9 @@ import java.time.format.DateTimeFormatter; @PageTitle("PGO y Tomas Indep") @Route(value = "pgotomasindep", layout = MainLayout.class) -public class PgoTomasView extends VerticalLayout { +public class PgoTomasView extends VerticalLayout implements BeforeEnterObserver { + + private H3 label; public PgoTomasView() { @@ -72,8 +76,7 @@ public class PgoTomasView extends VerticalLayout { formularioLayout.setSpacing(true); formularioLayout.setPadding(true); - H3 label = new H3(); - label.setText("Solicitud de Verificación PGO-Toma independiente [USUARIO]"); + label = new H3("Solicitud de Descuento en adeudo [USUARIO]"); Span labelTexto = new Span(); labelTexto.setText("Prepara la solicitud:"); @@ -103,4 +106,18 @@ public class PgoTomasView extends VerticalLayout { formularioLayout.setSpacing(false); this.add(formularioLayout, btnVerSolicitud); } + + + @Override + public void beforeEnter(BeforeEnterEvent event) { + String usuario = event.getLocation().getQueryParameters().getParameters().get("usuarioid") != null + ? event.getLocation().getQueryParameters().getParameters().get("usuarioid").stream().findFirst().orElse(null) + : null; + + if (usuario != null) { + label.setText("Solicitud de Descuento en adeudo [" + usuario + "]"); + } else { + label.setText("Usuario Desconocido"); + } + } } diff --git a/src/main/java/mx/gob/jumapacelaya/views/ReciboDgtalView.java b/src/main/java/mx/gob/jumapacelaya/views/ReciboDgtalView.java index ad5a3f9..8006391 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/ReciboDgtalView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/ReciboDgtalView.java @@ -12,6 +12,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.NumberField; import com.vaadin.flow.component.textfield.TextField; +import com.vaadin.flow.router.BeforeEnterEvent; +import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; @@ -20,7 +22,9 @@ import java.time.format.DateTimeFormatter; @PageTitle("Solicitud de Recibo Digital") @Route(value = "recibodigital", layout = MainLayout.class) -public class ReciboDgtalView extends VerticalLayout { +public class ReciboDgtalView extends VerticalLayout implements BeforeEnterObserver { + + private H3 label; public ReciboDgtalView() { @@ -74,8 +78,7 @@ public class ReciboDgtalView extends VerticalLayout { formularioLayout.setSpacing(true); formularioLayout.setPadding(true); - H3 label = new H3(); - label.setText("Solicitud de Recibo Digital [USUARIO]"); + label = new H3("Solicitud de Descuento en adeudo [USUARIO]"); Span labelTexto = new Span(); labelTexto.setText("Prepara la solicitud:"); @@ -119,4 +122,18 @@ public class ReciboDgtalView extends VerticalLayout { formularioLayout.setSpacing(false); this.add(formularioLayout, btnVerSolicitud); } + + + @Override + public void beforeEnter(BeforeEnterEvent event) { + String usuario = event.getLocation().getQueryParameters().getParameters().get("usuarioid") != null + ? event.getLocation().getQueryParameters().getParameters().get("usuarioid").stream().findFirst().orElse(null) + : null; + + if (usuario != null) { + label.setText("Solicitud de Descuento en adeudo [" + usuario + "]"); + } else { + label.setText("Usuario Desconocido"); + } + } } diff --git a/src/main/java/mx/gob/jumapacelaya/views/SolicitudDescView.java b/src/main/java/mx/gob/jumapacelaya/views/SolicitudDescView.java index e6850e9..992840c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/SolicitudDescView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/SolicitudDescView.java @@ -22,10 +22,11 @@ import org.hibernate.annotations.DialectOverride; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Date; +import java.util.List; @PageTitle("Solicitud de Descuento") @Route(value = "solidesc", layout = MainLayout.class) -public class SolicitudDescView extends VerticalLayout { +public class SolicitudDescView extends VerticalLayout implements BeforeEnterObserver { private H3 label; @@ -38,6 +39,7 @@ public class SolicitudDescView extends VerticalLayout { } + private void cabezera() { HorizontalLayout encabezadoLayout = new HorizontalLayout(); @@ -82,8 +84,8 @@ public class SolicitudDescView extends VerticalLayout { formularioLayout.setSpacing(true); formularioLayout.setPadding(true); - H3 label = new H3(); - label.setText("Solicitud de Descuento en adeudo [USUARIO]"); + + label = new H3("Solicitud de Descuento en adeudo [USUARIO]"); Span labelTexto = new Span(); labelTexto.setText("Prepara la solicitud:"); @@ -127,4 +129,17 @@ public class SolicitudDescView extends VerticalLayout { formularioLayout.setSpacing(false); this.add(formularioLayout, btnVerSolicitud); } + + @Override + public void beforeEnter(BeforeEnterEvent event) { + String usuario = event.getLocation().getQueryParameters().getParameters().get("usuarioid") != null + ? event.getLocation().getQueryParameters().getParameters().get("usuarioid").stream().findFirst().orElse(null) + : null; + + if (usuario != null) { + label.setText("Solicitud de Descuento en adeudo [" + usuario + "]"); + } else { + label.setText("Usuario Desconocido"); + } + } } diff --git a/src/main/java/mx/gob/jumapacelaya/views/VerificacionView.java b/src/main/java/mx/gob/jumapacelaya/views/VerificacionView.java index 20b8f4b..7bfe9ba 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/VerificacionView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/VerificacionView.java @@ -2,9 +2,6 @@ package mx.gob.jumapacelaya.views; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; -import com.vaadin.flow.component.checkbox.CheckboxGroup; -import com.vaadin.flow.component.combobox.ComboBox; -import com.vaadin.flow.component.html.H1; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.H3; import com.vaadin.flow.component.html.Span; @@ -12,6 +9,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.NumberField; import com.vaadin.flow.component.textfield.TextField; +import com.vaadin.flow.router.BeforeEnterEvent; +import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; @@ -20,7 +19,9 @@ import java.time.format.DateTimeFormatter; @PageTitle("Verificacion") @Route(value = "verificacion", layout = MainLayout.class) -public class VerificacionView extends VerticalLayout { +public class VerificacionView extends VerticalLayout implements BeforeEnterObserver { + + private H3 label; public VerificacionView() { @@ -74,12 +75,9 @@ public class VerificacionView extends VerticalLayout { formularioLayout.setSpacing(true); formularioLayout.setPadding(true); - H3 label = new H3(); - label.setText("Solicitud de Verificación [USUARIO]"); - - Span labelTexto = new Span(); - labelTexto.setText("Prepara la solicitud:"); + label = new H3("Solicitud de Descuento en adeudo [USUARIO]"); + Span labelTexto = new Span("Prepara la solicitud:"); NumberField predio = new NumberField("Predio:"); @@ -105,4 +103,18 @@ public class VerificacionView extends VerticalLayout { formularioLayout.setSpacing(false); this.add(formularioLayout, btnVerSolicitud); } + + + @Override + public void beforeEnter(BeforeEnterEvent event) { + String usuario = event.getLocation().getQueryParameters().getParameters().get("usuarioid") != null + ? event.getLocation().getQueryParameters().getParameters().get("usuarioid").stream().findFirst().orElse(null) + : null; + + if (usuario != null) { + label.setText("Solicitud de Descuento en adeudo [" + usuario + "]"); + } else { + label.setText("Usuario Desconocido"); + } + } }