Merge branch 'William_001' of https://phoebe.roshka.com/gitlab/hshah/TalentoHumano into joel-001

57028149 · Joel Florentin · b8030e1b · c7a6a15a · 57028149 · 57028149
Commit 57028149 authored Nov 19, 2021 by Joel Florentin
9 changed files
--- a/curriculumsearch/src/main/java/com/roshka/controller/PostulanteRRHHController.java
+++ b/curriculumsearch/src/main/java/com/roshka/controller/PostulanteRRHHController.java
@@ -137,7 +137,7 @@ public class PostulanteRRHHController {
        postulanteVd.setComentarioRRHH(postulante.getComentarioRRHH());
        post.setPostulanteEstadoAndComentario(postulante.getEstadoPostulante(), postulante.getComentarioRRHH(), postulanteId);
        //post.save(postulanteVd);
-        return "redirect:/postulante/"+postulanteId;
+        return "redirect:/postulantes/"+postulanteId;
    }
    @GetMapping("/postulantes/cvFile/{fileId}")

--- a/curriculumsearch/src/main/resources/json/postulante.json
+++ b/curriculumsearch/src/main/resources/json/postulante.json
@@ -11,7 +11,7 @@
    "nroDocument": 5821432,
    "ciudadId": 238,
    "telefono": "(950) 417-3681",
-    "fechaNacimiento": "2021-08-16",
+    "fechaNacimiento": "1986-08-16",
    "nivelIngles": 1,
    "disponibilidad": "C",
@@ -70,7 +70,7 @@
    "nroDocument": 4213361,
    "ciudadId": 96,
    "telefono": "(866) 560-2541",
-    "fechaNacimiento": "2021-09-04",
+    "fechaNacimiento": "1980-09-04",
    "nivelIngles": 5,
    "disponibilidad": "C",
@@ -117,7 +117,7 @@
    "nroDocument": 4605787,
    "ciudadId": 30,
    "telefono": "(876) 580-2411",
-    "fechaNacimiento": "2021-01-28",
+    "fechaNacimiento": "2000-01-28",
    "nivelIngles": 3,
    "disponibilidad": "P",
@@ -164,7 +164,7 @@
    "nroDocument": 4591352,
    "ciudadId": 65,
    "telefono": "(931) 499-3122",
-    "fechaNacimiento": "2021-06-05",
+    "fechaNacimiento": "1972-06-05",
    "nivelIngles": 4,
    "disponibilidad": "C",
@@ -211,7 +211,7 @@
    "nroDocument": 3969318,
    "ciudadId": 143,
    "telefono": "(972) 524-2610",
-    "fechaNacimiento": "2021-09-09",
+    "fechaNacimiento": "1989-09-09",
    "nivelIngles": 5,
    "disponibilidad": "P",
@@ -258,7 +258,7 @@
    "nroDocument": 2329745,
    "ciudadId": 248,
    "telefono": "(933) 501-3525",
-    "fechaNacimiento": "2021-03-24",
+    "fechaNacimiento": "1994-03-24",
    "nivelIngles": 1,
    "disponibilidad": "P",
@@ -305,7 +305,7 @@
    "nroDocument": 4519594,
    "ciudadId": 104,
    "telefono": "(817) 492-2493",
-    "fechaNacimiento": "2021-07-30",
+    "fechaNacimiento": "2002-07-30",
    "nivelIngles": 5,
    "disponibilidad": "P",

--- a/curriculumsearch/src/main/webapp/css/cargoStyle.css
+++ b/curriculumsearch/src/main/webapp/css/cargoStyle.css
@@ -3,6 +3,7 @@ body{
    background-size:cover;
    background-repeat:no-repeat;
    height:100vh;width:100vw; 
+    background-attachment: fixed;
 }
 label {
    display: inline-block;

--- a/curriculumsearch/src/main/webapp/css/detallePostulantestyle.css
+++ b/curriculumsearch/src/main/webapp/css/detallePostulantestyle.css
@@ -35,7 +35,7 @@ header{
 }
 section{
    background-image:url(/img/fondoBlanco.jpg);
+    background-attachment: fixed;
    display: flex;
 }

--- a/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css
+++ b/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css
@@ -5,6 +5,7 @@ body {
    background-repeat:repeat;
    height:100vh;width:100vw;  
    align-items:"middle";
+    background-attachment: fixed;
 }
 #head{text-align:center}

--- a/curriculumsearch/src/main/webapp/css/indexStyle.css
+++ b/curriculumsearch/src/main/webapp/css/indexStyle.css
@@ -3,6 +3,6 @@ body{
    background-repeat: no-repeat;
    background-size: cover;
    height:100vh;width:100vw;  
+    background-attachment: fixed;
    -webkit-text-size-adjust: 100%;
 }
\ No newline at end of file
--- a/curriculumsearch/src/main/webapp/css/style.css
+++ b/curriculumsearch/src/main/webapp/css/style.css
@@ -5,12 +5,15 @@
 body{
    background-image:url(/img/FondoRoshka.jpg);
    background-size:cover;
+    background-position: center;
    background-repeat:no-repeat;
-    overflow: hidden;
+    background-attachment: fixed;
+    /* overflow: hidden; */
    height:100%;width:100%; 
    align-items:"middle";
    position: absolute;
 }
 #form{max-width:333px;
    width:90%;position:relative;
    left:50%;

--- a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
@@ -132,7 +132,7 @@
                    <hr>
                    <div class="row">
                      <div class="col">
-                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#estadoModalLong">Actualizar</button>
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#estadoModalLong">Agregar observacion</button>
                      </div>
                      <c:choose>
@@ -349,6 +349,7 @@
    <div class="modal fade" id="estadoModalLong" tabindex="-1" role="dialog" aria-labelledby="estadorrhhModal" aria-hidden="true">
      <div class="modal-dialog" role="document">
      <div class="modal-content">
+        <form:form class="needs-validation" method="post" modelAttribute="postulante">
          <div class="modal-header">
          <h5 class="modal-title" id="estadorrhhModal">Estado</h5>
          <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
@@ -356,7 +357,6 @@
          </button>
          </div>
          <div class="modal-body">
-              <form:form class="needs-validation" method="post" modelAttribute="postulante">
                  <form:label path="estadoPostulante" class="form-label">Estado</form:label>
                  <div class="inputs">
                      <form:select class="form-select" path="estadoPostulante" aria-label="Default select example">
@@ -374,13 +374,14 @@
                  <div class="inputs">
                      <form:label path="comentarioRRHH" class="form-label">ComentarioRRHH</form:label>
                      <form:textarea  class="form-control" path="comentarioRRHH" id="comentarioRRHH"></form:textarea>
-                  </div>
+                  </div><br>
-                  <input type="submit" value="Guardar"/>
-              </form:form> 
                </div>
                <div class="modal-footer">
                  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancelar</button>
+                  <button type="submit" class="btn btn-primary" data-bs-dismiss="modal">Agregar</button>
                </div>
+              </form:form> 
      </div>
      </div>
  </div>  

--- a/curriculumsearch/src/main/webapp/jsp/login.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/login.jsp
@@ -14,16 +14,16 @@
 <body>
 <jsp:include page="alerts.jsp"/>
 <!-- <section class="vh-100" style="background-color: #508bfc;"> -->
-    <div class="container py-5 h-100">
+    <div class="container h-100">
        <div class="row d-flex justify-content-center align-items-center h-10">
            <div class="col-12 col-md-8 col-lg-6 col-xl-5">
                <div class="card shadow-2-strong" style="border-radius: 1rem;">
                    <div class="card-body p-5 text-center">
                        <form:form method="post" action="/login">
-                            <h3 class="mb-5">Ingresar</h3>
+                            <h3>Ingresar</h3>
                            <div align="center">
-                                <img src="../img/LogoRoshka.jpg" class="rounded img-fluid" id="image" style="width:auto;height:auto;" alt=""/>
+                                <img src="../img/LogoRoshka.ico" class="rounded img-fluid" id="image" style="width:auto;height:auto;" alt=""/>
                            </div>
                            <div class="form-outline mb-4">
                                <input type="email" id="typeEmailX-2" class="form-control form-control-lg" name="email" placeholder="example@example.com"/>