diff --git a/src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java b/src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java
index e9b9b49..0500e4e 100644
--- a/src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java
+++ b/src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java
@@ -107,64 +107,42 @@ public class SaveServlet extends HttpServlet {
}
}
}
-<<<<<<< HEAD
if (status > 0) {
// out.print("
\n" +
- "
× \n"
- +
- "
Formulario ya Cargado! YA EXISTE EL FORMULARIO\n" +
-=======
request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response);
- //RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
- //rd.include(request, response);
- }else{
- if (rechazarDatos){
+ // RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
+ // rd.include(request, response);
+ } else {
+ if (rechazarDatos) {
out.print("
");
- out.print("×");
+ out.print(
+ "×");
out.print("Formulario ya Cargado! YA EXISTE EL FORMULARIO");
out.print("
");
- //request.getRequestDispatcher("formulario.jsp").include(request, response);
+ // request.getRequestDispatcher("formulario.jsp").include(request, response);
request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response);
- }else {
+ } else {
out.println("Error al cargar datos");
out.print("
" +
- "× \n" +
+ "× \n"
+ +
"Formulario ya Cargado! YA EXISTE EL FORMULARIO\n" +
->>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
"
");
request.setAttribute("bootcamp", bootcampActual);
RequestDispatcher rd = request.getRequestDispatcher("formulario.jsp");
rd.include(request, response);
- //request.getRequestDispatcher("formulario.jsp").include(request, response);
+ // request.getRequestDispatcher("formulario.jsp").include(request, response);
}
}
} catch (Exception ex) {
diff --git a/src/main/webapp/formulario_bootcamp.jsp b/src/main/webapp/formulario_bootcamp.jsp
index f64cdcf..5c61b0b 100644
--- a/src/main/webapp/formulario_bootcamp.jsp
+++ b/src/main/webapp/formulario_bootcamp.jsp
@@ -24,7 +24,7 @@
Lenguaje len = null;
ProfesorDao profeDao = new ProfesorDao();
- List
listProfesor = profeDao.listar();
+ List listProfesor = profeDao.listarProfesor();
Iterator iterProfe = listProfesor.iterator();
Profesor profe = null;
%>
@@ -130,7 +130,7 @@
Lenguaje len2 = null;
ProfesorDao profeDao2 = new ProfesorDao();
- List listProfesor2 = profeDao2.listar();
+ List listProfesor2 = profeDao2.listarProfesor();
Iterator iterProfe2 = listProfesor2.iterator();
Profesor profe2 = null;
Bootcamp bootcampToEdit = (Bootcamp)request.getAttribute("Bootcamp");
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 8ee6192..256cef0 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -27,17 +27,6 @@
-<<<<<<< HEAD
-
-
-
-
-
-
diff --git a/src/main/webapp/postulante-consulta.jsp b/src/main/webapp/postulante-consulta.jsp
index 535e121..bdebcb0 100644
--- a/src/main/webapp/postulante-consulta.jsp
+++ b/src/main/webapp/postulante-consulta.jsp
@@ -14,7 +14,6 @@
-<<<<<<< HEAD
@@ -48,14 +47,12 @@
-=======
LISTA POSTULANTES
@@ -76,17 +73,10 @@
Bootcamps
-<<<<<<< HEAD
- Aceptados
-=======
-
->>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
+ Aceptado
|
-
+ s
diff --git a/src/main/webapp/postulante.css b/src/main/webapp/postulante.css
index 7ebecd5..5ae626b 100644
--- a/src/main/webapp/postulante.css
+++ b/src/main/webapp/postulante.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
body{
background-image: url(imagenes/descarga.svg);
@@ -81,15 +80,3 @@ th { border: 1px solid black; height: 30px;
}
button:hover{
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