From a79341b23855fcc7c07f81c0d3a9615ee8bed549 Mon Sep 17 00:00:00 2001 From: Angel Zarate Date: Tue, 17 May 2022 14:26:59 -0400 Subject: [PATCH] arreglo profesor dao --- src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java | 44 +++++++++++--------------------------------- src/main/webapp/formulario_bootcamp.jsp | 4 ++-- src/main/webapp/index.html | 11 ----------- src/main/webapp/postulante-consulta.jsp | 14 ++------------ src/main/webapp/postulante.css | 13 ------------- 5 files changed, 15 insertions(+), 71 deletions(-) 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("

Record saved successfully!

"); -======= - if(status>0){ - //out.print("

Record saved successfully!

"); - ->>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036 out.print("
\n" + " × \n" + " Formulario Cargado! EXITOSAMENTE CARGADO\n" + "
"); -<<<<<<< HEAD - request.getRequestDispatcher("formulario.jsp").include(request, response); - } else { - if (rechazarDatos) { - out.print("
\n" + - " × \n" - + - " Formulario ya Cargado! YA EXISTE EL FORMULARIO\n" + - "
"); - request.getRequestDispatcher("formulario.jsp").include(request, response); - } else { - out.println("Error al cargar datos"); - 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 @@ 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 -=======

LISTA POSTULANTES

->>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036
@@ -76,17 +73,10 @@ Bootcamps - + 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 -- libgit2 0.26.0
-<<<<<<< HEAD - Aceptados -======= -
- - -
->>>>>>> d3a6ea52ee1614cfbff576707fd6717fb6a81036 + Aceptado