From 689c414393a6f4342578a01c4f27a7d5ed9329f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Antonio=20Ram=C3=ADrez=20Galv=C3=A1n?= Date: Fri, 14 Jun 2024 15:52:09 -0600 Subject: [PATCH] En esta version ya se enlazo con la instancia de proyman en productivo sustituyendo la url y la apiKey, tambien se cambiaron algunos iconos y correciones en textos --- .../example/application/views/MainLayout.java | 2 +- .../CrearnuevoTicketView.java | 2 +- .../views/tickets/MisTicketsView.java | 35 ++++++------------- src/main/resources/application.properties | 4 +-- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/example/application/views/MainLayout.java b/src/main/java/com/example/application/views/MainLayout.java index cce994c..cd003d2 100644 --- a/src/main/java/com/example/application/views/MainLayout.java +++ b/src/main/java/com/example/application/views/MainLayout.java @@ -85,7 +85,7 @@ public class MainLayout extends AppLayout { nav.addItem(new SideNavItem("Crear nuevo ticket", CrearnuevoTicketView.class, LineAwesomeIcon.EDIT.create())); nav.addItem(new SideNavItem("Mis tickets", MisTicketsView.class, LineAwesomeIcon.TICKET_ALT_SOLID.create())); - nav.addItem(new SideNavItem("Todos los tickets", AllTicketsView.class, LineAwesomeIcon.TICKET_ALT_SOLID.create())); + nav.addItem(new SideNavItem("Todos los tickets", AllTicketsView.class, LineAwesomeIcon.LIST_ALT.create())); return nav; diff --git a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java index bdf44f3..11af4c7 100644 --- a/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/com/example/application/views/crearnuevoticket/CrearnuevoTicketView.java @@ -70,7 +70,7 @@ public class CrearnuevoTicketView extends VerticalLayout { // Boton para crear los tickets Button createButton = new Button("Enviar ticket", event -> { Map issueDetails = new HashMap<>(); - issueDetails.put("project_id", "proyecto-de-prueba"); + issueDetails.put("project_id", "soporte-tecnico-t-i"); issueDetails.put("subject", asunto.getValue()); issueDetails.put("description", descripcion.getValue()); 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 a68caa8..b0ce3ac 100644 --- a/src/main/java/com/example/application/views/tickets/MisTicketsView.java +++ b/src/main/java/com/example/application/views/tickets/MisTicketsView.java @@ -1,7 +1,6 @@ package com.example.application.views.tickets; import com.example.application.api.RedmineClient; -import com.example.application.api.SecurityService; import com.example.application.api.ServerPrpperties; import com.example.application.models.Ticket; import com.example.application.views.MainLayout; @@ -23,15 +22,12 @@ public class MisTicketsView extends VerticalLayout { private final RedmineClient redmineClient; private final Grid grid; - private final SecurityService securityService; @Autowired - public MisTicketsView(ServerPrpperties prpperties, SecurityService securityService) { + public MisTicketsView(ServerPrpperties prpperties) { this.redmineClient = new RedmineClient(prpperties.REDMINE_URL, prpperties.API_KEY); this.grid = new Grid<>(Ticket.class, false); - this.securityService = securityService; - // Definir columnas en el orden deseado grid.addColumn(Ticket::getId).setHeader("No.") .setWidth("4em").setFlexGrow(0); grid.addColumn(Ticket::getSubject).setHeader("Asunto") @@ -41,6 +37,7 @@ public class MisTicketsView extends VerticalLayout { grid.addColumn(Ticket::getDescription).setHeader("Descripción") .setAutoWidth(true).setFlexGrow(1); + // Ajustar tamaño del Grid y Layout grid.setSizeFull(); setSizeFull(); @@ -51,39 +48,29 @@ public class MisTicketsView extends VerticalLayout { add(grid); expand(grid); - loadTickets(getAuthenticatedUsername()); + loadTickets(); } - private void loadTickets(String authenticatedUsername) { + private void loadTickets() { List tickets = redmineClient.getTickets(); - tickets.removeIf(ticket -> !ticket.getAuthor().getUsername().equals(authenticatedUsername)); - System.out.println("Tickets para mostrar: " + tickets.size()); grid.setItems(tickets); } - private String getAuthenticatedUsername() { - String username = securityService.getAuthenticatedUser().getUsername(); - System.out.println("Usuario autenticado: " + username); - return username; - } - private ComponentRenderer createStatusRender() { return new ComponentRenderer<>(ticket -> { Span span = new Span(ticket.getStatus()); switch (ticket.getStatus().toLowerCase()) { - case "open": - span.getElement().getStyle().set("color", "white"); + case "en curso": + span.getElement().getStyle().set("color","purple"); break; - case "closed": - span.getElement().getStyle().set("color", "white"); + case "comentarios": + span.getElement().getStyle().set("color","orange"); break; - case "in progress": - span.getElement().getStyle().set("background-color", "orange"); - span.getElement().getStyle().set("color", "black"); + case "resuelta": + span.getElement().getStyle().set("color","green"); break; default: - span.getElement().getStyle().set("background-color", "blue"); - span.getElement().getStyle().set("color", "white"); + span.getElement().getStyle().set("color","blue"); break; } return span; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 16d91d8..48c0a48 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,5 +20,5 @@ password: Dr3na%134$4guA #################################################### -redmine.url=http://localhost:3000/ -redmine.api_key=35164d2320404b66a71df90d514107790bc1aed6 \ No newline at end of file +redmine.url=https://proyman.jumapacelaya.gob.mx/ +redmine.api_key=ad58996f706a48474f1c74368bb35b4614428d90 \ No newline at end of file