Skip to content

P
ProyectoFinal-Bootcamp
Commit a79341b2 by Angel Zarate
Options

arreglo profesor dao

parent 0b41fb7d
Showing with 15 additions and 71 deletions
src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java
...@@ -107,64 +107,42 @@ public class SaveServlet extends HttpServlet { ...@@ -107,64 +107,42 @@ public class SaveServlet extends HttpServlet {
} }
} }
} }
<<<<<<< HEAD
if (status > 0) { if (status > 0) {
// out.print("<p>Record saved successfully!</p>"); // out.print("<p>Record saved successfully!</p>");
=======
if(status>0){
//out.print("<p>Record saved successfully!</p>");
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
out.print(" <div class=\"alert\">\n" + out.print(" <div class=\"alert\">\n" +
" <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n" " <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n"
+ +
" <strong>Formulario Cargado!</strong> EXITOSAMENTE CARGADO\n" + " <strong>Formulario Cargado!</strong> EXITOSAMENTE CARGADO\n" +
"</div>"); "</div>");
<<<<<<< HEAD
request.getRequestDispatcher("formulario.jsp").include(request, response);
} else {
if (rechazarDatos) {
out.print(" <div class=\"alert info\">\n" +
" <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n"
+
" <strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" +
"</div>");
request.getRequestDispatcher("formulario.jsp").include(request, response);
} else {
out.println("Error al cargar datos");
out.print(" <div class=\"alert info error\">\n" +
" <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n"
+
" <strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" +
=======
request.setAttribute("bootcamp", bootcampActual); request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp"); RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response); rd.include(request, response);
//RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp"); // RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
//rd.include(request, response); // rd.include(request, response);
}else{ } else {
if (rechazarDatos){ if (rechazarDatos) {
out.print("<div class='alert info''>"); out.print("<div class='alert info''>");
out.print("<span class='closebtn'' onclick='this.parentElement.style.display='none';'>&times;</span>"); out.print(
"<span class='closebtn'' onclick='this.parentElement.style.display='none';'>&times;</span>");
out.print("<strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO"); out.print("<strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO");
out.print("</div>"); out.print("</div>");
//request.getRequestDispatcher("formulario.jsp").include(request, response); // request.getRequestDispatcher("formulario.jsp").include(request, response);
request.setAttribute("bootcamp", bootcampActual); request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp"); RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response); rd.include(request, response);
}else { } else {
out.println("Error al cargar datos"); out.println("Error al cargar datos");
out.print("<div class='alert info error'>" + out.print("<div class='alert info error'>" +
"<span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n" + "<span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n"
+
"<strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" + "<strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" +
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
"</div>"); "</div>");
request.setAttribute("bootcamp", bootcampActual); request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp"); RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response); rd.include(request, response);
//request.getRequestDispatcher("formulario.jsp").include(request, response); // request.getRequestDispatcher("formulario.jsp").include(request, response);
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
......
src/main/webapp/formulario_bootcamp.jsp
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
Lenguaje len = null; Lenguaje len = null;
ProfesorDao profeDao = new ProfesorDao(); ProfesorDao profeDao = new ProfesorDao();
List<Profesor> listProfesor = profeDao.listar(); List<Profesor> listProfesor = profeDao.listarProfesor();
Iterator<Profesor> iterProfe = listProfesor.iterator(); Iterator<Profesor> iterProfe = listProfesor.iterator();
Profesor profe = null; Profesor profe = null;
%> %>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
Lenguaje len2 = null; Lenguaje len2 = null;
ProfesorDao profeDao2 = new ProfesorDao(); ProfesorDao profeDao2 = new ProfesorDao();
List<Profesor> listProfesor2 = profeDao2.listar(); List<Profesor> listProfesor2 = profeDao2.listarProfesor();
Iterator<Profesor> iterProfe2 = listProfesor2.iterator(); Iterator<Profesor> iterProfe2 = listProfesor2.iterator();
Profesor profe2 = null; Profesor profe2 = null;
Bootcamp bootcampToEdit = (Bootcamp)request.getAttribute("Bootcamp"); Bootcamp bootcampToEdit = (Bootcamp)request.getAttribute("Bootcamp");
......
src/main/webapp/index.html
...@@ -27,17 +27,6 @@ ...@@ -27,17 +27,6 @@
<ul> <ul>
<li class="link-menu"><a href="">Home</a></li> <li class="link-menu"><a href="">Home</a></li>
<li class="link-menu"><a href="bootcamp.jsp">Postulate</a></li> <li class="link-menu"><a href="bootcamp.jsp">Postulate</a></li>
<<<<<<< HEAD
<li class="link-menu"><a href="formulario_bootcamp.jsp">Crear bootcamp</a></li>
<li class="link-menu"><a href="manage_postulantes.jsp">Manage Postulantes(perdon angel)</a></li>
<li class="link-menu"><a href="login.jsp">Login</a>
<li class="link-menu"><a href="protected">Recurso Protegido</a></li>
</li>
<li class="link-menu"><a href="formulario_lenguaje.jsp">Crear lenguaje</a>
</li>
<li class="link-menu"><a href="formulario_profesor.jsp">Crear profesor</a>
=======
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
</li> </li>
</ul> </ul>
......
src/main/webapp/postulante-consulta.jsp
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
</head> </head>
<body> <body>
<<<<<<< HEAD
<div class="logo"> <div class="logo">
<a href="./index.html"> <img class="logoi" src="imagenes/logo-roshka.svg" alt="" /> </a> <a href="./index.html"> <img class="logoi" src="imagenes/logo-roshka.svg" alt="" /> </a>
<!-- logo con link --> <!-- logo con link -->
...@@ -48,14 +47,12 @@ ...@@ -48,14 +47,12 @@
</div> </div>
=======
<div> <div>
<h1>LISTA POSTULANTES</h1> <h1>LISTA POSTULANTES</h1>
<form action="filtros-postulante" > <form action="filtros-postulante" >
<input type="search" name="nombreBuscar" <input type="search" name="nombreBuscar"
placeholder="Buscar por nombre"> placeholder="Buscar por nombre">
<button type="submit">Buscar</button> <button type="submit">Buscar</button>
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
</form> </form>
<table> <table>
...@@ -76,17 +73,10 @@ ...@@ -76,17 +73,10 @@
Bootcamps Bootcamps
</th> </th>
<th> <th>
<<<<<<< HEAD Aceptado
Aceptados
=======
<form action="filtros-posjtulante" method="post">
<input type="hidden" name="nombre" value="aceptado">
<button type="submit">Aceptado</button>
</form>
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
</th> </th>
</tr> </tr>s
<tbody class="tcuerpo"> <tbody class="tcuerpo">
<c:forEach var="postulante" items="${postulantes}" varStatus="myIndex"> <c:forEach var="postulante" items="${postulantes}" varStatus="myIndex">
<tr> <tr>
......
src/main/webapp/postulante.css
<<<<<<< HEAD
body{ body{
background-image: url(imagenes/descarga.svg); background-image: url(imagenes/descarga.svg);
...@@ -81,15 +80,3 @@ th { border: 1px solid black; height: 30px; ...@@ -81,15 +80,3 @@ th { border: 1px solid black; height: 30px;
} }
button:hover{ button:hover{
color: yellow;} color: yellow;}
=======
@import 'https://fonts.googleapis.com/css?family=Open+Sans|Quicksand:400,700';
body{
background-image: url(imagenes/descarga.svg);
height: 100%;
font-family: 'Quicksand', sans-serif;
color: white;
webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
h1{ font-size: 40px
>>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
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