From 133051ffa7872a5fd6daf9d52127b584c65e23a0 Mon Sep 17 00:00:00 2001
From: willgonzz <witagomi@fpuna.edu.py>
Date: Fri, 19 Nov 2021 15:23:25 -0300
Subject: [PATCH] eliminacion de resumen de postulante y se agrega direccion al Postulante y mejora visual del formulario postulante

---
 curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java |  4 ++--
 curriculumsearch/src/main/resources/json/postulante.json         | 14 +++++++-------
 curriculumsearch/src/main/webapp/css/formPostulanteStyle.css     | 21 +++++++++++++++------
 curriculumsearch/src/main/webapp/img/fondoform.svg               |  1 +
 curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp       |  4 ++--
 curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp      |  2 +-
 curriculumsearch/src/main/webapp/jsp/postulante-form.jsp         | 45 ++++++++++++++++++++++++---------------------
 7 files changed, 52 insertions(+), 39 deletions(-)
 create mode 100644 curriculumsearch/src/main/webapp/img/fondoform.svg

diff --git a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
index 8c75079..b44243e 100644
--- a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
+++ b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
@@ -64,8 +64,8 @@ public class Postulante {
     @Past(message = "Este campo no puede estar en el futuro")
     private Date fechaNacimiento;
 
-    @Column(name = "resumen")
-    private String resumen;
+    @Column(name = "direccion")
+    private String direccion;
 
     @Column(name = "nivel_ingles")
     @Min(value = 1)
diff --git a/curriculumsearch/src/main/resources/json/postulante.json b/curriculumsearch/src/main/resources/json/postulante.json
index 6d7c325..e3f9e2a 100644
--- a/curriculumsearch/src/main/resources/json/postulante.json
+++ b/curriculumsearch/src/main/resources/json/postulante.json
@@ -1,6 +1,6 @@
 [
   {
-    "resumen": "In irure aliquip qui cillum veniam sint amet amet sint ex proident anim mollit.",
+    "direccion": "In irure aliquip qui cillum veniam sint amet amet sint ex proident anim mollit.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -59,7 +59,7 @@
     ]
   },
   {
-    "resumen": "Do nostrud aliqua adipisicing in sunt aute id do elit ut dolor ad aliquip.",
+    "direccion": "Do nostrud aliqua adipisicing in sunt aute id do elit ut dolor ad aliquip.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -106,7 +106,7 @@
     ]
   },
   {
-    "resumen": "Occaecat non cupidatat amet reprehenderit consectetur ullamco et.",
+    "direccion": "Occaecat non cupidatat amet reprehenderit consectetur ullamco et.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -153,7 +153,7 @@
     ]
   },
   {
-    "resumen": "Qui ullamco excepteur velit ad ullamco id id nisi irure dolore cupidatat mollit ullamco veniam.",
+    "direccion": "Qui ullamco excepteur velit ad ullamco id id nisi irure dolore cupidatat mollit ullamco veniam.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -200,7 +200,7 @@
     ]
   },
   {
-    "resumen": "Deserunt tempor ut et eiusmod et labore Lorem.",
+    "direccion": "Deserunt tempor ut et eiusmod et labore Lorem.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -247,7 +247,7 @@
     ]
   },
   {
-    "resumen": "Aliqua est adipisicing do exercitation sit laborum aliquip aliqua adipisicing enim aute.",
+    "direccion": "Aliqua est adipisicing do exercitation sit laborum aliquip aliqua adipisicing enim aute.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
@@ -294,7 +294,7 @@
     ]
   },
   {
-    "resumen": "Officia eiusmod ut reprehenderit tempor consequat elit amet ex voluptate aute anim do.",
+    "direccion": "Officia eiusmod ut reprehenderit tempor consequat elit amet ex voluptate aute anim do.",
     "nacionalidad": "Paraguaya",
     "postulaciones": [{ "id": 1 }],
     "estadoCivil": "Soltero",
diff --git a/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css b/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css
index d21e36f..105dde9 100644
--- a/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css
+++ b/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css
@@ -1,11 +1,17 @@
 body {
-    /* background-color: #baebd8;  */
-    background-image:url(/img/fondo.png);
-    /*background-size:cover;*/
-    background-repeat:repeat;
+    background:url(/img/fondoform.svg);
+    background-size: cover;
+    background-attachment: fixed;
+    background-blend-mode: multiply;
+    font-family: "normal";
+    position: relative;
+    width: 100%;
+    height: 100%;
+    font-family:'Shippori Antique B1';
+    /* background-repeat:repeat;
     height:100vh;width:100vw;  
     align-items:"middle";
-    background-attachment: fixed;
+    background-attachment: fixed; */
     
 }
 #head{text-align:center}
@@ -200,8 +206,11 @@ dos bordes con color y que giramos con transform: rotate(-45deg);
 }
 
 h4{
-    color: #5e5b5b;
+    color: #ffffff;
     text-transform: capitalize;
     
     font-size: large;
+}
+form[name="postulante"]{
+    color: #ffffff;
 }
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/img/fondoform.svg b/curriculumsearch/src/main/webapp/img/fondoform.svg
new file mode 100644
index 0000000..ee8c3f6
--- /dev/null
+++ b/curriculumsearch/src/main/webapp/img/fondoform.svg
@@ -0,0 +1 @@
+<svg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.com/svgjs' width='1440' height='560' preserveAspectRatio='none' viewBox='0 0 1440 560'><g mask='url(&quot;#SvgjsMask1560&quot;)' fill='none'><rect width='1440' height='560' x='0' y='0' fill='url(#SvgjsRadialGradient1561)'></rect><path d='M0 0L52.91 0L0 5.82z' fill='rgba(255, 255, 255, .1)'></path><path d='M0 5.82L52.91 0L223.41 0L0 198.10999999999999z' fill='rgba(255, 255, 255, .075)'></path><path d='M0 198.10999999999999L223.41 0L876.5699999999999 0L0 320.44z' fill='rgba(255, 255, 255, .05)'></path><path d='M0 320.44L876.5699999999999 0L1264.6799999999998 0L0 414.01z' fill='rgba(255, 255, 255, .025)'></path><path d='M1440 560L1266.7 560L1440 289.19z' fill='rgba(0, 0, 0, .1)'></path><path d='M1440 289.19L1266.7 560L701.63 560L1440 233.49z' fill='rgba(0, 0, 0, .075)'></path><path d='M1440 233.49L701.6299999999999 560L375.40999999999985 560L1440 115.81z' fill='rgba(0, 0, 0, .05)'></path><path d='M1440 115.81L375.40999999999985 560L223.58999999999986 560L1440 34.019999999999996z' fill='rgba(0, 0, 0, .025)'></path></g><defs><mask id='SvgjsMask1560'><rect width='1440' height='560' fill='white'></rect></mask><radialGradient cx='100%' cy='100%' r='1545.06' gradientUnits='userSpaceOnUse' id='SvgjsRadialGradient1561'><stop stop-color='rgba(9, 82, 158, 1)' offset='1'></stop><stop stop-color='rgba(0, 69, 158, 0)' offset='1'></stop></radialGradient></defs></svg>
\ No newline at end of file
diff --git a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
index b56aa02..f191f7f 100644
--- a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
@@ -69,10 +69,10 @@
                     <hr>
                     <div class="row">
                       <div class="col-sm-3">
-                        <h6 class="mb-0">Resumen</h6>
+                        <h6 class="mb-0">Direccion</h6>
                       </div>
                       <div class="col-sm-9 text-secondary">
-                        ${postulante.resumen}
+                        ${postulante.direccion}
                       </div>
                     </div>
                     <hr>
diff --git a/curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp b/curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp
index 953a278..1bfad4c 100644
--- a/curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/detallepostulante2.jsp
@@ -50,7 +50,7 @@
                     Disponibilidad: ${postulante.disponibilidad}
                 </li>
                 <li>
-                    Resumen: ${postulante.resumen}
+                    Direccion: ${postulante.direccion}
                 </li>
             </ul>
             <br>
diff --git a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
index f48c037..db36b7d 100644
--- a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
@@ -14,6 +14,7 @@
     <link href="../css/formPostulanteStyle.css" rel="stylesheet" type="text/css"/>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
     <link rel="icon" href="../img/LogoRoshka.ico">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Shippori+Antique+B1">
   </head>
 
   <body class="container">
@@ -22,9 +23,9 @@
 
       </div>
     </div>
-    <form name="postulante" method="post" class="needs-validation" novalidate>
-                      <div class="container mt-3">
-                          <div class="card p-3 text-center">
+    <form name="postulante" method="post" class="needs-validation" novalidate >
+                      <div class="container mt-3" style="background-color:#ffff; background: #5791EE40;">
+                          <div class="card p-3 text-center" style="background-color:#ffff; background: #5791EE40;">
                               <div class="d-flex flex-row justify-content-center mb-3">
                                 
                               </div>
@@ -81,7 +82,7 @@
                                       <c:forEach items="${departamentos}" var="departamentos">
                                         <option value="${departamentos.getId()}">${departamentos.getNombre()}</option>
                                       </c:forEach>
-                                    
+                                      
                                     </select> 
                                   </div>
 
@@ -89,30 +90,36 @@
                                     <label for="ciudad" class="form-label"> Ciudad</label> 
                                     <select name="ciudadId" id="ciudad" class="bg-light">
                                       
-                                    
+                                      
                                     </select> 
                                   </div>
+                                  
+                                  <div class="inputs mb-3 col-md-6">
+                                    <label for="direccion" class="form-label">direccion</label>
+                                    <input type="text" name="direccion" class="form-control  " id="direccion" required> </textarea>
+                                  </div>
+                                  
+                                  
                                   <div class="inputs mb-3 col-md-6">
                                     <label for="telefono" class="form-label">Telefono</label>
                                     <input type="number" name="telefono" class="form-control  " id="telefono" required>
                                     
                                   </div>
-
+                                  
                                   <div class="inputs mb-3 col-md-6">
                                     <label for="fechaNacimiento" class="form-label">Fecha de nacimiento</label>
                                     <input type="date" name="fechaNacimiento" class="form-control  " id="fechaNacimiento" required>
                                     
                                   </div>
-
-                                  <div class="about-inputs  mb-3 col-md-12 center">
-                                    <label for="resumen" class="form-label">Resumen</label>
-                                    <textarea  class="form-control center  " name="resumen" id="resumen" required > </textarea>
-                                    
-                                    
+                                  
+                                  <div class="inputs mb-3 col-md-6">
+                                    <label for="formFile" class="form-label">Cargar cv</label>
+                                    <input class="form-control" type="file" id="cvFile">
                                   </div>
-                              
+                                  
+                                  <br>
                         
-                                  <div class="inputs mb-3 col-md-3"> <label for="nivelIngles" class="form-label"> Nivel de ingles</label> 
+                                  <div class="inputs mb-3 col-md-4"> <label for="nivelIngles" class="form-label"> Nivel de ingles</label> 
                                     <select name="nivelIngles" id="nivelIngles" class="content-select">
                                     <option value="1" selected>Ingles muy basico</option>
                                     <option value="2" >Comprendo algunas cosas y puedo leer con la ayuda del traductor</option>
@@ -122,7 +129,7 @@
                                     </select> 
                                   </div>
                                 
-                                  <div class="inputs mb-3 col-md-3"> 
+                                  <div class="inputs mb-3 col-md-4"> 
                                     <label for="disponibilidad" class="form-label"> Disponibilidad</label> 
                                     <select name="disponibilidad" id="disponibilidad" class="content-select">
                                       <c:forEach items="${disponibilidades}" var="disponibilidad">
@@ -131,7 +138,7 @@
                                     
                                   </select> </div>
                                 
-                                  <div class="inputs mb-3 col-md-3"> 
+                                  <div class="inputs mb-3 col-md-4"> 
                                     <label for="estadoCivil" class="form-label"> Estado Civil</label> 
                                     <select name="estadoCivil" id="estadoCivil" class="content-select">
                                       <c:forEach items="${estadosCiviles}" var="estadoCivil">
@@ -139,10 +146,6 @@
                                       </c:forEach>
                                     </select> 
                                   </div>
-                                  <div class="inputs mb-3 col-md-3">
-                                    <label for="formFile" class="form-label">Cargar cv</label>
-                                    <input class="form-control" type="file" id="cvFile">
-                                  </div>
                                   <!-- Button Agregar Cargo al que postulas -->
                                   <hr>
                                   <div class="inputs mb-3 col-md-12">
@@ -247,7 +250,7 @@
                       </div>
     </form>
     <!---------------------------------------Modal de Cargos disponibles---------------------------------------------------------------->
-    <div class="modal fade" id="cargoForm" tabindex="-1" role="dialog" aria-labelledby="cargoForm" aria-hidden="true">
+    <div class="modal fade" id="cargoForm" tabindex="-1" role="dialog" aria-labelledby="cargoForm" aria-hidden="true" >
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
--
libgit2 0.26.0