diff --git a/src/main/java/mx/gob/jumapacelaya/Application.java b/src/main/java/mx/gob/jumapacelaya/Application.java index 89b6e28..a78d75f 100644 --- a/src/main/java/mx/gob/jumapacelaya/Application.java +++ b/src/main/java/mx/gob/jumapacelaya/Application.java @@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConf @SpringBootApplication(exclude = ErrorMvcAutoConfiguration.class) @Theme(value = "soportet.iv1.2") @JsModule("@vaadin/vaadin-lumo-styles/presets/compact.js") -@PWA(name = "My Application", shortName = "My App", iconPath = "images/960x960.png") +@PWA(name = "My Application", shortName = "My App", iconPath = "images/960x960recortado.png") public class Application implements AppShellConfigurator { private static final Logger logger = LoggerFactory.getLogger(Main.class); 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 3457987..6fb7553 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java @@ -55,8 +55,9 @@ public class CrearnuevoTicketView extends VerticalLayout { RedmineUser user = userService.getRedmineUser(); + //Componentes principales de la UI ComboBox tipoTickets = createTicketTypeComboBox(); - TextField asunto = createTextField("Asunto", "700px"); + TextField asunto = createTextField("Asunto", "1000px"); TextArea descripcion = createTextArea("Descripcion", "1000px", "250px"); // Marcar campos como obligatorios @@ -66,16 +67,33 @@ public class CrearnuevoTicketView extends VerticalLayout { uploadFile.addSucceededListener(event -> handleFileUpload(event.getFileName())); + //Configuracion del Boton Button createButton = new Button("Enviar ticket", event -> handleCreateButton(user, tipoTickets, asunto, descripcion)); createButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_LARGE); - VerticalLayout fieldsLayout = new VerticalLayout(descripcion, uploadFile, ticketTypeDesc); - fieldsLayout.setAlignItems(Alignment.CENTER); - HorizontalLayout firstFields = new HorizontalLayout(tipoTickets, asunto); - VerticalLayout buttonLayout = new VerticalLayout(createButton); + + //Alineacion de los componentes ComboBox Tipos de tickets y Descripcion del tipo de ticket + HorizontalLayout firstFields = new HorizontalLayout(tipoTickets, ticketTypeDesc); + + + //Alineacion de los componentes de asunto y descripcion + VerticalLayout fieldsLayout = new VerticalLayout(asunto, descripcion); + fieldsLayout.setAlignItems(Alignment.START); + + + //Alineacion del Boton y del Upload + HorizontalLayout buttonLayout = new HorizontalLayout(uploadFile, createButton); buttonLayout.setAlignItems(Alignment.START); buttonLayout.setMargin(true); + + //Estilizacion del Span que muestra la descripcion del tipo de ticket + ticketTypeDesc.getStyle().set("font-size", "15px"); + ticketTypeDesc.getStyle().set("background-color", "#edeef0"); + ticketTypeDesc.getStyle().set("border-radius", "5px"); + ticketTypeDesc.getStyle().set("padding", "10px"); + + add(new H2("Crear nuevo ticket"), firstFields, fieldsLayout, buttonLayout); } 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 017d6d7..7fc7e7b 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java @@ -36,7 +36,9 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { // Configuración de la imagen - Image logo = new Image("images/1024x768.png", "Logo JUMAPA"); + Image logo = new Image("images/1024x768.png", "Logo JUMAPA 40ANIV"); + //logo.setWidth("900px"); + logo.setHeight("650px"); logo.addClassName("login-logo"); @@ -77,12 +79,12 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { loginFormContainer.getElement().getThemeList().add("dark"); - // Añadir la imagen y el contenedor del formulario al layout principal mainLayout.add(loginFormContainer, logo); mainLayout.setFlexGrow(1, loginFormContainer); mainLayout.setFlexGrow(2, logo); + // Añadir el layout principal a la vista add(mainLayout); } diff --git a/src/main/resources/META-INF/resources/images/960x960recortado.png b/src/main/resources/META-INF/resources/images/960x960recortado.png new file mode 100644 index 0000000..bb37344 Binary files /dev/null and b/src/main/resources/META-INF/resources/images/960x960recortado.png differ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a490922..f80ff87 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=9cc9e89cbbf08a6252045d56bd3d3ffec90adbad +redmine.url=https://proyman.jumapacelaya.gob.mx/ +redmine.api_key=9cc9e89cbbf08a6252045d56bd3d3ffec90adbad ########LOCAL###################################### -redmine.url=http://localhost:3000 -redmine.api_key=9cc9e89cbbf08a6252045d56bd3d3ffec90adbad +#redmine.url=http://localhost:3000 +#redmine.api_key=9cc9e89cbbf08a6252045d56bd3d3ffec90adbad ###CONFIGURACION DEL TAMANO MAXIMO PERMITIDO PARA ARCHIVOS###