From e52e057d9a8018fe72e4c10f07bc0c6e23d0e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Antonio=20Ram=C3=ADrez=20Galv=C3=A1n?= Date: Tue, 25 Jun 2024 11:43:12 -0600 Subject: [PATCH] =?UTF-8?q?En=20esta=20version=20se=20hizo=20un=20ajuste?= =?UTF-8?q?=20en=20el=20grid=20que=20muestra=20los=20tickets,=20se=20a?= =?UTF-8?q?=C3=B1adio=20la=20variante=20wrap=20al=20componente=20grid=20y?= =?UTF-8?q?=20se=20modifico=20la=20disposicion=20de=20la=20tabla,=20ademas?= =?UTF-8?q?=20tambien=20se=20cambio=20a=20espa=C3=B1ol=20el=20mensaje=20de?= =?UTF-8?q?=20error=20cuando=20el=20usuario=20pone=20su=20usuario=20o=20co?= =?UTF-8?q?ntrase=C3=B1a=20mal=20en=20la=20vista=20de=20login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/views/login/LoginView.java | 2 ++ .../views/tickets/AllTicketsView.java | 17 +++++++++++------ .../views/tickets/MisTicketsView.java | 17 +++++++++++------ src/main/resources/application.properties | 11 ++++++----- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/application/views/login/LoginView.java b/src/main/java/com/example/application/views/login/LoginView.java index 4c9581d..f0d552e 100644 --- a/src/main/java/com/example/application/views/login/LoginView.java +++ b/src/main/java/com/example/application/views/login/LoginView.java @@ -33,6 +33,8 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { i18nFormulario.setPassword("Contraseña"); i18nFormulario.setSubmit("Iniciar sesión"); i18n.setForm(i18nFormulario); + i18n.getErrorMessage().setTitle("Credenciales incorrectas"); + i18n.getErrorMessage().setMessage("El usuario o la contraseña son incorrectos, verifica tus credenciales."); formularioLogin = new LoginForm(); formularioLogin.setAction("login"); diff --git a/src/main/java/com/example/application/views/tickets/AllTicketsView.java b/src/main/java/com/example/application/views/tickets/AllTicketsView.java index a46bdca..14b5959 100644 --- a/src/main/java/com/example/application/views/tickets/AllTicketsView.java +++ b/src/main/java/com/example/application/views/tickets/AllTicketsView.java @@ -5,6 +5,7 @@ import com.example.application.api.ServerPrpperties; import com.example.application.models.Ticket; import com.example.application.views.MainLayout; import com.vaadin.flow.component.grid.Grid; +import com.vaadin.flow.component.grid.GridVariant; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.data.renderer.ComponentRenderer; @@ -34,10 +35,12 @@ public class AllTicketsView extends VerticalLayout { // Configuración de columnas del grid grid.addColumn(Ticket::getId).setHeader("No.") .setAutoWidth(true).setFlexGrow(0).setSortable(true); + grid.addColumn(Ticket::getSubject).setHeader("Asunto") - .setWidth("20em").setFlexGrow(0); - grid.addColumn(createStatusRender()).setHeader("Estado") - .setWidth("8em").setFlexGrow(0); + .setAutoWidth(true); + + grid.addColumn(createStatusRender()).setHeader("Estado"); + grid.addColumn(ticket -> { Date date = ticket.getDateCreate(); if (date != null) { @@ -46,9 +49,11 @@ public class AllTicketsView extends VerticalLayout { } else { return ""; } - }).setHeader("Fecha Creación").setWidth("10em").setFlexGrow(1); - grid.addColumn(Ticket::getDescription).setHeader("Descripción") - .setWidth("45em").setFlexGrow(1); + }).setHeader("Fecha creacion"); + + grid.addColumn(Ticket::getDescription).setHeader("Descripcion").setWidth("25em"); + + grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); // Ajustar tamaño del Grid y Layout diff --git a/src/main/java/com/example/application/views/tickets/MisTicketsView.java b/src/main/java/com/example/application/views/tickets/MisTicketsView.java index 31e09c8..261d109 100644 --- a/src/main/java/com/example/application/views/tickets/MisTicketsView.java +++ b/src/main/java/com/example/application/views/tickets/MisTicketsView.java @@ -5,6 +5,7 @@ import com.example.application.api.ServerPrpperties; import com.example.application.models.Ticket; import com.example.application.views.MainLayout; import com.vaadin.flow.component.grid.Grid; +import com.vaadin.flow.component.grid.GridVariant; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.data.renderer.ComponentRenderer; @@ -33,10 +34,12 @@ public class MisTicketsView extends VerticalLayout { // Configuración de columnas del grid grid.addColumn(Ticket::getId).setHeader("No.") .setAutoWidth(true).setFlexGrow(0).setSortable(true); + grid.addColumn(Ticket::getSubject).setHeader("Asunto") - .setWidth("20em").setFlexGrow(0); - grid.addColumn(createStatusRender()).setHeader("Estado") - .setWidth("8em").setFlexGrow(0); + .setAutoWidth(true); + + grid.addColumn(createStatusRender()).setHeader("Estado"); + grid.addColumn(ticket -> { Date date = ticket.getDateCreate(); if (date != null) { @@ -45,9 +48,11 @@ public class MisTicketsView extends VerticalLayout { } else { return ""; } - }).setHeader("Fecha Creación").setWidth("10em").setFlexGrow(1); - grid.addColumn(Ticket::getDescription).setHeader("Descripción") - .setWidth("45em").setFlexGrow(1); + }).setHeader("Fecha creacion"); + + grid.addColumn(Ticket::getDescription).setHeader("Descripcion").setWidth("25em"); + + grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); // Ajustar tamaño del Grid y Layout diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5ba3a08..2eadab9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,9 +20,10 @@ password: Dr3na%134$4guA ########PRODUCTIVO################################# -redmine.url=https://proyman.jumapacelaya.gob.mx/ -redmine.api_key=ad58996f706a48474f1c74368bb35b4614428d90 +#redmine.url=https://proyman.jumapacelaya.gob.mx/ +#redmine.api_key=ad58996f706a48474f1c74368bb35b4614428d90 -########LOCAL######################################## -#redmine.url=http://localhost:3000/ -#redmine.api_key=cf3be6168e66c99892c6212ea0bc64e8ab1c6848 \ No newline at end of file + +########LOCAL###################################### +redmine.url=http://localhost:3000/ +redmine.api_key=cf3be6168e66c99892c6212ea0bc64e8ab1c6848 \ No newline at end of file