Commit 3b3ca2b2 by willgonzz

merge con joel-001

parents 213dc71c f9945b4e
{
"java.configuration.updateBuildConfiguration": "interactive"
}
\ No newline at end of file
...@@ -78,6 +78,13 @@ ...@@ -78,6 +78,13 @@
<!-- <version>1.18.22</version>--> <!-- <version>1.18.22</version>-->
<!-- <scope>provided</scope>--> <!-- <scope>provided</scope>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency>
<groupId>kr.pe.kwonnam.jsp</groupId>
<artifactId>jsp-template-inheritance</artifactId>
<version>0.3.RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
package com.roshka.controller; package com.roshka.controller;
import javax.validation.Valid;
import com.roshka.modelo.Cargo; import com.roshka.modelo.Cargo;
import com.roshka.repositorio.CargoRepository; import com.roshka.repositorio.CargoRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -42,8 +44,11 @@ public class CargoController { ...@@ -42,8 +44,11 @@ public class CargoController {
} }
@PostMapping(path = {"/cargo","/cargo/{id}"}) @PostMapping(path = {"/cargo","/cargo/{id}"})
public String guardarCargo(@ModelAttribute Cargo cargo, BindingResult result, @PathVariable(required = false) Long id) { public String guardarCargo(@Valid @ModelAttribute Cargo cargo, BindingResult result, @PathVariable(required = false) Long id, Model model) {
if(result.hasErrors()); if(result.hasErrors() || (id==null && cargoRepo.existsByNombreIgnoreCase(cargo.getNombre()) )){
model.addAttribute("mismoNombre", true);
return "cargo-form";
};
if(id != null ) cargo.setId(id); if(id != null ) cargo.setId(id);
cargoRepo.save(cargo); cargoRepo.save(cargo);
System.out.println(cargo.getNombre()); System.out.println(cargo.getNombre());
......
package com.roshka.controller;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/home")
public class HomeController {
@RequestMapping()
public String home(Model model) {
return "index";
}
}
...@@ -81,13 +81,6 @@ public class PostulanteController { ...@@ -81,13 +81,6 @@ public class PostulanteController {
this.carRepo=carRepo; this.carRepo=carRepo;
} }
@RequestMapping("home")
public String index() {
return "index";
}
@RequestMapping("/postulantes") @RequestMapping("/postulantes")
public String postulantes(Model model, public String postulantes(Model model,
@RequestParam(required = false)Long tecId, @RequestParam(required = false)Long tecId,
...@@ -184,8 +177,8 @@ public class PostulanteController { ...@@ -184,8 +177,8 @@ public class PostulanteController {
return "redirect:/postulacion-correcta"; return "redirect:/postulacion-correcta";
} }
@GetMapping("/postulacion-correcta") @GetMapping("/postulacion-correcta")
public String successPostulation(Model model){ public String successPostulation(Model model){
model.addAttribute("mensaje1", "Tu informacion se ha recibido correctamente!"); model.addAttribute("mensaje1", "Tu informacion se ha recibido correctamente!");
model.addAttribute("mensaje2", " espera por que nos pongamos en contacto!"); model.addAttribute("mensaje2", " espera por que nos pongamos en contacto!");
return "exitoRegistro"; return "exitoRegistro";
...@@ -213,9 +206,9 @@ public class PostulanteController { ...@@ -213,9 +206,9 @@ public class PostulanteController {
public String getPostulanteDetalle(Model model, @PathVariable("postulanteId") Long postulanteId) { public String getPostulanteDetalle(Model model, @PathVariable("postulanteId") Long postulanteId) {
Postulante p = post.findById(postulanteId).orElse(null); Postulante p = post.findById(postulanteId).orElse(null);
model.addAttribute("postulante",p); model.addAttribute("postulante",p);
model.addAttribute("estadoP", EstadoPostulante.values()); model.addAttribute("estadoP", EstadoPostulante.values());
return "detallepostulante2"; return "detallepostulante";
} }
@PostMapping({"/postulante/{postulanteId}"}) @PostMapping({"/postulante/{postulanteId}"})
public String setPostulanteEstado(@ModelAttribute Postulante postulante, BindingResult result, @PathVariable("postulanteId") Long postulanteId) { public String setPostulanteEstado(@ModelAttribute Postulante postulante, BindingResult result, @PathVariable("postulanteId") Long postulanteId) {
......
package com.roshka.controller; package com.roshka.controller;
import javax.validation.Valid;
import com.roshka.modelo.Tecnologia; import com.roshka.modelo.Tecnologia;
import com.roshka.repositorio.TecnologiaRepository; import com.roshka.repositorio.TecnologiaRepository;
...@@ -45,8 +47,11 @@ public String addtecnologiaView(Model model,@PathVariable(required = false) Long ...@@ -45,8 +47,11 @@ public String addtecnologiaView(Model model,@PathVariable(required = false) Long
} }
@PostMapping(path = {"/tecnologia","/tecnologia/{id}"}) @PostMapping(path = {"/tecnologia","/tecnologia/{id}"})
public String addtecnologia(@ModelAttribute Tecnologia tecnologia, BindingResult result, @PathVariable(required = false) Long id) { public String addtecnologia(@Valid @ModelAttribute Tecnologia tecnologia, BindingResult result, @PathVariable(required = false) Long id, Model model) {
if(result.hasErrors()); if(result.hasErrors() || (id==null && tecRepo.existsByNombreIgnoreCase(tecnologia.getNombre()))){
model.addAttribute("mismoNombre", true);
return "tecnologia-form";
}
if(id != null ) tecnologia.setId(id); if(id != null ) tecnologia.setId(id);
tecRepo.save(tecnologia); tecRepo.save(tecnologia);
System.out.println(tecnologia.getNombre()); System.out.println(tecnologia.getNombre());
......
...@@ -15,17 +15,17 @@ public class Tecnologia { ...@@ -15,17 +15,17 @@ public class Tecnologia {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Id @Id
@Column(name="id") @Column(name="id")
private long id; private Long id;
@Column(name="nombre") @Column(name="nombre")
@NotBlank(message = "Este campo no puede estar vacio") @NotBlank(message = "Este campo no puede estar vacio")
private String nombre; private String nombre;
public long getId() { public Long getId() {
return id; return id;
} }
public void setId(long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
public String getNombre() { public String getNombre() {
......
...@@ -8,4 +8,5 @@ import org.springframework.data.jpa.repository.JpaRepository; ...@@ -8,4 +8,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
public interface CargoRepository extends JpaRepository<Cargo,Long>{ public interface CargoRepository extends JpaRepository<Cargo,Long>{
public List<Cargo> findByNombreContainingIgnoreCase(String nombre); public List<Cargo> findByNombreContainingIgnoreCase(String nombre);
public boolean existsByNombreIgnoreCase(String nombre);
} }
...@@ -9,4 +9,6 @@ import com.roshka.modelo.Tecnologia; ...@@ -9,4 +9,6 @@ import com.roshka.modelo.Tecnologia;
public interface TecnologiaRepository extends JpaRepository<Tecnologia,Long> { public interface TecnologiaRepository extends JpaRepository<Tecnologia,Long> {
public List<Tecnologia> findByNombreContainingIgnoreCase(String nombre); public List<Tecnologia> findByNombreContainingIgnoreCase(String nombre);
public boolean existsByNombreIgnoreCase(String nombre);
} }
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
#spring.jpa.show-sql=true spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true spring.jpa.properties.hibernate.format_sql=true
#logging.level.org.hibernate.SQL=DEBUG logging.level.org.hibernate.SQL=DEBUG
#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
spring.sql.init.mode=always spring.sql.init.mode=always
spring.sql.init.platform=postgres spring.sql.init.platform=postgres
...@@ -24,3 +24,5 @@ spring.mail.port=587 ...@@ -24,3 +24,5 @@ spring.mail.port=587
spring.mail.properties.mail.smtp.auth=true spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true spring.mail.properties.mail.smtp.starttls.enable=true
jsp-inheritance-prefix=/jsp/layouts/
jsp-inheritance-suffix=.jsp
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html> <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<html lang="en"> <layout:extends name="layouts/base.jsp">
<head> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<meta charset="UTF-8" /> <layout:put block="contents" type="REPLACE">
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <div class="card d-flex flex-column justify-content-center align-items-center mx-auto mt-2 p-3" style="width: 20rem;">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <h5 class="card-title">${cargo.id == null ? "Agregar" : "Modificar"} Cargo</h5>
<title>Cargo</title> <form:form
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/> action="/cargo/${cargo.id == null ? '' : cargo.id}"
<link method="post"
href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" modelAttribute="cargo"
rel="stylesheet" class="card-body d-flex flex-column"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" >
crossorigin="anonymous" <div class="">
/> <form:label class="form-label visually-hidden" path="nombre"
<script >Nombre del cargo
src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" </form:label>
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" <form:input
crossorigin="anonymous" type="text"
></script> path="nombre"
</head> class="form-control ${ mismoNombre ? 'is-invalid' : ''}"
<body> placeholder="Nombre del cargo" required="true"
<jsp:include page="header.jsp" />
<jsp:include page="alerts.jsp" /> />
<div class="container-xxl my-md-4 bd-layout"> <div id="validationServerUsernameFeedback" class="invalid-feedback">
<h2>Agregar Cargo</h2> Este nombre ya existe
<div class="p-3 mb-2"> </div>
<form:form </div>
action="/cargo/${cargo.id == null ? '' : cargo.id}" <div class="mt-2 align-self-end">
method="post" <input type="submit" value="Guardar" class="btn btn-primary" />
modelAttribute="cargo" </div>
class="row row-cols-lg-auto g-3 align-items-center" </form:form>
> </div>
<div class="col-12"> </layout:put>
<form:label class="form-label visually-hidden" path="nombre" <layout:put block="scripts" type="APPEND">
>Nombre del cargo
</form:label> </layout:put>
<form:input </layout:extends>
type="text"
path="nombre"
class="form-control"
placeholder="Nombre del cargo" required="true"
/>
</div>
<div class="col-12">
<input type="submit" value="Guardar" class="btn btn-primary" />
</div>
</form:form>
</div>
</div>
</body>
</html>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib
prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page
contentType="text/html;charset=UTF-8" language="java" %> contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html> <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<html lang="en"> <layout:extends name="layouts/base.jsp">
<head> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<meta charset="UTF-8" /> <layout:put block="contents" type="REPLACE">
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <div class="container-xxl my-md-4 bd-layout">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <h2>Lista de cargos</h2>
<title>Cargo</title> <div>
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/> <form>
<link <label for="cargos">Nombre:</label>
href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" <input
rel="stylesheet" type="text"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" name="nombre"
crossorigin="anonymous" id="nombre"
/> value="${param.nombre}"
<script />
src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" <input type="submit" value="Buscar" />
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" </form>
crossorigin="anonymous" <a href="/cargo">Agregar Nuevo Cargo</a>
></script> </div>
</head> <div>
<body> <table class="table">
<jsp:include page="header.jsp" /> <thead>
<jsp:include page="alerts.jsp" /> <tr>
<div class="container-xxl my-md-4 bd-layout"> <th scope="col">#</th>
<h2>Lista de cargos</h2> <th scope="col">Cargo</th>
<div> </tr>
<form> </thead>
<label for="cargos">Nombre:</label> <tbody>
<input <c:forEach items="${cargos}" var="cargo" varStatus="sta">
type="text" <tr>
name="nombre" <th scope="row">${sta.index+1}</th>
id="nombre" <td>${cargo.getNombre()}</td>
value="${param.nombre}" <td>
/> <a href="/convocatorias?cargoId=${cargo.id}"
<input type="submit" value="Buscar" /> >Ver Convocatorias</a
</form> >
<a href="/cargo">Agregar Nuevo Cargo</a> </td>
</div> <td><a href="/cargo/${cargo.id}">Editar cargo</a></td>
<div> </tr>
<table class="table"> </c:forEach>
<thead> </tbody>
<tr> </table>
<th scope="col">#</th> </div>
<th scope="col">Cargo</th> </div>
</tr> </layout:put>
</thead> <layout:put block="scripts" type="APPEND">
<tbody>
<c:forEach items="${cargos}" var="cargo" varStatus="sta"> </layout:put>
<tr> </layout:extends>
<th scope="row">${sta.index+1}</th>
<td>${cargo.getNombre()}</td>
<td>
<a href="/convocatorias?cargoId=${cargo.id}"
>Ver Convocatorias</a
>
</td>
<td><a href="/cargo/${cargo.id}">Editar cargo</a></td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</body>
</html>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html> <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<html lang="en"> <layout:extends name="layouts/base.jsp">
<head> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<meta charset="UTF-8"> <layout:put block="contents" type="REPLACE">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <h2>${convocatoria.id == null ? "Agregar" : "Modificar"} Convocatoria</h2>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <div class="p-3 mb-2 bg-light text-dark border border-light ">
<title>Convocatoria</title> <form:form action="/convocatoria/${convocatoria.id == null ? '' : convocatoria.id}" method="post" modelAttribute="convocatoria">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> <div class="mb-3 col-3">
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/> <form:label path="fechaInicioS" class="form-label">Fecha inicial</form:label>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script> <form:input type="date" class="form-control" path="fechaInicioS" required="true"/>
</head>
<body> </div>
<jsp:include page="header.jsp"/> <div class="mb-3 col-3">
<jsp:include page="alerts.jsp"/> <form:label path="fechaFinS" class="form-label">Fecha Fin</form:label>
<div class="container-xxl my-md-4 bd-layout"> <form:input type="date" class="form-control" path="fechaFinS" required="true"/>
<h2>Agregar Convocatoria</h2> </div>
<div class="p-3 mb-2 " style="background-color: transparent;"> <div class="mb-3 col-3">
<form:form action="/convocatoria/${convocatoria.id == null ? '' : convocatoria.id}" method="post" modelAttribute="convocatoria"> <form:label path="cupos" class="form-label">Cupos:</form:label>
<div class="mb-3 col-3"> <form:input type="number" class="form-control" path="cupos" required="true"/>
<form:label path="fechaInicioS" class="form-label">Fecha inicial</form:label> </div>
<form:input type="date" class="form-control" path="fechaInicioS" required="true"/> <div class="mb-3 col-3">
<form:label path="cargoId" class="form-label">Cargo</form:label>
</div> <form:select class="form-select" path="cargoId" required="true">
<div class="mb-3 col-3"> <c:forEach items="${cargos}" var="cargo">
<form:label path="fechaFinS" class="form-label">Fecha Fin</form:label> <form:option value="${cargo.id}">${cargo.nombre} </form:option>
<form:input type="date" class="form-control" path="fechaFinS" required="true"/> </c:forEach>
</div> </form:select>
<div class="mb-3 col-3"> </div>
<form:label path="cupos" class="form-label">Cupos:</form:label> <button type="submit" class="btn btn-primary">Guardar</button>
<form:input type="number" class="form-control" path="cupos" required="true"/> </form:form>
</div> </div>
<div class="mb-3 col-3"> </layout:put>
<form:label path="cargoId" class="form-label">Cargo</form:label> <layout:put block="scripts" type="APPEND">
<form:select class="form-select" path="cargoId" required="true">
<c:forEach items="${cargos}" var="cargo"> </layout:put>
<form:option value="${cargo.id}">${cargo.nombre} </form:option> </layout:extends>
</c:forEach>
</form:select>
</div>
<button type="submit" class="btn btn-primary">Guardar</button>
</form:form>
</div>
</div>
</body>
</html>
\ No newline at end of file
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html> <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<html lang="en"> <layout:extends name="layouts/base.jsp">
<head> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<meta charset="UTF-8"> <layout:put block="contents" type="REPLACE">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Cargo</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
</head>
<body >
<jsp:include page="header.jsp"/>
<jsp:include page="alerts.jsp"/>
<div class="container-xxl my-md-4 bd-layout">
<h2>Lista de convocatorias</h2> <h2>Lista de convocatorias</h2>
<div> <div>
<form> <form>
...@@ -68,7 +57,8 @@ ...@@ -68,7 +57,8 @@
</table> </table>
</div> </div>
</div> </layout:put>
<layout:put block="scripts" type="APPEND">
</body>
</html> </layout:put>
\ No newline at end of file </layout:extends>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <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"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<title>Document</title> <title>RRHH</title>
<link href="../css/indexStyle.css" rel="stylesheet" type="text/css"/> <link href="../css/indexStyle.css" rel="stylesheet" type="text/css"/>
</head> </head>
......
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-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>
<title>RRHH</title>
</head>
<body>
<header>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<a class="navbar-brand" href="#">ROSHKA</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/home">Home</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Cargos
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a class="dropdown-item" href="/cargo">Agregar Cargo</a></li>
<li><a class="dropdown-item" href="/convocatoria">Agregar Convocatoria</a></li>
<li><a class="dropdown-item" href="/cargos">Listar cargos</a></li>
<li><a class="dropdown-item" href="/convocatorias">Listar convocatorias</a></li>
</ul>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Tecnologias
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a class="dropdown-item" href="/tecnologia">Agregar</a></li>
<li><a class="dropdown-item" href="/tecnologias">Listar</a></li>
</ul>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Postulantes
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a class="dropdown-item" href="/postulante">Agregar</a></li>
<li><a class="dropdown-item" href="/postulantes">Listar</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Salir</a>
</li>
</ul>
</div>
</div>
</nav>
</header>
<div class="container-xxl my-md-4 bd-layout">
<layout:block name="contents">
</layout:block>
</div>
<layout:block name="scripts">
</layout:block>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
</body>
</html>
\ No newline at end of file
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</select> </div> </select> </div>
<div > <div >
<div class=" inputs d-flex justify-content-between align-items-center experience"><span class="border px-3 p-1 add-experience" data-toggle="modal" data-target="#cargoForm"><i class="fa fa-plus"></i>&nbsp;Cargo al que postulas</span></div><br> <div style="color:blue" class=" inputs d-flex justify-content-between align-items-center experience"><span class="border px-3 p-1 add-experience" data-toggle="modal" data-target="#cargoForm"><i class="fa fa-plus"></i>&nbsp;Cargo al que postulas</span></div><br>
</div> </div>
<div class="mt-3 gap-2 d-flex justify-content-between" id="cargos"> <div class="mt-3 gap-2 d-flex justify-content-between" id="cargos">
......
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ 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">
<!DOCTYPE html> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<html> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<head> <layout:put block="contents" type="REPLACE">
<meta charset="utf-8"> <h2>${tecnologia.id == null ? "Agregar" : "Modificar"} Tecnologia</h2>
<meta name="viewport" content="width=device-width, initial-scale=1"> <div class="p-3 mb-2 bg-light text-dark border border-light">
<!-- Bootstrap CSS -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
<title>Agregar Tecnologia</title>
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<jsp:include page="header.jsp"/>
<jsp:include page="alerts.jsp"/>
<div class="container-xxl my-md-4 bd-layout">
<h2>Agregar Tecnologia</h2>
<div class="p-3 mb-2 ">
<form:form action="/tecnologia/${tecnologia.id == null ? '' : tecnologia.id}" method="post" modelAttribute="tecnologia" class="row row-cols-lg-auto g-3 align-items-center"> <form:form action="/tecnologia/${tecnologia.id == null ? '' : tecnologia.id}" method="post" modelAttribute="tecnologia" class="row row-cols-lg-auto g-3 align-items-center">
<div class="col-12"> <div class="col-12">
<form:label class="form-label visually-hidden" path="nombre">Nombre: </form:label> <form:input type="text" path="nombre" class="form-control" required="true" placeholder="Nombre de la tecnologia"/> <form:label class="form-label visually-hidden" path="nombre">Nombre: </form:label>
<form:input type="text" path="nombre" class="form-control ${ mismoNombre ? 'is-invalid' : ''}" required="true" placeholder="Nombre de la tecnologia"/>
<div id="validationServerUsernameFeedback" class="invalid-feedback">
Este nombre ya existe
</div>
</div> </div>
<div class="col-12"> <div class="col-12">
<input type="submit" value="Guardar" class="btn btn-primary"/> <input type="submit" value="Guardar" class="btn btn-primary"/>
</div> </div>
</form:form> </form:form>
</div> </div>
</div> </layout:put>
</layout:extends>
\ No newline at end of file
</body>
</html>
\ No newline at end of file
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html> <%@ taglib uri="http://kwonnam.pe.kr/jsp/template-inheritance" prefix="layout"%>
<html lang="en"> <layout:extends name="layouts/base.jsp">
<head> <layout:put block="cssDeclaracion" type="APPEND"><link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/></layout:put>
<meta charset="UTF-8"> <layout:put block="contents" type="REPLACE">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Tecnologia</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="../css/cargoStyle.css" rel="stylesheet" type="text/css"/>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
</head>
<body>
<jsp:include page="header.jsp"/>
<jsp:include page="alerts.jsp"/>
<div class="container-xxl my-md-4 bd-layout">
<h2>Lista de Tecnologias</h2> <h2>Lista de Tecnologias</h2>
<div> <div>
...@@ -50,7 +39,5 @@ ...@@ -50,7 +39,5 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </layout:put>
</layout:extends>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment