From 39b53be9995e2f5355c175a75e89ac88e10addba Mon Sep 17 00:00:00 2001
From: Joel <jflor999@gmail.com>
Date: Wed, 24 Nov 2021 11:43:56 -0300
Subject: [PATCH] se retocaron los filtros en la lista postulantes jsp

---
 curriculumsearch/src/main/resources/static/Convo.js  |  12 ++++++++++--
 curriculumsearch/src/main/webapp/jsp/cargos.jsp      |   2 +-
 curriculumsearch/src/main/webapp/jsp/postulantes.jsp | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 3 files changed, 98 insertions(+), 172 deletions(-)

diff --git a/curriculumsearch/src/main/resources/static/Convo.js b/curriculumsearch/src/main/resources/static/Convo.js
index 0786c0a..b62b56d 100644
--- a/curriculumsearch/src/main/resources/static/Convo.js
+++ b/curriculumsearch/src/main/resources/static/Convo.js
@@ -1,12 +1,20 @@
 const cargoSelect = document.querySelector("#cargoId");
-
+const convoBlock = document.querySelector("#convocatoriaBlock");
 function listarConvocatorias(id){
     const ConvocatoriaAmostrar = convocatorias.filter(c=>c.cargoId==id);
+    
+    if(ConvocatoriaAmostrar.length>0) {
+        convoBlock.style.display = "";
+    }
+    else{
+        convoBlock.style.display = "none";
+    }
+    
     const convocatoria = document.querySelector("select[name=convId]");
     const frag = document.createDocumentFragment();
     let optionDefault = document.createElement("option");
     optionDefault.value = "";
-    optionDefault.innerHTML = "Seleccione";
+    optionDefault.innerHTML = "Todas";
     frag.appendChild(optionDefault);
     for (const conv of ConvocatoriaAmostrar) {
         const opt = document.createElement("option");    
diff --git a/curriculumsearch/src/main/webapp/jsp/cargos.jsp b/curriculumsearch/src/main/webapp/jsp/cargos.jsp
index b6ed957..ec9e153 100644
--- a/curriculumsearch/src/main/webapp/jsp/cargos.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/cargos.jsp
@@ -53,7 +53,7 @@ contentType="text/html;charset=UTF-8" language="java" %>
                       <td><a href="/cargo/${cargo.id}">Editar cargo</a></td>
                       <td>
                         <c:if test="${!cargo.isExisteConvocatoria()}">  
-                          <a class="btn btn-secondary" href="/convocatoria/crear/${cargo.id}">abrirConvocatoria</a>
+                          <a class="btn btn-secondary" href="/convocatoria/crear/${cargo.id}">Abrir Convocatoria</a>
                         </c:if>
                       </td>
                     </tr>
diff --git a/curriculumsearch/src/main/webapp/jsp/postulantes.jsp b/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
index cbdedb7..e6cee0a 100644
--- a/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
+++ b/curriculumsearch/src/main/webapp/jsp/postulantes.jsp
@@ -21,85 +21,17 @@
             <div class="col-auto">
               <button class="btn btn-primary">Buscar</button>
             </div>
+            <div class="col" style="float: left;">
+              <a href="/postulantesExcel?${query}" type="button" class="btn btn-light float-end">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-excel-fill" viewBox="0 0 16 16">
+                      <path d="M9.293 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0zM9.5 3.5v-2l3 3h-2a1 1 0 0 1-1-1zM5.884 6.68 8 9.219l2.116-2.54a.5.5 0 1 1 .768.641L8.651 10l2.233 2.68a.5.5 0 0 1-.768.64L8 10.781l-2.116 2.54a.5.5 0 0 1-.768-.641L7.349 10 5.116 7.32a.5.5 0 1 1 .768-.64z"></path>
+                  </svg>
+                  Excel
+              </a>
           </div>
-          <table class="w3-table ">
-            <thead>
-                <tr class="">
-                  <th scope="col">Estado</th>
-                  
-                  <th scope="col">Nivel de ingles</th>
-                  <th scope="col">Institucion Educativa</th>
-                  <th scope="col">Tecnologias</th>
-                  <th scope="col">Nivel de Tecnologia</th>
-                  <th scope="col">Experiencia general</th>
-                  <th scope="col">Cargo</th>
-                  <th scope="col">Convocatoria</th>
-                </tr>
-              </thead>
-              <tbody>
-                  <td>
-                    <select class="form-select form-select-sm" name="estado" id="estado">
-                      <option value="">Seleccione</option>
-                      <c:forEach items="${estadoP}" var="estados">
-                        <option value="${estados}" ${param.estado == estados ? "selected" : ""}>${estados.getEstado()}</option>
-                      </c:forEach>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="lvlEng" id="lvlEng">
-                      <option value="">Seleccione</option>
-                      <c:forEach var = "lvl" begin = "1" end = "5">
-                        <option value="${lvl}" ${param.lvlEng == lvl ? "selected" : ""}>${lvl}</option>
-                      </c:forEach>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="instId" id="instId">
-                      <option value="">Seleccione</option>
-                      <c:forEach items="${institucionesEducativas}" var="inst">
-                        <option value="${inst.id}" ${param.instId == inst.id ? "selected" : ""}>${inst.nombre}</option>
-                      </c:forEach>
-                    </select>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="tecId" id="tecId">
-                      <option value="">Seleccione</option>
-                      <c:forEach items="${tecnologias}" var="tecnologia">
-                        <option value="${tecnologia.id}" ${param.tecId == tecnologia.id ? "selected" : ""}>${tecnologia.nombre}</option>
-                      </c:forEach>
-                    </select>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm" name="lvlTec" id="lvlTec">
-                      <option value="">Seleccione</option>
-                      <c:forEach var = "lvl" begin = "1" end = "5">
-                        <option value="${lvl}" ${param.lvlTec == lvl ? "selected" : ""}>${lvl}</option>
-                      </c:forEach>
-                    </select>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="expInMonths" id="expInMonths">
-                      <option value="">Seleccione</option>
-                      <option value="6">Mayor a 6 meses</option>
-                      <option value="12">Mayor a 1 año</option>
-                      <option value="36">Mayor a 3 años</option>
-                      <option value="60">Mayor a 5 años</option>
-                    </select>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="cargoId" id="cargoId">
-                      <option value="">Seleccione</option>
-                      <c:forEach items="${cargos}" var="cargo">
-                        <option value="${cargo.id}" ${param.cargoId == cargo.id ? "selected" : ""}>${cargo.getNombre()}</option>
-                      </c:forEach>
-                    </select>
-                  </td>
-                  <td>
-                    <select class="form-select form-select-sm " name="convId" id="convId">
-                      <option value="">Seleccione</option>
-                    </select>
-                  </td>
-              </tbody>
-          </table>
-         <!-- <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 gy-1 mt-2">
+          </div>
+          
+          <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 gy-1 mt-2">
 
            <div class="col">
   
@@ -110,27 +42,78 @@
                </div>
                <div class="col-auto col-md-8">
                 <select class="form-select form-select-sm " name="estado" id="estado">
-                  <option value="">Seleccione una opcion</option>
+                  <option value="">Todas</option>
                   <c:forEach items="${estadoP}" var="estados">
                     <option value="${estados}" ${param.estado == estados ? "selected" : ""}>${estados.getEstado()}</option>
                   </c:forEach>
                 </select>
                </div>
           </div>
-            
-  
-           </div>
-           
-             <div class="col">
+          </div>
+          <div class="col">
+            <div class="row">
+             <div class="col-auto col-md-4">
+               <label class="form-label" for="expInMonths">Experiencia en general</label>
 
-               <div class="row">
-                 <div class="col-auto col-md-4">
-                   <label class="form-label" for="dispo">Disponbilidad</label>
-   
-                 </div>
-                 
-               </div>
              </div>
+              <div class="col-auto col-md-8">
+                <select class="form-select form-select-sm " name="expInMonths" id="expInMonths">
+                  <option value="">Todas</option>
+                  <option value="6">Mayor a 6 meses</option>
+                  <option value="12">Mayor a 1 año</option>
+                  <option value="36">Mayor a 3 años</option>
+                  <option value="60">Mayor a 5 años</option>
+                </select>
+
+              </div>        
+            </div>
+         </div>
+           
+         <div class="col">
+          <div class="row">
+            <div class="col-auto col-md-4">
+              <label class="form-label" for="cargoId">Cargo</label>
+            </div>
+            <div class="col-auto col-md-8">
+              <select class="form-select form-select-sm " name="cargoId" id="cargoId">
+                <option value="">Todas</option>
+                <c:forEach items="${cargos}" var="cargo">
+                  <option value="${cargo.id}" ${param.cargoId == cargo.id ? "selected" : ""}>${cargo.getNombre()}</option>
+                </c:forEach>
+              </select>
+            </div>
+          </div>           
+        </div>
+      <div class="col">
+        <div class="row" id="convocatoriaBlock" style="display: none;">
+          <div class="col-auto col-md-4">
+            <label class="form-label" for="convId">Convocatoria</label>
+          </div>
+          <div class="col-auto col-md-8">
+            <select class="form-select form-select-sm " name="convId" id="convId">
+              <option value="">Todas</option>
+            </select>
+          </div>
+        </div>           
+      </div>
+      <div class="col">
+        <div class="row">
+          <div class="col-auto col-md-4">
+            <label class="form-label" for="instId">Institucion Educativa</label>
+
+          </div>
+          <div class="col-auto col-md-8">
+            <select class="form-select form-select-sm " name="instId" id="instId">
+              <option value="">Todas</option>
+              <c:forEach items="${institucionesEducativas}" var="inst">
+                <option value="${inst.id}" ${param.instId == inst.id ? "selected" : ""}>${inst.nombre}</option>
+              </c:forEach>
+            </select>
+          </div>
+        </div>
+         
+       
+      </div>
              <div class="col">
               <div class="row">
                 <div class="col-auto col-md-4">
@@ -138,7 +121,7 @@
                 </div>
                 <div class="col-auto col-md-8">
                   <select class="form-select form-select-sm " name="lvlEng" id="lvlEng">
-                    <option value="">Seleccione una opcion</option>
+                    <option value="">Todas</option>
                     <c:forEach var = "lvl" begin = "1" end = "5">
                       <option value="${lvl}" ${param.lvlEng == lvl ? "selected" : ""}>${lvl}</option>
                     </c:forEach>
@@ -150,24 +133,7 @@
               
             </div>
             
-          <div class="col">
-            <div class="row">
-              <div class="col-auto col-md-4">
-                <label class="form-label" for="instId">Institucion Educativa</label>
-
-              </div>
-              <div class="col-auto col-md-8">
-                <select class="form-select form-select-sm " name="instId" id="instId">
-                  <option value="">Seleccione una opcion</option>
-                  <c:forEach items="${institucionesEducativas}" var="inst">
-                    <option value="${inst.id}" ${param.instId == inst.id ? "selected" : ""}>${inst.nombre}</option>
-                  </c:forEach>
-                </select>
-              </div>
-            </div>
-             
-           
-          </div>
+          
           <div class="col">
 
             <div class="row">
@@ -177,7 +143,7 @@
               </div>
               <div class="col-auto col-md-8">
                 <select class="form-select form-select-sm " name="tecId" id="tecId">
-                  <option value="">Seleccione una opcion</option>
+                  <option value="">Todas</option>
                   <c:forEach items="${tecnologias}" var="tecnologia">
                     <option value="${tecnologia.id}" ${param.tecId == tecnologia.id ? "selected" : ""}>${tecnologia.nombre}</option>
                   </c:forEach>
@@ -187,13 +153,13 @@
           </div>
           
           <div class="col">
-            <div class="row">
+            <div class="row" id="lvlTecBlock">
               <div class="col-auto col-md-4">
                 <label class="form-label" for="lvlTec">Nivel de Tecnologia</label>
               </div>
               <div class="col-auto col-md-8">
                 <select class="form-select form-select-sm" name="lvlTec" id="lvlTec">
-                  <option value="">Seleccione una opcion</option>
+                  <option value="">Todas</option>
                   <c:forEach var = "lvl" begin = "1" end = "5">
                     <option value="${lvl}" ${param.lvlTec == lvl ? "selected" : ""}>${lvl}</option>
                   </c:forEach>
@@ -204,63 +170,10 @@
             
             
           </div>
-          <div class="col">
-             <div class="row">
-              <div class="col-auto col-md-4">
-                <label class="form-label" for="expInMonths">Experiencia en general</label>
-
-              </div>
-               <div class="col-auto col-md-8">
-                 <select class="form-select form-select-sm " name="expInMonths" id="expInMonths">
-                   <option value="">Seleccione una opcion</option>
-                   <option value="6">Mayor a 6 meses</option>
-                   <option value="12">Mayor a 1 año</option>
-                   <option value="36">Mayor a 3 años</option>
-                   <option value="60">Mayor a 5 años</option>
-                 </select>
-
-               </div>        
-             </div>
-          </div>
-          <div class="col">
-            <div class="row">
-              <div class="col-auto col-md-4">
-                <label class="form-label" for="cargoId">Cargo</label>
-              </div>
-              <div class="col-auto col-md-8">
-                <select class="form-select form-select-sm " name="cargoId" id="cargoId">
-                  <option value="">Seleccione una opcion</option>
-                  <c:forEach items="${cargos}" var="cargo">
-                    <option value="${cargo.id}" ${param.cargoId == cargo.id ? "selected" : ""}>${cargo.getNombre()}</option>
-                  </c:forEach>
-                </select>
-              </div>
-            </div>           
-          </div>
-        <div class="col">
-          <div class="row">
-            <div class="col-auto col-md-4">
-              <label class="form-label" for="convId">Convocatoria</label>
-            </div>
-            <div class="col-auto col-md-8">
-              <select class="form-select form-select-sm " name="convId" id="convId">
-                <option value="">Seleccione una opcion</option>
-              </select>
-            </div>
-          </div>           
-        </div>
-       </div> -->
+          
+          
+       </div> 
       </form>
-          <div class="row">
-              <div class="col-md-12">
-                  <a href="/postulantesExcel?${query}" type="button" class="btn btn-light float-end">
-                      <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-earmark-excel-fill" viewBox="0 0 16 16">
-                          <path d="M9.293 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0zM9.5 3.5v-2l3 3h-2a1 1 0 0 1-1-1zM5.884 6.68 8 9.219l2.116-2.54a.5.5 0 1 1 .768.641L8.651 10l2.233 2.68a.5.5 0 0 1-.768.64L8 10.781l-2.116 2.54a.5.5 0 0 1-.768-.641L7.349 10 5.116 7.32a.5.5 0 1 1 .768-.64z"></path>
-                      </svg>
-                      Excel
-                  </a>
-              </div>
-          </div>
       </div>
       <div class="card text-dark bg-light mt-3">
         
@@ -347,6 +260,10 @@
           lvlTec.disabled = tecId.value == false
           if(lvlTec.disabled){
             lvlTec.firstElementChild.selected=true;
+            lvlTecBlock.style.display = "none";
+          }
+          else{
+            lvlTecBlock.style.display = "";
           }
           
         }
@@ -354,6 +271,7 @@
         
         const tecId = document.querySelector("#tecId");
         const lvlTec = document.querySelector("#lvlTec");
+        const lvlTecBlock = document.querySelector("#lvlTecBlock");
         tecId.addEventListener('change',habilitarLvlTec);
         habilitarLvlTec()
 
--
libgit2 0.26.0