From 90a127a1dd1e6d93d492647b4f9c04d151da056a Mon Sep 17 00:00:00 2001
From: Joel <jflor999@gmail.com>
Date: Mon, 22 Nov 2021 09:00:37 -0300
Subject: [PATCH] se cambio cargo al que postula el modal por el select. se agrego campo fecha creacion en entidad postulante, valor calculado automaticamente

---
 curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java |  4 ----
 curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java               | 25 +++++++++++++++++++------
 curriculumsearch/src/main/resources/static/main.js                             | 13 ++++++++++++-
 curriculumsearch/src/main/webapp/jsp/postulante-form.jsp                       | 18 ++++++++++++++----
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java b/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java
index bbb6c96..2e15e7e 100644
--- a/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java
+++ b/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java
@@ -109,10 +109,6 @@ public class PostulanteController {
             expRepo.findByPostulante(postulantex).forEach(x -> expRepo.delete(x));
             postulanteTecnologiaRepository.findByPostulante(postulantex).forEach(x -> postulanteTecnologiaRepository.delete(x));
             postulante.setId(postulantex.getId());
-        } else{
-            postulante.setEstadoPostulante(EstadoPostulante.NUEVO);
-            postulante.setComentarioRRHH(null); 
-
         }
         if(file!=null){
             DBFile cv = Helper.createFile(file);
diff --git a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
index b44243e..06659a9 100644
--- a/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
+++ b/curriculumsearch/src/main/java/com/roshka/modelo/Postulante.java
@@ -79,7 +79,7 @@ public class Postulante {
 
     @Column(name="estado_postulante")
     @NotNull
-    private EstadoPostulante estadoPostulante=EstadoPostulante.NUEVO;
+    private EstadoPostulante estadoPostulante;
     @Column(name="comentario_rrhh")
     private String comentarioRRHH;    
 
@@ -123,15 +123,28 @@ public class Postulante {
     @JoinColumn(name = "cvfile_id",referencedColumnName = "id")
     @JsonIgnore
     private DBFile cvFile;
-
-
-  
- 
-
    
+    @Column(name = "created_at")
+    private Date createdAt;
+
+    @Column(name = "updated_at")
+    private Date updatedAt;
+    
     public void setFechaNacimiento(String fechaNacimiento) {
         this.fechaNacimiento = Helper.convertirFecha(fechaNacimiento);
     }
+
+    @PrePersist
+    public void precargarFechas(){
+        this.createdAt = new Date();
+        this.updatedAt = this.createdAt;
+        this.estadoPostulante = EstadoPostulante.NUEVO;
+        this.comentarioRRHH = null;
+    }
+    @PreUpdate
+    public void actualizarFecha(){
+        this.updatedAt = new Date();
+    }
   
    
 }
diff --git a/curriculumsearch/src/main/resources/static/main.js b/curriculumsearch/src/main/resources/static/main.js
index a371dc7..daad42f 100644
--- a/curriculumsearch/src/main/resources/static/main.js
+++ b/curriculumsearch/src/main/resources/static/main.js
@@ -575,7 +575,7 @@ function eliminarReferencia(index) {
     document.getElementById("ref-"+index).remove()
 }
 /*--------------Form submit----------------------------- */
-function serializeJSON (form) {
+function serializeJSON (form,excluded_input=['cargo-id']) {
     // Create a new FormData object
     const formData = new FormData(form);
 
@@ -594,8 +594,19 @@ function serializeJSON (form) {
 
     // Add each name/value pair to the object
     for (const [name, value] of formData) {
+        if(excluded_input.includes(name)) continue;
         pairs[name] = value
     }
+    let cargos = document.getElementsByName("cargo-id");
+    cont_cargo = 0;
+    const postulaciones=[];
+    for (let i = 0; i < cargos.length; i++) {
+        if(cargos[i].checked){
+            postulaciones[cont_cargo] = {}
+            postulaciones[cont_cargo]["id"] = cargos[i].value;
+            cont_cargo++;
+        }
+    }
     pairs["experiencias"] = experiencias.filter(exp => exp)//eliminacion de nulos
     pairs["estudios"] = estudios.filter(est => est)//eliminacion de nulos
     pairs["tecnologias"] = tecnologias.filter(tec => tec)//eliminacion de nulos
diff --git a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
index 5785b03..dd75898 100644
--- a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp
@@ -148,18 +148,28 @@
                                   </div>
                                   <!-- Button Agregar Cargo al que postulas -->
                                   <hr>
-                                  <div class="inputs mb-3 col-md-12">
+                                  <div class="mb-3 col-md-12">
 
                                     <div class="row w-100 gy-2 mx-auto">
                                       <div class="col-12 px-0">
                                         <h4 class="text-start">Cargos <i class="bi bi-plus-square" data-bs-toggle="modal" data-bs-target="#cargoForm"></i></h4>	
                                       </div>
                                       <div class="col-12">
-                                        <div class="mt-3 gap-2 row row-cols-4" style="display: flex;" id="cargos">
+                                        <div class="mt-3 gap-2 row" id="cargos">
+                                          <c:forEach items="${CargosDisponibles}" var="convocatoria">
+                                            
+                                            <div class="form-check form-check-inline col-2">
+                                              <div class="row">
+
+                                                <input class="form-check-input col-auto ms-1" type="checkbox" name="cargo-id" id="cargo-${convocatoria.getId()}" value="${convocatoria.getId()}">
+                                                <label class="col text-start" for="cargo-${convocatoria.getId()}">${convocatoria.getCargo().getNombre()}</label>
+                                              </div>
+                                            </div>
+                                          </c:forEach>
                                         </div>
                                       </div>
                                       <div class="col-12">
-                                        <p id="no-valid-cargo" style="display: none; color: red;" class="text-center">
+                                        <p id="no-valid-cargo" style="display: none; color: yellow;" class="text-center">
                                           *Agrega por lo menos un cargo
                                         </p>
                                       </div>
@@ -199,7 +209,7 @@
                                         
                                       </div>
                                       <div class="col-12">
-                                        <p id="no-valid-tecno" style="display: none; color: red;" class="text-center">
+                                        <p id="no-valid-tecno" style="display: none; color: yellow;" class="text-center">
                                           *Agrega por lo menos una tecnologia
                                         </p>   
                                       </div>
--
libgit2 0.26.0