Browse Source

Se agregaron dos nuevos tipos de tickets y se elimino uno y tambien se modifico la vista de todos los tiquets para que muestre todos incluso los que estan en estado cerrado

pull/1/head
parent
commit
00b1a3823a
7 changed files with 18 additions and 27 deletions
  1. BIN
      src/main/bundles/prod.bundle
  2. +5
    -2
      src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java
  3. +6
    -15
      src/main/java/mx/gob/jumapacelaya/models/Ticket.java
  4. +1
    -4
      src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java
  5. +1
    -1
      src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java
  6. +1
    -1
      src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java
  7. +4
    -4
      src/main/resources/application.properties

BIN
src/main/bundles/prod.bundle View File


+ 5
- 2
src/main/java/mx/gob/jumapacelaya/api/RedmineClient.java View File

@ -40,15 +40,18 @@ public class RedmineClient {
}
//AQUI OBTENGO LOS TICKETS DESDE REDMINE
public List<Ticket> getTickets(RedmineUser user) {
public List<Ticket> getTickets(RedmineUser user, boolean includeClosed) {
List<Ticket> 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();


+ 6
- 15
src/main/java/mx/gob/jumapacelaya/models/Ticket.java View File

@ -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";


+ 1
- 4
src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java View File

@ -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<String, RedmineClient.TicketType> ticketTypesMap = api.getTicketTypes();
Set<String> 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<String> filteredTicketTypes = ticketTypesMap.keySet().stream()
.filter(ticketTypesSet::contains)
.collect(Collectors.toList());


+ 1
- 1
src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java View File

@ -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");


+ 1
- 1
src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java View File

@ -77,7 +77,7 @@ public class AllTicketsView extends VerticalLayout {
private void loadTickets() {
try {
List<Ticket> tickets = redmineClient.getTickets(userService.getRedmineUser());
List<Ticket> tickets = redmineClient.getTickets(userService.getRedmineUser(), true);
if (tickets != null && !tickets.isEmpty()) {
grid.setItems(tickets);
} else {


+ 4
- 4
src/main/resources/application.properties View File

@ -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###


Loading…
Cancel
Save