From 13c59b8ab3f1b713ce5ae3e345b24851654527c8 Mon Sep 17 00:00:00 2001
From: Giuli1297 <giuli1297.gg@gmail.com>
Date: Mon, 15 Nov 2021 14:15:27 -0300
Subject: [PATCH] Algunas mejoras a la GUI

---
 curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java | 12 ++++++++----
 curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java             |  7 ++++---
 curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp                      |  1 +
 curriculumsearch/src/main/webapp/jsp/header.jsp                              | 27 +++++++++++++++++++++++++--
 curriculumsearch/src/main/webapp/jsp/register_success.jsp                    | 15 ---------------
 5 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100644 curriculumsearch/src/main/webapp/jsp/register_success.jsp

diff --git a/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java b/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
index 0ad17b3..585d47f 100644
--- a/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
+++ b/curriculumsearch/src/main/java/com/roshka/controller/RRHHUserController.java
@@ -67,17 +67,21 @@ public class RRHHUserController {
     }
 
     @PostMapping("/process_register")
-    public String processRegister(HttpServletRequest request, RRHHUser user) {
+    public RedirectView processRegister(HttpServletRequest request, RRHHUser user, RedirectAttributes redirectAttributes) {
+        RedirectView redirectView = new RedirectView("/register",true);
+        redirectAttributes.addFlashAttribute("success", "Datos actualizados");
         if(Long.parseLong(request.getParameter("registrationCode")) != REGISTER_CODE){
-            return "redirect:/register";
+            redirectAttributes.addFlashAttribute("error", "Codigo Incorrecto");
+            return redirectView;
         }
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         String encodedPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(encodedPassword);
 
         rrhhUserRepository.save(user);
-
-        return "register_success";
+        redirectView.setUrl("/login");
+        redirectAttributes.addFlashAttribute("success", "Registro Correcto");
+        return redirectView;
     }
 
     @GetMapping("/edit-user-data")
diff --git a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
index 92b61cd..9265e5b 100644
--- a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
+++ b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
@@ -67,7 +67,8 @@ public class Postulante {
     private Long nivelIngles;
 
     @Column(name = "curriculum")
-    private String curriculum;
+    @Lob
+    private byte[] curriculum;
 
     @Column(name="estado_civil")
     @NotNull
@@ -192,11 +193,11 @@ public class Postulante {
         this.nivelIngles = nivelIngles;
     }
 
-    public String getCurriculum() {
+    public byte[] getCurriculum() {
         return curriculum;
     }
 
-    public void setCurriculum(String curriculum) {
+    public void setCurriculum(byte[] curriculum) {
         this.curriculum = curriculum;
     }
 
diff --git a/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp b/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp
index abdb26d..38b2f2b 100644
--- a/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp
@@ -53,6 +53,7 @@
                             </div>
 
                             <button type="submit" class="btn btn-success btn-lg mb-1">Submit</button>
+                            <a href="/home" class="btn btn-danger btn-lg mr-3 ml-3 mb-1">Volver</a>
                         </form:form>
 
                     </div>
diff --git a/curriculumsearch/src/main/webapp/jsp/header.jsp b/curriculumsearch/src/main/webapp/jsp/header.jsp
index 5a842fb..d47e825 100644
--- a/curriculumsearch/src/main/webapp/jsp/header.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/header.jsp
@@ -1,6 +1,9 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+
 <header>
     
     
@@ -49,11 +52,31 @@
                 <a class="nav-link" href="/edit-user-data">Editar mis datos</a>
               </li>
               <li class="nav-item">
-                <a class="nav-link" href="/logout">Salir</a>
+<%--                <a class="nav-link" href="/logout">Salir</a>--%>
+                <button type="button" class="btn btn-light" data-toggle="modal" data-target="#exampleModal">
+                  Salir
+                </button>
               </li>
 
             </ul>
           </div>
         </div>
       </nav>
-</header>
\ No newline at end of file
+</header>
+<!-- Modal -->
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h6 class="modal-title" id="exampleModalLabel">Esta seguro que desea salir?</h6>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <a href="/logout" class="btn btn-danger">Salir</a>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/jsp/register_success.jsp b/curriculumsearch/src/main/webapp/jsp/register_success.jsp
deleted file mode 100644
index 7c28633..0000000
--- a/curriculumsearch/src/main/webapp/jsp/register_success.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="ISO-8859-1">
-    <title>Registration Success</title>
-    <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/css/bootstrap.min.css" />
-</head>
-<body>
-<div class="container text-center">
-    <h3>You have signed up successfully!</h3>
-    <h4><a href="${pageContext.request.contextPath}/login">Click here to Login</a></h4>
-</div>
-
-</body>
-</html>
\ No newline at end of file
--
libgit2 0.26.0