From a5523490623f67ff0634942422e1721494dc44f2 Mon Sep 17 00:00:00 2001
From: willgonzz <witagomi@fpuna.edu.py>
Date: Tue, 16 Nov 2021 14:17:21 -0300
Subject: [PATCH] modal para modificar estado del postulante

---
 curriculumsearch/src/main/webapp/jsp/cargo-form.jsp        |  2 +-
 curriculumsearch/src/main/webapp/jsp/cargos.jsp            |  2 +-
 curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp |  2 +-
 curriculumsearch/src/main/webapp/jsp/convocatorias.jsp     |  2 +-
 curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 curriculumsearch/src/main/webapp/jsp/layouts/base.jsp      |  3 ++-
 curriculumsearch/src/main/webapp/jsp/postulantes.jsp       |  2 +-
 curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp   |  4 ++--
 curriculumsearch/src/main/webapp/jsp/tecnologias.jsp       |  2 +-
 9 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/curriculumsearch/src/main/webapp/jsp/cargo-form.jsp b/curriculumsearch/src/main/webapp/jsp/cargo-form.jsp
index 82e71cd..a6de80a 100644
--- a/curriculumsearch/src/main/webapp/jsp/cargo-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/cargo-form.jsp
@@ -3,7 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-  <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+  <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
       <div class="card d-flex flex-column justify-content-center align-items-center mx-auto mt-2 p-3" style="width: 20rem;">
         <h5 class="card-title">${cargo.id == null ? "Agregar" : "Modificar"} Cargo</h5>
diff --git a/curriculumsearch/src/main/webapp/jsp/cargos.jsp b/curriculumsearch/src/main/webapp/jsp/cargos.jsp
index 1dc6f93..a2f9b26 100644
--- a/curriculumsearch/src/main/webapp/jsp/cargos.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/cargos.jsp
@@ -3,7 +3,7 @@ prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page
 contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-  <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+  <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
       <div class="container-xxl my-md-4 bd-layout">
         <h2>Lista de cargos</h2>
diff --git a/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp b/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
index 874274d..ae3de78 100644
--- a/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/convocatoria-form.jsp
@@ -3,7 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
         <h2>${convocatoria.id == null ? "Agregar" : "Modificar"} Convocatoria</h2>
         <div class="p-3 mb-2 bg-light text-dark border border-light ">
diff --git a/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp b/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp
index 54d9133..1dc3a0f 100644
--- a/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp
@@ -3,7 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
         <h2>Lista de convocatorias</h2>
         <div>
diff --git a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
index ff1b57d..a5a625a 100644
--- a/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/detallepostulante.jsp
@@ -109,11 +109,28 @@
                         ${postulante.disponibilidad.getDescripcion()}
                       </div>
                     </div>
-                    
+                    <hr>
+                    <div class="row">
+                      <div class="col-sm-3">
+                        <h6 class="mb-0">Estado</h6>
+                      </div>
+                      <div class="col-sm-9 text-secondary">
+                        ${postulante.estadoPostulante.getEstado()}
+                      </div>
+                    </div>
+                    <hr>
+                    <div class="row">
+                      <div class="col-sm-3">
+                        <h6 class="mb-0">ComentarioRRHH</h6>
+                      </div>
+                      <div class="col-sm-9 text-secondary">
+                        ${postulante.getComentarioRRHH()}
+                      </div>
+                    </div>
                     <hr>
                     <div class="row">
                       <div class="col">
-                        <a class="btn btn-link " href="#">Editar</a>
+                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#estadoModalLong">actualizar</button>
                       </div>
                       <div class="col">
                         <a class="btn btn-link " href="#">Descargar CV</a>
@@ -296,33 +313,56 @@
             
             
           </div>
+    <!-- Modal -->
+    <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">
+          <div class="modal-header">
+          <h5 class="modal-title" id="estadorrhhModal">Estado</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+          </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">
+                          <c:forEach items="${estadoP}" var="estadoPostulante">
+                                      <c:choose>
+                                          <c:when test="${estadoPostulante.getEstado()=='Nuevo' }">
+                                          </c:when>
+                                          <c:otherwise>
+                                              <form:option value="${estadoPostulante}">${estadoPostulante.getEstado()}</form:option>
+                                          </c:otherwise>
+                                      </c:choose>    
+                          </c:forEach>
+                      </form:select>
+                  </div>
+                  <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>
+                  <input type="submit" value="Guardar"/>
+              </form:form> 
+          </div>
+          <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+          </div>
+      </div>
+      </div>
+  </div>  
+  <layout:put block="scripts" type="APPEND">
+
+    <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://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" 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>
+  </layout:put>
 
+            
         
     
-        <div style="padding:10px ;margin: 5px;border: 3px solid black;">
-            <b><i><h2>Cambiar Estado del Postulante y Comentario de RRHH</h2></b></i>
-            <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">
-                    <c:forEach items="${estadoP}" var="estadoPostulante">
-                                <c:choose>
-                                    <c:when test="${estadoPostulante.getEstado()=='Nuevo' }">
-                                    </c:when>
-                                    <c:otherwise>
-                                        <form:option value="${estadoPostulante}">${estadoPostulante.getEstado()}</form:option>
-                                    </c:otherwise>
-                                </c:choose>    
-                    </c:forEach>
-                </form:select>
-                </div>
-                <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>
-                <input type="submit" value="submit"/>
-            </form:form>
-        </div>  
+ 
     </layout:put>
 </layout:extends>
 
diff --git a/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp b/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
index 2744028..deaba95 100644
--- a/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/layouts/base.jsp
@@ -9,7 +9,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <layout:block name="cssDeclaracion"></layout:block>
+    <layout:block name="cssDeclaracion"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:block>
+
     <title>RRHH</title>
 </head>
 <body>
diff --git a/curriculumsearch/src/main/webapp/jsp/postulantes.jsp b/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
index e96a0da..4806afa 100644
--- a/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
@@ -3,7 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
       <h2>Lista de Postulantes</h2>
       <div id="buscador">
diff --git a/curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp b/curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp
index c398fea..ff5e44c 100644
--- a/curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/tecnologia-form.jsp
@@ -3,8 +3,8 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
         <h2>${tecnologia.id == null ? "Agregar" : "Modificar"} Tecnologia</h2>
         <div class="p-3 mb-2 bg-light text-dark border border-light">
diff --git a/curriculumsearch/src/main/webapp/jsp/tecnologias.jsp b/curriculumsearch/src/main/webapp/jsp/tecnologias.jsp
index 9a9584c..c12e829 100644
--- a/curriculumsearch/src/main/webapp/jsp/tecnologias.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/tecnologias.jsp
@@ -3,7 +3,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
 <layout:extends name="layouts/base.jsp">
-    <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
+    <layout:put block="cssDeclaracion" type="APPEND"></layout:put>
     <layout:put block="contents" type="REPLACE">
         <h2>Lista de Tecnologias</h2>
 
--
libgit2 0.26.0