From 0509a2240b13422bfaac77a3758631e394fa2b40 Mon Sep 17 00:00:00 2001 From: vicsash Date: Mon, 20 May 2024 20:52:42 +0200 Subject: [PATCH] Cambiando css de html y he encotrado un fallo en editar el alumno, falta revisar el metodo isValid en buscador alumno y administrador --- .../controllers/LogOutController.java | 25 +++++++++----- .../controllers/UserController.java | 22 +++++++++---- .../modelControllers/AlumnoController.java | 28 ++++++++++++++++ .../repositories/login/UserRepository.java | 3 ++ .../servicios/user/UsuarioService.java | 3 ++ src/main/resources/static/style.css | 1 - src/main/resources/static/top.css | 2 +- .../templates/admin/alumno/create.html | 33 +++++++++---------- .../templates/admin/alumno/update.html | 24 ++++++++++++-- .../templates/admin/ciclo/create.html | 2 +- .../templates/admin/ciclo/update.html | 14 +++++++- .../templates/admin/contacto/create.html | 14 +++++++- .../templates/admin/contacto/update.html | 14 +++++++- .../templates/admin/empresa/create.html | 25 +++++++++++--- .../templates/admin/empresa/update.html | 25 +++++++++++--- .../templates/admin/familia/create.html | 15 +++++++-- .../templates/admin/familia/update.html | 15 +++++++-- .../templates/admin/oferta/create.html | 13 +++++++- .../templates/admin/oferta/update.html | 13 +++++++- .../templates/admin/sector/create.html | 13 +++++++- .../templates/admin/sector/update.html | 13 +++++++- .../templates/admin/skill/create.html | 13 +++++++- .../templates/admin/skill/update.html | 13 +++++++- .../templates/admin/sucursal/create.html | 13 +++++++- .../templates/admin/sucursal/update.html | 13 +++++++- .../templates/admin/usuario/create.html | 13 +++++++- .../templates/admin/usuario/delete.html | 13 +++++++- .../resources/templates/buscador_admin.html | 6 ++-- .../resources/templates/buscador_alumno.html | 6 ++-- .../resources/templates/user/update_alu.html | 4 +-- 30 files changed, 341 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/example/proyectofinal/controllers/LogOutController.java b/src/main/java/com/example/proyectofinal/controllers/LogOutController.java index f4c687b..6edc995 100644 --- a/src/main/java/com/example/proyectofinal/controllers/LogOutController.java +++ b/src/main/java/com/example/proyectofinal/controllers/LogOutController.java @@ -1,5 +1,7 @@ package com.example.proyectofinal.controllers; +import com.example.proyectofinal.models.login.Usuario; +import com.example.proyectofinal.repositories.login.UserRepository; import com.example.proyectofinal.servicios.user.UsuarioService; import jakarta.annotation.security.RolesAllowed; import jakarta.servlet.http.HttpServletRequest; @@ -10,26 +12,33 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.Optional; + @Controller public class LogOutController { @Autowired private UsuarioService usuarioService; + @Autowired + private UserRepository userRepository; private static final Logger logger = LoggerFactory.getLogger(LogOutController.class); @RolesAllowed({"ADMIN","USER"}) @RequestMapping("/logout") - public String logout(HttpServletRequest request) { - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null) { - String nombreLogIn = auth.getName(); - logger.info("Logging out user: " + nombreLogIn); - usuarioService.logout(nombreLogIn); - new SecurityContextLogoutHandler().logout(request, null, null); + @Transactional + public void logout(String nombreLogIn) { + Optional optionalUsuario = userRepository.findByNombreUsuario(nombreLogIn); + if (optionalUsuario.isPresent()) { + Usuario usuario = optionalUsuario.get(); + logger.info("Resetting loggedIn status for user: " + nombreLogIn); + userRepository.resetLogedIn(usuario.getId()); + } else { + // handle the situation where the user does not exist, e.g., show an error message + logger.error("User not found: " + nombreLogIn); } - return "redirect:/login?logout"; } } \ No newline at end of file diff --git a/src/main/java/com/example/proyectofinal/controllers/UserController.java b/src/main/java/com/example/proyectofinal/controllers/UserController.java index c87c43d..e853a4b 100644 --- a/src/main/java/com/example/proyectofinal/controllers/UserController.java +++ b/src/main/java/com/example/proyectofinal/controllers/UserController.java @@ -43,6 +43,7 @@ public class UserController { @GetMapping("/usuario/alu_update_form") public String showUpdateForm(Model model, Authentication authentication) { + System.out.println("TEST UPDATE FORM"); String username = authentication.getName(); Usuario usuario = usuarioService.findByLogInName(username); Alumno alumno = alumnoService.findByEmail(usuario.getEmail()); @@ -51,7 +52,7 @@ public class UserController { model.addAttribute("skills", skills); model.addAttribute("alumno", alumno); model.addAttribute("ciclos", ciclos); - return "admin/alumno/update"; + return "user/update_alu"; } @@ -62,7 +63,15 @@ public class UserController { Set skillEntities = skillService.findAllByIds(skills); alumno.setCiclo(cicloEntity); alumno.setSkills(skillEntities); - //System.out.println("TEST UPDATE ALUMNO: "+alumno.getNombre()); + Alumno existingAlumno = alumnoService.findById(alumno.getId()); + + if (!existingAlumno.equals(alumno)) { + Usuario usuario = usuarioService.findByEmail(existingAlumno.getCorreo()); + if (usuario != null) { + usuario.setEmail(alumno.getCorreo()); + usuarioService.saveUser(usuario); + } + } alumnoService.save(alumno); return new ResponseEntity<>("El alumno fue actualizado con exito", HttpStatus.OK); }catch (Exception e) { @@ -84,17 +93,18 @@ public class UserController { if (existingUser == null) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Este usuario no existe"); } - // Check if the password field is empty if (usuario.getPassword().isEmpty()) { - // If the password field is empty, keep the original password usuario.setPassword(existingUser.getPassword()); } else { - // If the password field is not empty, encrypt the new password String password = usuario.getPassword(); existingUser.setPassword(passwordEncoder.encode(password)); } usuario.setRol(usuarioService.getRolById(2)); - //System.out.println("TEST UPDATE USUARIO: "+usuario.getNombreUsuario()); + Alumno alumno = alumnoService.findByEmail(existingUser.getEmail()); + if (alumno != null) { + alumno.setCorreo(usuario.getEmail()); + alumnoService.save(alumno); + } usuarioService.saveUser(usuario); return "redirect:/buscador?userUpdated=true"; } diff --git a/src/main/java/com/example/proyectofinal/controllers/modelControllers/AlumnoController.java b/src/main/java/com/example/proyectofinal/controllers/modelControllers/AlumnoController.java index b0f22b3..594e8f0 100644 --- a/src/main/java/com/example/proyectofinal/controllers/modelControllers/AlumnoController.java +++ b/src/main/java/com/example/proyectofinal/controllers/modelControllers/AlumnoController.java @@ -126,6 +126,34 @@ public class AlumnoController { alumno.setSkills(skillEntities); assert keywords != null; alumno.setKeywords(keywords); + + // Fetch the existing Alumno from the database + Alumno existingAlumno = alumnoService.findById(alumno.getId()); + + if (!existingAlumno.equals(alumno)) { + Usuario usuario = usuarioService.findByEmail(existingAlumno.getCorreo()); + if (usuario != null) { + usuario.setEmail(alumno.getCorreo()); + StringBuilder nombreUsuarioBuilder = new StringBuilder(); + nombreUsuarioBuilder.append(alumno.getNombre().toLowerCase()); + nombreUsuarioBuilder.append(" "); + nombreUsuarioBuilder.append(alumno.getApellido().toLowerCase()); + if (alumno.getApellido2() != null) { + if (!nombreUsuarioBuilder.isEmpty()) { + nombreUsuarioBuilder.append(" "); + } + nombreUsuarioBuilder.append(alumno.getApellido2().toLowerCase()); + } + String nombreUsuario = nombreUsuarioBuilder.toString(); + String nia = alumno.getNia(); + String firstThreeLetters = nia.substring(0, 3); + String nombreLogIn="alu." +alumno.getNombre()+firstThreeLetters; + usuario.setNombreLogIn(nombreLogIn); + usuario.setNombreUsuario(nombreUsuario); + usuarioService.saveUser(usuario); + + } + } alumnoService.save(alumno); return new ResponseEntity<>("El alumno fue actualizado con exito", HttpStatus.OK); }catch (Exception e) { diff --git a/src/main/java/com/example/proyectofinal/repositories/login/UserRepository.java b/src/main/java/com/example/proyectofinal/repositories/login/UserRepository.java index fa64b9d..3e902b6 100644 --- a/src/main/java/com/example/proyectofinal/repositories/login/UserRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/login/UserRepository.java @@ -27,4 +27,7 @@ public interface UserRepository extends JpaRepository{ @Modifying @Query("UPDATE Usuario u SET u.logedIn = false") void resetAllLogedIn(); + + @Query("SELECT u FROM Usuario u WHERE u.email = ?1") + Optional findByEmail(String correo); } diff --git a/src/main/java/com/example/proyectofinal/servicios/user/UsuarioService.java b/src/main/java/com/example/proyectofinal/servicios/user/UsuarioService.java index f6df287..0901c36 100644 --- a/src/main/java/com/example/proyectofinal/servicios/user/UsuarioService.java +++ b/src/main/java/com/example/proyectofinal/servicios/user/UsuarioService.java @@ -159,4 +159,7 @@ public class UsuarioService implements IUsuario { return false; } + public Usuario findByEmail(String correo) { + return (Usuario) userRepository.findByEmail(correo).orElse(null); + } } \ No newline at end of file diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 3fe967f..bbb9d02 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -25,7 +25,6 @@ th { h1 { text-align: center; - text-decoration: underline; font-family: Verdana, Geneva, Tahoma, sans-serif; font-size: 50px; color: white; diff --git a/src/main/resources/static/top.css b/src/main/resources/static/top.css index 5b7ef46..47d8758 100644 --- a/src/main/resources/static/top.css +++ b/src/main/resources/static/top.css @@ -16,9 +16,9 @@ width: 40px; height: 40px; } + h1 { text-align: center; - text-decoration: underline; background-color: #007BFF; font-family: Verdana, Geneva, Tahoma, sans-serif; font-size: 50px; diff --git a/src/main/resources/templates/admin/alumno/create.html b/src/main/resources/templates/admin/alumno/create.html index 84858a0..27e74d8 100644 --- a/src/main/resources/templates/admin/alumno/create.html +++ b/src/main/resources/templates/admin/alumno/create.html @@ -30,8 +30,9 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } + form input[type="submit"], form input[type="button"] { width: 100px; } @@ -40,24 +41,24 @@ width: 85%; height: 20px; font-size: 18px; + overflow: auto; } - #keywords { - width: 100%; - height: auto; - min-height: 40px; + option { + font-size: 18px; } + select { + font-size: 18px; + } .tagify { - width: 100%; /* Limit the width to the parent's width */ - height: auto; /* Adjusts the height automatically based on content */ - min-height: 40px; /* Minimum height when there are no or few keywords */ - display: block; /* Makes the input field a block-level element */ - white-space: pre-wrap; /* Allows the input field to wrap its contents */ - overflow-wrap: break-word; /* Breaks the word in case it's too long */ + display: flex; + flex-direction: column; + max-height: 400px; + overflow-y: auto; } - form label{ + form label { font-size: 20px; margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; @@ -69,6 +70,7 @@ width: 100%; box-sizing: border-box; } + @@ -152,8 +154,8 @@
-
- +
+
@@ -192,9 +194,6 @@ $('#skills').select2(); var tagifyInput = document.querySelector('input[name=tags]'); var tagify = new Tagify(tagifyInput, { - dropdown:{ - enabled: 0 - }, callbacks: { add: function(e){ if(e.detail.data.value.trim() === ""){ diff --git a/src/main/resources/templates/admin/alumno/update.html b/src/main/resources/templates/admin/alumno/update.html index 9a8f9f1..d1568ec 100644 --- a/src/main/resources/templates/admin/alumno/update.html +++ b/src/main/resources/templates/admin/alumno/update.html @@ -30,7 +30,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -38,6 +38,24 @@ form input[type="text"]{ width: 75%; } + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } + .tagify { + display: flex; + flex-direction: column; + max-height: 400px; + overflow-y: auto; + } form label{ font-size: 20px; margin-bottom: 10px; @@ -134,8 +152,8 @@
-
- +
+
diff --git a/src/main/resources/templates/admin/ciclo/create.html b/src/main/resources/templates/admin/ciclo/create.html index 24a1e2a..94e2b49 100644 --- a/src/main/resources/templates/admin/ciclo/create.html +++ b/src/main/resources/templates/admin/ciclo/create.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; diff --git a/src/main/resources/templates/admin/ciclo/update.html b/src/main/resources/templates/admin/ciclo/update.html index 34a8e5d..21532c5 100644 --- a/src/main/resources/templates/admin/ciclo/update.html +++ b/src/main/resources/templates/admin/ciclo/update.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -39,6 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; diff --git a/src/main/resources/templates/admin/contacto/create.html b/src/main/resources/templates/admin/contacto/create.html index 767873d..4c37de6 100644 --- a/src/main/resources/templates/admin/contacto/create.html +++ b/src/main/resources/templates/admin/contacto/create.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -39,6 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; diff --git a/src/main/resources/templates/admin/contacto/update.html b/src/main/resources/templates/admin/contacto/update.html index 36fb46c..6af537f 100644 --- a/src/main/resources/templates/admin/contacto/update.html +++ b/src/main/resources/templates/admin/contacto/update.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -39,6 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; diff --git a/src/main/resources/templates/admin/empresa/create.html b/src/main/resources/templates/admin/empresa/create.html index 9ffa5f6..9e687de 100644 --- a/src/main/resources/templates/admin/empresa/create.html +++ b/src/main/resources/templates/admin/empresa/create.html @@ -28,7 +28,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -41,7 +41,24 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + .tagify { + display: flex; + flex-direction: column; + max-height: 400px; + overflow-y: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; @@ -86,8 +103,8 @@
-
- +
+
diff --git a/src/main/resources/templates/admin/empresa/update.html b/src/main/resources/templates/admin/empresa/update.html index a072639..39b68ea 100644 --- a/src/main/resources/templates/admin/empresa/update.html +++ b/src/main/resources/templates/admin/empresa/update.html @@ -28,7 +28,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -41,7 +41,24 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + .tagify { + display: flex; + flex-direction: column; + max-height: 400px; + overflow-y: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; @@ -87,8 +104,8 @@
-
- +
+
diff --git a/src/main/resources/templates/admin/familia/create.html b/src/main/resources/templates/admin/familia/create.html index aee9184..5b424c4 100644 --- a/src/main/resources/templates/admin/familia/create.html +++ b/src/main/resources/templates/admin/familia/create.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/familia/update.html b/src/main/resources/templates/admin/familia/update.html index 79e9a58..e31b8a6 100644 --- a/src/main/resources/templates/admin/familia/update.html +++ b/src/main/resources/templates/admin/familia/update.html @@ -26,7 +26,7 @@ margin-right: 5px; width: 120px; height: 40px; - font-family: Verdana; + font-family: Verdana, Geneva, Tahoma, sans-serif; } form input[type="submit"], form input[type="button"] { width: 100px; @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/oferta/create.html b/src/main/resources/templates/admin/oferta/create.html index b30a43d..3dc3b18 100644 --- a/src/main/resources/templates/admin/oferta/create.html +++ b/src/main/resources/templates/admin/oferta/create.html @@ -41,7 +41,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/oferta/update.html b/src/main/resources/templates/admin/oferta/update.html index 9a524e0..15ab0c4 100644 --- a/src/main/resources/templates/admin/oferta/update.html +++ b/src/main/resources/templates/admin/oferta/update.html @@ -41,7 +41,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/sector/create.html b/src/main/resources/templates/admin/sector/create.html index 8ebd8fe..01f39cc 100644 --- a/src/main/resources/templates/admin/sector/create.html +++ b/src/main/resources/templates/admin/sector/create.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/sector/update.html b/src/main/resources/templates/admin/sector/update.html index 61d37a2..166362b 100644 --- a/src/main/resources/templates/admin/sector/update.html +++ b/src/main/resources/templates/admin/sector/update.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/skill/create.html b/src/main/resources/templates/admin/skill/create.html index 5b9e690..8ed0528 100644 --- a/src/main/resources/templates/admin/skill/create.html +++ b/src/main/resources/templates/admin/skill/create.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/skill/update.html b/src/main/resources/templates/admin/skill/update.html index 5712ebb..8384749 100644 --- a/src/main/resources/templates/admin/skill/update.html +++ b/src/main/resources/templates/admin/skill/update.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/sucursal/create.html b/src/main/resources/templates/admin/sucursal/create.html index 5d22a3f..e069ce2 100644 --- a/src/main/resources/templates/admin/sucursal/create.html +++ b/src/main/resources/templates/admin/sucursal/create.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/sucursal/update.html b/src/main/resources/templates/admin/sucursal/update.html index 59c33f1..a05609a 100644 --- a/src/main/resources/templates/admin/sucursal/update.html +++ b/src/main/resources/templates/admin/sucursal/update.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/usuario/create.html b/src/main/resources/templates/admin/usuario/create.html index 5e06c69..4650967 100644 --- a/src/main/resources/templates/admin/usuario/create.html +++ b/src/main/resources/templates/admin/usuario/create.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/admin/usuario/delete.html b/src/main/resources/templates/admin/usuario/delete.html index 983d9a4..02d1ebf 100644 --- a/src/main/resources/templates/admin/usuario/delete.html +++ b/src/main/resources/templates/admin/usuario/delete.html @@ -39,7 +39,18 @@ margin-bottom: 10px; font-family: Verdana, Geneva, Tahoma, sans-serif; } - + form input { + width: 85%; + height: 20px; + font-size: 18px; + overflow: auto; + } + option{ + font-size: 18px; + } + select{ + font-size: 18px; + } body, h1 { margin: 0; padding: 0; diff --git a/src/main/resources/templates/buscador_admin.html b/src/main/resources/templates/buscador_admin.html index 8230dd0..9a2ffc2 100644 --- a/src/main/resources/templates/buscador_admin.html +++ b/src/main/resources/templates/buscador_admin.html @@ -54,7 +54,7 @@ position: relative; margin-left: 50px; padding: 0px; - background-color: #dddddd; + color: white; width: 50px; /* Adjust as needed */ height: 50px; /* Adjust as needed */ display: flex; @@ -73,8 +73,8 @@ font-size: 10px; /* Adjust as needed */ } - .modal-content p{ - background-color: antiquewhite; + .modal-content p:hover{ + background-color: #f0f0f0; } diff --git a/src/main/resources/templates/buscador_alumno.html b/src/main/resources/templates/buscador_alumno.html index e3e68e3..ac94e47 100644 --- a/src/main/resources/templates/buscador_alumno.html +++ b/src/main/resources/templates/buscador_alumno.html @@ -54,7 +54,7 @@ position: relative; margin-left: 50px; padding: 0px; - background-color: #dddddd; + color: white; width: 50px; /* Adjust as needed */ height: 50px; /* Adjust as needed */ display: flex; @@ -73,8 +73,8 @@ font-size: 10px; /* Adjust as needed */ } - .modal-content p{ - background-color: antiquewhite; + .modal-content p:hover{ + background-color: #f0f0f0; } diff --git a/src/main/resources/templates/user/update_alu.html b/src/main/resources/templates/user/update_alu.html index eafcc42..2de6a92 100644 --- a/src/main/resources/templates/user/update_alu.html +++ b/src/main/resources/templates/user/update_alu.html @@ -121,7 +121,7 @@
- +
@@ -180,7 +180,7 @@ formDataArray.push({name: 'skills', value: $('#skills').val()}); $.ajax({ - url: '/usuario/update', + url: '/usuario/alu_update', type: 'post', data: $.param(formDataArray), success: function (message) {