diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index 3b8ff8f..13a259b 100644 Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ diff --git a/src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java b/src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java index a0748a4..cffa78d 100644 --- a/src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java +++ b/src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java @@ -40,15 +40,18 @@ public class RedmineClient { } //AQUI OBTENGO LOS TICKETS DESDE REDMINE - public List getTickets(RedmineUser user) { + public List getTickets(RedmineUser user, boolean includeClosed) { List tickets = new ArrayList<>(); HttpClient client = HttpClient.newHttpClient(); int offset = 0; + // Si includeClose es true, incluira todos los tikets si no, incluira solo los que estan abiertos + String statusFilter = includeClosed ? "&status_id=*" : "&status_id=open"; + while (true) { HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(REDMINE_URL + "/issues.json?key=" + user.getKey() + "&offset=" + offset)) + .uri(URI.create(REDMINE_URL + "/issues.json?key=" + user.getKey() + statusFilter + "&offset=" + offset)) .header("Content-Type", "application/json") .build(); diff --git a/src/main/java/mx/gob/jumapacelaya/models/Ticket.java b/src/main/java/mx/gob/jumapacelaya/models/Ticket.java index 3ddece2..27e69fb 100644 --- a/src/main/java/mx/gob/jumapacelaya/models/Ticket.java +++ b/src/main/java/mx/gob/jumapacelaya/models/Ticket.java @@ -86,23 +86,14 @@ public class Ticket { } switch (trackerId) { - case 1, 3, 9: - return "1 Dia"; + case 5,16,17: + return "2 horas max."; - case 2: - return "1-2 Dias"; + case 4,13,14: + return "2 a 6 horas"; - case 4, 8: - return "1-3 Dias"; - - case 5: - return "1-3 Meses"; - - case 6: - return "1-5 Dias"; - - case 7: - return "2 Dias"; + case 6,7,9,10,11,15: + return "1 a 2 Dias"; default: return "N/A"; diff --git a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java index 2cf2305..17bbcd2 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java @@ -102,9 +102,6 @@ public class CrearnuevoTicketView extends VerticalLayout { Upload uploadFile = new Upload(buffer); uploadFile.setMaxFiles(5); uploadFile.setDropAllowed(true); - uploadFile.setAcceptedFileTypes("image/jpeg", "image/png", "application/pdf", "image/gif", "image/svg", "text/plain", - "application/zip", "application/msword", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); UploadI18N i18N = new UploadI18N(); UploadI18N.Uploading uploading = i18N.getUploading(); @@ -134,7 +131,7 @@ public class CrearnuevoTicketView extends VerticalLayout { Map ticketTypesMap = api.getTicketTypes(); Set ticketTypesSet = Set.of("Acceso/Permiso/Bajas", "Soporte de Software", "Capacitacion de Software", "Configuracion de Software", "Digitalizacion GIS", "Documento", "Funcionalidad", "Reporte", - "Soporte o Mantenimiento", "Desarrollo de Software"); + "Mantenimiento Correctivo", "Desarrollo de Software", "Actividad"); List filteredTicketTypes = ticketTypesMap.keySet().stream() .filter(ticketTypesSet::contains) .collect(Collectors.toList()); diff --git a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java index 2642df7..6b6bd49 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java @@ -56,7 +56,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { i18nError.setMessage("Usuario o contraseña incorrectos, verifica tus credenciales"); i18n.setErrorMessage(i18nError); - i18n.setAdditionalInformation("Versión 1.2.2"); + i18n.setAdditionalInformation("Versión 1.3.0"); // Configuración del formulario de login login.setAction("login"); diff --git a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java index ff7d16f..4642dc8 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java @@ -77,7 +77,7 @@ public class AllTicketsView extends VerticalLayout { private void loadTickets() { try { - List tickets = redmineClient.getTickets(userService.getRedmineUser()); + List tickets = redmineClient.getTickets(userService.getRedmineUser(), true); if (tickets != null && !tickets.isEmpty()) { grid.setItems(tickets); } else { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4aaa5ed..ceba842 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,13 +18,13 @@ spring.ldap.password=Dr3na%134$4guA ########PRODUCTIVO################################# -#redmine.url=https://proyman.jumapacelaya.gob.mx/ -#redmine.api_key=04520c129b04844b86ec0a2adf1f3ade754c88ff +redmine.url=https://proyman.jumapacelaya.gob.mx/ +redmine.api_key=ce4dc8b6b531c818017e6831a5732ccc15b8faf6 ########LOCAL###################################### -redmine.url=http://localhost:10083 -redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b +#redmine.url=http://localhost:10083 +#redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b ###CONFIGURACION DEL TAMANO MAXIMO PERMITIDO PARA ARCHIVOS###