From 62c9343f7820e681b807b0b83a18a9e306db4eb7 Mon Sep 17 00:00:00 2001 From: Joel Date: Mon, 8 Nov 2021 10:51:46 -0300 Subject: [PATCH] agregar enlaces al index a las demas paginas --- curriculumsearch/src/main/java/com/roshka/controller/CargoController.java | 4 ++-- curriculumsearch/src/main/webapp/jsp/cargo.jsp | 67 ------------------------------------------------------------------- curriculumsearch/src/main/webapp/jsp/convocatorias.jsp | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ curriculumsearch/src/main/webapp/jsp/index.jsp | 3 +++ 4 files changed, 72 insertions(+), 69 deletions(-) delete mode 100644 curriculumsearch/src/main/webapp/jsp/cargo.jsp create mode 100644 curriculumsearch/src/main/webapp/jsp/convocatorias.jsp diff --git a/curriculumsearch/src/main/java/com/roshka/controller/CargoController.java b/curriculumsearch/src/main/java/com/roshka/controller/CargoController.java index 1555efd..9fb72d6 100644 --- a/curriculumsearch/src/main/java/com/roshka/controller/CargoController.java +++ b/curriculumsearch/src/main/java/com/roshka/controller/CargoController.java @@ -31,7 +31,7 @@ public class CargoController { this.convoRepo = convoRepo; } - @RequestMapping("/cargos") + @RequestMapping("/convocatorias") public String menuCargos(Model model, @RequestParam(required = false) Long cargoId, @RequestParam(required = false) Integer isOpen//1: true, 0: false @@ -41,7 +41,7 @@ public class CargoController { model.addAttribute("convocatorias", convoRepo.f1ndByCargoAndEstado(new TypedParameterValue(LongType.INSTANCE, cargoId), new Date(), new TypedParameterValue(IntegerType.INSTANCE, isOpen))); //model.addAttribute("convocatorias",cargoId==null? convoRepo.findAll() : convoRepo.findByCargoId(cargoId)); - return "cargo"; + return "convocatorias"; } @RequestMapping("/cargo") diff --git a/curriculumsearch/src/main/webapp/jsp/cargo.jsp b/curriculumsearch/src/main/webapp/jsp/cargo.jsp deleted file mode 100644 index e5d7667..0000000 --- a/curriculumsearch/src/main/webapp/jsp/cargo.jsp +++ /dev/null @@ -1,67 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - - - Cargo - - - - -
-
- - - Estado: - -
- -
- -
- -
- Agregar Nuevo Cargo -
-
- Agregar Nueva Convocatoria - - - - - - - - - - - - - - - - - - - - - - - - - - -
#CargoFecha DesdeFecha HastaVacantes
${sta.index+1}${convocatoria.getCargo().getNombre()}${convocatoria.getFechaInicio().toString().split(" ")[0]}${convocatoria.getFechaFin().toString().split(" ")[0]}${convocatoria.getCupos()}Ver Postulantes
-
- - - \ No newline at end of file diff --git a/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp b/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp new file mode 100644 index 0000000..e5d7667 --- /dev/null +++ b/curriculumsearch/src/main/webapp/jsp/convocatorias.jsp @@ -0,0 +1,67 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + + + + Cargo + + + + +
+
+ + + Estado: + +
+ +
+ +
+ +
+ Agregar Nuevo Cargo +
+
+ Agregar Nueva Convocatoria + + + + + + + + + + + + + + + + + + + + + + + + + + +
#CargoFecha DesdeFecha HastaVacantes
${sta.index+1}${convocatoria.getCargo().getNombre()}${convocatoria.getFechaInicio().toString().split(" ")[0]}${convocatoria.getFechaFin().toString().split(" ")[0]}${convocatoria.getCupos()}Ver Postulantes
+
+ + + \ No newline at end of file diff --git a/curriculumsearch/src/main/webapp/jsp/index.jsp b/curriculumsearch/src/main/webapp/jsp/index.jsp index 2f174d6..b0ee919 100644 --- a/curriculumsearch/src/main/webapp/jsp/index.jsp +++ b/curriculumsearch/src/main/webapp/jsp/index.jsp @@ -8,5 +8,8 @@ Form postulante + Lista de postulantes + Tecnologias + Lista de convocatorias \ No newline at end of file -- libgit2 0.26.0