combo = new ComboBox<>(label);
+ combo.setItems(options);
+ combo.setWidth("250px");
+ combo.setAllowCustomValue(false);
+
+ UI.getCurrent().getPage().executeJs(
+ "return localStorage.getItem($0)",
+ "config:" + cssVariable
+ ).then(String.class, saved -> {
+ options.stream()
+ .filter(o -> o.getHexValue().equalsIgnoreCase(saved))
+ .findFirst()
+ .ifPresent(combo::setValue);
+ });
+
+ combo.addValueChangeListener(e -> {
+ if (initializing || e.getValue() == null) return;
+
+ applyCssVariable(cssVariable, e.getValue().getHexValue());
+ });
+
+ combo.setRenderer(colorRenderer());
+ return combo;
+ }
+
+ private void applyCssVariable(String variable, String value) {
+ UI.getCurrent().getPage().executeJs(
+ """
+ document.documentElement.style.setProperty($0,$1);
+ localStorage.setItem($2,$1);
+ """,
+ variable,
+ value,
+ "config:" + variable
+ );
+ }
+
+ private void loadCssVariablesFromLocalStorage() {
+ UI.getCurrent().getPage().executeJs(
+ """
+ ['--lumo-primary-color','--lumo-primary-text-color'].forEach(v=>{
+ const val = localStorage.getItem('config:'+v);
+ if(val) document.documentElement.style.setProperty(v,val);
+ });
+ """
+ );
+ }
+
+ /* -------------------- RENDERER -------------------- */
+
+ private ComponentRenderer colorRenderer() {
+ return new ComponentRenderer<>(opt -> {
+ Div wrapper = new Div();
+ wrapper.getStyle().set("display","flex").set("align-items","center");
+
+ Div dot = new Div();
+ dot.getStyle()
+ .set("width","14px")
+ .set("height","14px")
+ .set("border-radius","50%")
+ .set("margin-right","8px")
+ .set("background-color", opt.getHexValue())
+ .set("border","1px solid var(--lumo-border-color)");
+
+ wrapper.add(dot);
+ wrapper.add(opt.getName());
+ return wrapper;
+ });
+ }
+
+ /* -------------------- MODEL -------------------- */
+
+ public static class ColorOptions {
+ private final String name;
+ private final String hexValue;
+
+ public ColorOptions(String name, String hexValue) {
+ this.name = name;
+ this.hexValue = hexValue;
+ }
+
+ public String getName() { return name; }
+ public String getHexValue() { return hexValue; }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+ }
+}
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/DetallesMantView.java b/src/main/java/mx/gob/jumapacelaya/ui/DetallesMantView.java
index c5c6fd2..b0b7205 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/DetallesMantView.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/DetallesMantView.java
@@ -9,11 +9,15 @@ import java.util.List;
import java.util.Map;
import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.ButtonVariant;
import com.vaadin.flow.component.html.*;
+import com.vaadin.flow.component.page.History;
import com.vaadin.flow.server.StreamRegistration;
import com.vaadin.flow.server.StreamResource;
import mx.gob.jumapacelaya.services.EmailService;
import mx.gob.jumapacelaya.services.ReportService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -53,6 +57,8 @@ import mx.gob.jumapacelaya.services.SecurityService;
@CssImport("./themes/sistema-mantenimiento/styles.css")
public class DetallesMantView extends VerticalLayout implements BeforeEnterObserver {
+ private static final Logger logger = LoggerFactory.getLogger(DetallesMantView.class);
+
@Value("${app.base-url}")
private String baseUrl;
@@ -75,6 +81,7 @@ public class DetallesMantView extends VerticalLayout implements BeforeEnterObser
private final Button btnCancelar;
private final Button btnGuardar;
private final Button btnEnviarEncuesta = new Button("Enviar encuesta", LineAwesomeIcon.ENVELOPE_SOLID.create());
+ private final Button btnVolverAtras = new Button(LineAwesomeIcon.ARROW_LEFT_SOLID.create());
private int planAnualIdActual;
private int mantenimientoIdActual;
private Dialog confirmDialog;
@@ -102,7 +109,6 @@ public class DetallesMantView extends VerticalLayout implements BeforeEnterObser
mainLayout.getStyle()
.set("box-shadow","0 4px 8px rgba(0,0,0,0.2)")
.set("border-radius", "12px")
- .set("background-color", "white")
.set("padding", "1rem")
.set("margin", "1rem auto");
@@ -197,9 +203,14 @@ public class DetallesMantView extends VerticalLayout implements BeforeEnterObser
gridActualizaciones.addThemeVariants(GridVariant.LUMO_ROW_STRIPES);
+ History history = UI.getCurrent().getPage().getHistory();
+ btnVolverAtras.addClickListener(e -> history.back());
+ btnVolverAtras.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+ btnVolverAtras.setTooltipText("Volver a la lista de mantenimientos");
+
HorizontalLayout botonesHeaderLyt = new HorizontalLayout();
botonesHeaderLyt.setWidthFull();
- botonesHeaderLyt.add(btnImprimirRepo, btnEnviarEncuesta);
+ botonesHeaderLyt.add(btnVolverAtras, btnImprimirRepo, btnEnviarEncuesta);
HorizontalLayout botonesLayout = new HorizontalLayout();
botonesLayout.setWidthFull();
@@ -297,7 +308,7 @@ public class DetallesMantView extends VerticalLayout implements BeforeEnterObser
} catch (Exception ex) {
Notification.show("Error al generar el reporte: " + ex.getMessage(), 4000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- ex.printStackTrace();
+ logger.error("Error al generar el reporte: ", ex);
}
});
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java b/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java
index 08d4c1a..1b6b85a 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/MainLayout.java
@@ -1,5 +1,6 @@
package mx.gob.jumapacelaya.ui;
+import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.applayout.AppLayout;
import com.vaadin.flow.component.applayout.DrawerToggle;
import com.vaadin.flow.component.button.Button;
@@ -13,12 +14,15 @@ import com.vaadin.flow.component.orderedlayout.Scroller;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.sidenav.SideNav;
import com.vaadin.flow.component.sidenav.SideNavItem;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.server.menu.MenuConfiguration;
import com.vaadin.flow.theme.lumo.LumoUtility;
import mx.gob.jumapacelaya.services.SecurityService;
@CssImport("./themes/sistema-mantenimiento/styles.css")
-public class MainLayout extends AppLayout {
+public class MainLayout extends AppLayout implements BeforeEnterObserver {
private H2 viewTitle;
private final SecurityService securityService;
@@ -45,7 +49,7 @@ public class MainLayout extends AppLayout {
String u = securityService.getAuthenticatedUser();
Span usrNameLabel = new Span(u);
- usrNameLabel.getStyle().set("color", "#691b31");
+ //usrNameLabel.getStyle().set("color", "#691b31");
usrNameLabel.getStyle().set("font-weight", "bold");
usrNameLabel.getStyle().set("font-size", "20px");
@@ -70,7 +74,7 @@ public class MainLayout extends AppLayout {
headerLayout.setPadding(true);
headerLayout.setSpacing(false);
headerLayout.setAlignItems(FlexComponent.Alignment.CENTER);
- headerLayout.getStyle().set("background-color", "#DDC9A3");
+ //headerLayout.getStyle().set("background-color", "#DDC9A3");
Image imgLogo = new Image("images/LOGO_900X160.png", "Logo");
imgLogo.setWidthFull();
@@ -78,7 +82,7 @@ public class MainLayout extends AppLayout {
headerLayout.add(imgLogo);
Scroller scroller = new Scroller(createNavigation());
- scroller.getStyle().set("background-color", "#691b31");
+ //scroller.getStyle().set("background-color", "#691b31");
addToDrawer(headerLayout, scroller, createFooter());
}
@@ -89,9 +93,9 @@ public class MainLayout extends AppLayout {
nav.addItem(new SideNavItem("Plan Anual", PlanAnualView.class, VaadinIcon.CALENDAR.create()));
nav.addItem(new SideNavItem("Listado de Actividades", ActDiariaView.class, VaadinIcon.EDIT.create()));
nav.addItem(new SideNavItem("Mantenimiento Correctivo", MantCorrectivoView.class, VaadinIcon.WRENCH.create()));
- nav.getStyle().set("background-color", "white");
+ nav.addItem(new SideNavItem("Configuración del sistema", ConfiguracionView.class, VaadinIcon.COG.create()));
+
nav.getStyle().set("border-radius", "5px");
- nav.getStyle().set("opacity", "0.9");
return nav;
}
@@ -101,9 +105,25 @@ public class MainLayout extends AppLayout {
return layout;
}
+ private String getCurrentPageTitle() {
+ return MenuConfiguration.getPageHeader(getContent()).orElse("");
+ }
+
@Override
protected void afterNavigation() {
super.afterNavigation();
- viewTitle.setText("Mantenimiento de Hardware");
+ viewTitle.setText(getCurrentPageTitle());
+ }
+
+ @Override
+ public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
+ UI.getCurrent().getPage().executeJs("""
+ const theme = localStorage.getItem('appThemePreference');
+ if (theme === 'dark') {
+ document.documentElement.setAttribute('theme', 'dark');
+ } else {
+ document.documentElement.removeAttribute('theme');
+ }
+ """);
}
}
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/MantCorrectivoView.java b/src/main/java/mx/gob/jumapacelaya/ui/MantCorrectivoView.java
index 7763a5a..6d4c087 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/MantCorrectivoView.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/MantCorrectivoView.java
@@ -1,6 +1,5 @@
package mx.gob.jumapacelaya.ui;
-import com.vaadin.flow.component.Text;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
@@ -24,9 +23,6 @@ import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
import com.vaadin.flow.component.textfield.TextArea;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.renderer.ComponentRenderer;
-import com.vaadin.flow.function.ValueProvider;
-import com.vaadin.flow.router.BeforeEnterEvent;
-import com.vaadin.flow.router.BeforeEnterObserver;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route;
import de.f0rce.signaturepad.SignaturePad;
@@ -36,6 +32,8 @@ import mx.gob.jumapacelaya.services.DatabaseService;
import mx.gob.jumapacelaya.services.EmailService;
import mx.gob.jumapacelaya.services.SecurityService;
import mx.gob.jumapacelaya.services.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.vaadin.lineawesome.LineAwesomeIcon;
import java.time.LocalDate;
@@ -48,6 +46,8 @@ import java.util.*;
@CssImport("./themes/sistema-mantenimiento/styles.css")
public class MantCorrectivoView extends VerticalLayout {
+ private static final Logger logger = LoggerFactory.getLogger(MantCorrectivoView.class);
+
private VerticalLayout mainLayout;
private final SecurityService securityService;
private final VerticalLayout controlsLayout;
@@ -96,7 +96,6 @@ public class MantCorrectivoView extends VerticalLayout {
headerLayout.getStyle()
.set("box-shadow", "0 4px 8px rgba(0,0,0,0.2)")
.set("border-radius", "10px")
- .set("background-color", "white")
.set("padding", "1rem")
.set("margin", "1rem auto");
@@ -107,7 +106,6 @@ public class MantCorrectivoView extends VerticalLayout {
mainLayout.getStyle()
.set("box-shadow", "0 4px 8px rgba(0,0,0,0.2)")
.set("border-radius", "12px")
- .set("background-color", "white")
.set("padding", "1rem")
.set("margin", "1rem auto");
@@ -594,7 +592,7 @@ public class MantCorrectivoView extends VerticalLayout {
} catch (Exception e) {
Notification.show("Error al enviar el correo", 4000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- e.printStackTrace();
+ logger.error("Error al enviar correo: ", e);
}
// Limpiar campos
@@ -624,7 +622,7 @@ public class MantCorrectivoView extends VerticalLayout {
} catch (Exception ex) {
Notification.show("Ocurrio un error inesperado: " + ex.getMessage(), 5000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- ex.printStackTrace();
+ logger.error("Error al insertar mantenimiento: ", ex);
}
}
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java b/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java
index 32c49a6..a11916b 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/MantenimientoView.java
@@ -1,29 +1,24 @@
package mx.gob.jumapacelaya.ui;
-import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
import com.vaadin.flow.component.checkbox.CheckboxGroup;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.datepicker.DatePicker;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dialog.Dialog;
-import com.vaadin.flow.component.html.H1;
-import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.html.Image;
import com.vaadin.flow.component.html.Span;
import com.vaadin.flow.component.icon.Icon;
import com.vaadin.flow.component.icon.VaadinIcon;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.notification.NotificationVariant;
-import com.vaadin.flow.component.orderedlayout.FlexComponent;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
-import com.vaadin.flow.component.textfield.NumberField;
import com.vaadin.flow.component.textfield.TextArea;
import com.vaadin.flow.component.textfield.TextField;
-import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.router.BeforeEnterEvent;
import com.vaadin.flow.router.BeforeEnterObserver;
import com.vaadin.flow.router.PageTitle;
@@ -35,9 +30,8 @@ import mx.gob.jumapacelaya.services.DatabaseService;
import mx.gob.jumapacelaya.services.EmailService;
import mx.gob.jumapacelaya.services.SecurityService;
import mx.gob.jumapacelaya.services.UserService;
-import oracle.net.aso.h;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.vaadin.lineawesome.LineAwesomeIcon;
import java.time.LocalDate;
@@ -50,6 +44,8 @@ import java.util.*;
@CssImport("./themes/sistema-mantenimiento/styles.css")
public class MantenimientoView extends VerticalLayout implements BeforeEnterObserver {
+ private static final Logger logger = LoggerFactory.getLogger(MantenimientoView.class);
+
private final SecurityService securityService;
private final VerticalLayout controlsLayout;
private final DatabaseService databaseService;
@@ -98,7 +94,6 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse
mainLayout.getStyle()
.set("box-shadow","0 4px 8px rgba(0,0,0,0.2)")
.set("border-radius", "12px")
- .set("background-color", "white")
.set("padding", "1rem")
.set("margin", "1rem auto");
@@ -718,7 +713,7 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse
} catch (Exception e) {
Notification.show("Error al enviar el correo", 4000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- e.printStackTrace();
+ logger.error("Error al enviar el correo", e);
}
// Limpiar campos
@@ -748,7 +743,7 @@ public class MantenimientoView extends VerticalLayout implements BeforeEnterObse
} catch (Exception ex) {
Notification.show("Ocurrio un error inesperado: " + ex.getMessage(), 5000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- ex.printStackTrace();
+ logger.error("Error al insertar mantenimiento", ex);
}
}
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java
index 84830c3..0667bec 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/PlanAnualView.java
@@ -1,19 +1,15 @@
package mx.gob.jumapacelaya.ui;
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.checkbox.Checkbox;
import com.vaadin.flow.component.checkbox.CheckboxGroup;
import com.vaadin.flow.component.checkbox.CheckboxGroupVariant;
import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.confirmdialog.ConfirmDialog;
import com.vaadin.flow.component.datepicker.DatePicker;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dialog.Dialog;
-import com.vaadin.flow.component.formlayout.FormLayout;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.grid.GridVariant;
import com.vaadin.flow.component.grid.HeaderRow;
@@ -29,12 +25,10 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.popover.Popover;
import com.vaadin.flow.component.popover.PopoverPosition;
-import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
import com.vaadin.flow.component.textfield.NumberField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.component.upload.Upload;
import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
-import com.vaadin.flow.data.provider.ListDataProvider;
import com.vaadin.flow.data.renderer.ComponentRenderer;
import com.vaadin.flow.data.value.ValueChangeMode;
import com.vaadin.flow.function.ValueProvider;
@@ -48,19 +42,20 @@ import mx.gob.jumapacelaya.models.encuestas.MantenimientosSinEncuesta;
import mx.gob.jumapacelaya.services.DatabaseService;
import mx.gob.jumapacelaya.services.EmailService;
import mx.gob.jumapacelaya.services.ReportService;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.vaadin.lineawesome.LineAwesomeIcon;
-import java.io.*;
-import java.lang.reflect.Array;
-import java.sql.Date;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.time.LocalDate;
import java.time.Year;
import java.time.format.DateTimeFormatter;
@@ -75,6 +70,8 @@ import java.util.stream.IntStream;
@CssImport("./themes/sistema-mantenimiento/styles.css")
public class PlanAnualView extends VerticalLayout {
+ private static final Logger logger = LoggerFactory.getLogger(PlanAnualView.class);
+
private final EmailService emailService;
@Value("${app.base-url}")
private String baseUrl;
@@ -281,7 +278,6 @@ public class PlanAnualView extends VerticalLayout {
if ("PENDIENTE".equalsIgnoreCase(estado)) {
btn = new Button(new Icon(VaadinIcon.EDIT));
btn.setTooltipText("Realizar mantenimiento");
- btn.getStyle().set("color", "#A02142");
btn.addClickListener(event -> {
int idPlananual = planAnual.getNumero();
@@ -303,7 +299,6 @@ public class PlanAnualView extends VerticalLayout {
} else if ("REALIZADO".equalsIgnoreCase(estado)) {
btn = new Button(new Icon(VaadinIcon.EYE));
btn.setTooltipText("Ver detalles");
- btn.getStyle().set("color", "#A02142");
btn.addClickListener(event -> {
int idPlananual = planAnual.getNumero();
@@ -714,7 +709,7 @@ public class PlanAnualView extends VerticalLayout {
} catch (Exception ex) {
Notification.show("Error al genrar el reporte: " + ex.getMessage(), 5000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- ex.printStackTrace();
+ logger.error("Error al generar el reporte", ex);
}
});
@@ -928,7 +923,7 @@ public class PlanAnualView extends VerticalLayout {
} catch (Exception ex) {
Notification.show("Error al generar el reporte: " + ex.getMessage(), 5000, Notification.Position.MIDDLE)
.addThemeVariants(NotificationVariant.LUMO_ERROR);
- ex.printStackTrace();
+ logger.error("Error al generar el reporte", ex);
}
});
@@ -1080,7 +1075,7 @@ public class PlanAnualView extends VerticalLayout {
private void showEncuestasDialog(String mes, int anio) {
Dialog dialog = new Dialog();
- dialog.setWidth("90%");
+ dialog.setWidth("95%");
dialog.setHeight("90%");
dialog.setHeaderTitle("Encuestas pendientes por enviar...");
@@ -1090,17 +1085,18 @@ public class PlanAnualView extends VerticalLayout {
.setAutoWidth(true);
grid.addColumn(item -> item.getFecha().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")))
- .setHeader("Fecha");
+ .setHeader("Fecha")
+ .setAutoWidth(true);
grid.addColumn(MantenimientosSinEncuesta::getPeriodo)
- .setHeader("Periodo");
+ .setHeader("Periodo")
+ .setAutoWidth(true);
grid.addColumn(createStatusRender())
.setHeader("Encuesta");
grid.addColumn(MantenimientosSinEncuesta::getDepartamento)
- .setHeader("Departamento")
- .setAutoWidth(true);
+ .setHeader("Departamento");
grid.addColumn(MantenimientosSinEncuesta::getNomUsuario)
.setHeader("Usuario")
@@ -1124,11 +1120,13 @@ public class PlanAnualView extends VerticalLayout {
});
return btnEnviar;
- }).setHeader("Accion");
+ }).setHeader("Accion")
+ .setFrozen(true);
List lista = databaseService.getEncuestPendientes(mes, anio);
grid.setItems(lista);
+ grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT);
dialog.add(grid);
dialog.getFooter().add(new Button("Cerrar", LineAwesomeIcon.TIMES_SOLID.create(), e -> dialog.close()));
diff --git a/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java b/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java
index 13bb9ad..eb705b4 100644
--- a/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java
+++ b/src/main/java/mx/gob/jumapacelaya/ui/login/LoginView.java
@@ -22,9 +22,6 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
private static final Logger log = LoggerFactory.getLogger(LoginView.class);
private final LoginForm login = new LoginForm();
- // Usuario local para demostracion
- private final String localUser = "admin";
- private final String localPassword = "admin";
public LoginView(){
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7589b76..0e7d86a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,7 @@
server.port=${PORT:8080}
logging.level.org.atmosphere = warn
spring.profiles.active=dev
+server.servlet.session.cookie.secure=true
# Launch the default browser when starting the application in development mode
vaadin.launch-browser=true
@@ -12,7 +13,9 @@ spring.jpa.defer-datasource-initialization = true
#Configuracion LDAP
-spring.ldap.urls=ldap://172.1.0.1:389
+spring.ldap.urls=ldap://172.16.0.1:389
+spring.ldap.url=ldap://172.16.0.1
+spring.ldap.domain=JUMAPACELAYA.GOB.MX
spring.ldap.base=DC=JUMAPACELAYA,DC=GOB,DC=MX
spring.ldap.username=administrator
spring.ldap.password=Dr3na$134%4guA
diff --git a/tsconfig.json b/tsconfig.json
index 02dd68b..e6840ae 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,7 @@
"jsx": "react-jsx",
"inlineSources": true,
"module": "esNext",
- "target": "es2020",
+ "target": "es2022",
"moduleResolution": "bundler",
"strict": true,
"skipLibCheck": true,