diff --git a/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java b/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java index f1e32f8..d63bba8 100644 --- a/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java +++ b/curriculumsearch/src/main/java/com/roshka/controller/PostulanteController.java @@ -95,13 +95,6 @@ public class PostulanteController { return "postulante-form"; } - /* @PostMapping("/uploadCVPostulante") - public String uploadFile(@RequestParam("file") MultipartFile file) { - dbFileRepository.save(storeFile(file)); - DBFile dbFile = dbFileRepository.save(storeFile(file)); - return "{\"id\": "+dbFile.getId()+"}"; - } */ - private DBFile createFile(MultipartFile file) { // Normalize file name String fileName = StringUtils.cleanPath(file.getOriginalFilename()); diff --git a/curriculumsearch/src/main/java/com/roshka/modelo/Nacionalidad.java b/curriculumsearch/src/main/java/com/roshka/modelo/Nacionalidad.java index 3b62edc..6c5e612 100644 --- a/curriculumsearch/src/main/java/com/roshka/modelo/Nacionalidad.java +++ b/curriculumsearch/src/main/java/com/roshka/modelo/Nacionalidad.java @@ -3,7 +3,7 @@ package com.roshka.modelo; import com.fasterxml.jackson.annotation.JsonValue; public enum Nacionalidad { - PY("Paraguayo"),EX("Extranjero"); + PY("Paraguaya"),EX("Extranjera"); private String descripcion; diff --git a/curriculumsearch/src/main/resources/json/postulante.json b/curriculumsearch/src/main/resources/json/postulante.json index ace6a6e..e94c5f4 100644 --- a/curriculumsearch/src/main/resources/json/postulante.json +++ b/curriculumsearch/src/main/resources/json/postulante.json @@ -1,7 +1,7 @@ [ { "resumen": "In irure aliquip qui cillum veniam sint amet amet sint ex proident anim mollit.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -60,7 +60,7 @@ }, { "resumen": "Do nostrud aliqua adipisicing in sunt aute id do elit ut dolor ad aliquip.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -107,7 +107,7 @@ }, { "resumen": "Occaecat non cupidatat amet reprehenderit consectetur ullamco et.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -154,7 +154,7 @@ }, { "resumen": "Qui ullamco excepteur velit ad ullamco id id nisi irure dolore cupidatat mollit ullamco veniam.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -201,7 +201,7 @@ }, { "resumen": "Deserunt tempor ut et eiusmod et labore Lorem.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -248,7 +248,7 @@ }, { "resumen": "Aliqua est adipisicing do exercitation sit laborum aliquip aliqua adipisicing enim aute.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", @@ -295,7 +295,7 @@ }, { "resumen": "Officia eiusmod ut reprehenderit tempor consequat elit amet ex voluptate aute anim do.", - "nacionalidad": "Paraguayo", + "nacionalidad": "Paraguaya", "postulaciones": [{ "id": 1 }], "estadoCivil": "Soltero", "tipoDocumento": "CI", diff --git a/curriculumsearch/src/main/resources/static/main.js b/curriculumsearch/src/main/resources/static/main.js index 9070da3..9c476ee 100644 --- a/curriculumsearch/src/main/resources/static/main.js +++ b/curriculumsearch/src/main/resources/static/main.js @@ -164,11 +164,11 @@ function agregarFieldTecnologia(){ const tecn = tecnologias[index]; if(tecn==null) continue; content1 += ` -
-
-
- -
+
+ ${tecn.tecnologia.nombre} ( ${tecn.nivel} )   + + +
` @@ -179,6 +179,7 @@ function agregarFieldTecnologia(){ //div.appendChild(div1); cont_tecnologia++; document.querySelector("#no-valid-tecno").style.display = "none"; + modalTecnologia.hide() } function eliminarTecnologia(event) { //eliminar del array @@ -259,7 +260,7 @@ function agregarFieldExpierncia(event){ if(exp==null) continue; content += `
-

Experiencia

+

Experiencia




@@ -267,8 +268,8 @@ function agregarFieldExpierncia(event){


+ -
` @@ -280,11 +281,12 @@ function agregarFieldExpierncia(event){ cont_experiencia++; modalExperiencia.hide() } -function eliminarExperiencia(event) { +function eliminarExperiencia(index) { //eliminar del array - experiencias[event.target.parentElement.id.split("-")[1]]=null + experiencias[index]=null //eliminar en html - event.target.parentElement.remove() + document.getElementById("exp-"+index).remove() + //event.target.parentElement.remove() } /*---------------Estudios---------------------------*/ @@ -365,14 +367,14 @@ function agregarFieldEstudio(){ if(est==null) continue; content += `
-

Estudio

+

Estudio







- +
` @@ -386,11 +388,11 @@ function agregarFieldEstudio(){ modalEstudio.hide() } -function eliminarEstudio(event) { +function eliminarEstudio(index) { //eliminar del array - estudios[event.target.parentElement.id.split("-")[1]]=null + estudios[index]=null //eliminar en html - event.target.parentElement.remove() + document.getElementById("est-"+index).remove() } /*------------Cargos----------------------------------------*/ function agregarFieldCargo(){ @@ -449,9 +451,9 @@ function agregarFieldCargo(){ const car = postulaciones[index]; if(car==null) continue; content1 += ` -
-
-
+
+ ${document.querySelector('[name=cargo-id] > option[value="'+car.id+'"]').innerHTML} +
` @@ -523,12 +525,13 @@ function agregarFieldReferencia(event){ const exp = referencias[index]; if(exp==null) continue; content += ` -
-

Referencia Personal

+
+

Referencia Personal

+


- +
` @@ -539,13 +542,13 @@ function agregarFieldReferencia(event){ //div.appendChild(div1); cont_referencias++; formexp.classList.remove('was-validated') - modalExperiencia.hide() + modalReferencia.hide() } -function eliminarReferencia(event) { +function eliminarReferencia(index) { //eliminar del array - referencias[event.target.parentElement.id.split("-")[1]]=null + referencias[index]=null //eliminar en html - event.target.parentElement.remove() + document.getElementById("ref-"+index).remove() } /*--------------Form submit----------------------------- */ function serializeJSON (form) { diff --git a/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css b/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css index f227aa3..c34346d 100644 --- a/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css +++ b/curriculumsearch/src/main/webapp/css/formPostulanteStyle.css @@ -1,5 +1,5 @@ body { - background-color: #baebd8; + background-color: #5078DA; /* background-image:url(/img/fondo2.png); */ /*background-size:cover;*/ background-repeat:repeat; diff --git a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp index dc0e7ba..e1c9f8e 100644 --- a/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp +++ b/curriculumsearch/src/main/webapp/jsp/postulante-form.jsp @@ -12,6 +12,7 @@ Curriculum + @@ -26,7 +27,7 @@
-

Curriculum

+

Datos Personales

@@ -44,7 +45,7 @@
- +
@@ -142,33 +143,109 @@
-
- -
+
+ +
+
+ +

Cargos

+ + +
+
+
+ +
+
+
+ +
+ + +
+
+ + + -
-
+
+ +
+
+

Experiencias

+
+
+
+ +
+
+
+
+ -
-
+
+ +
+
+

Estudios

+
+
+
+ +
+
+
+
+ -
- - -
+
+ +
+
+ +

Tecnologias

+
+
+ +
+
+ +
+
+ +
+ + +
+ + + + -
-
+
+ +
+
+

Referencia Personal

+
+
+
+ +
+
+
+
+