From d034f29199cffeea5698a01c5403dc667896279c Mon Sep 17 00:00:00 2001
From: Julio Arrieta <julioarrieta23@gmail.com>
Date: Thu, 10 Oct 2019 14:49:20 -0300
Subject: [PATCH] Se conecta el servlet Buscar con el jsp Buscar. Tambien se
 pego un include con un form invisible para los filtos en todas las paginas
 que hay hechas.

---
 UyTube_web/src/java/com/uytube/Buscar.java   | 15 ++++++++++-
 UyTube_web/web/AltaUsuario.jsp               |  3 ++-
 UyTube_web/web/AltaVideo.jsp                 |  1 +
 UyTube_web/web/Buscar.jsp                    | 27 +-------------------
 UyTube_web/web/ConsultaUsuario.jsp           |  3 ++-
 UyTube_web/web/IniciarSesion.jsp             |  3 ++-
 UyTube_web/web/Presentacion.jsp              |  2 +-
 UyTube_web/web/include/header-usuario.html   |  2 +-
 UyTube_web/web/include/header-visitante.html |  2 +-
 UyTube_web/web/index.jsp                     |  2 +-
 10 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/UyTube_web/src/java/com/uytube/Buscar.java b/UyTube_web/src/java/com/uytube/Buscar.java
index 341afca..2f16769 100644
--- a/UyTube_web/src/java/com/uytube/Buscar.java
+++ b/UyTube_web/src/java/com/uytube/Buscar.java
@@ -7,6 +7,7 @@ package com.uytube;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -56,7 +57,19 @@ public class Buscar extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        //Se guardan los datos del usuario en la base de datos
+        // Y se redigire por ahora al JSP presentacion
+        String texto = request.getParameter("texto");
+        String filtro = request.getParameter("filtro");
+        String orden = request.getParameter("orden");
+        
+        System.out.println("texto: "+ filtro);
+        System.out.println("filtro: "+ filtro);
+        System.out.println("orden: "+ orden);
+        
+        RequestDispatcher rd; //objeto para despachar
+        rd = request.getRequestDispatcher("/Buscar.jsp");
+        rd.forward(request, response);
     }
 
     /**
diff --git a/UyTube_web/web/AltaUsuario.jsp b/UyTube_web/web/AltaUsuario.jsp
index b016e84..d2cda35 100644
--- a/UyTube_web/web/AltaUsuario.jsp
+++ b/UyTube_web/web/AltaUsuario.jsp
@@ -44,7 +44,8 @@
                     <section class="principal">						
                         <%@ include file='include/menu-visitante.html' %>
                         <div class="contenido">
-                            <section class="contenido-flexible">							
+                            <section class="contenido-flexible">
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <div class="principal d-flex flex-row justify-content-center">
                                     <section class="d-flex  flex-lg-row flex-wrap justify-content-lg-between">					
                                         <form class="form-signin" action="/uytube/usuario-agregar" method="post">
diff --git a/UyTube_web/web/AltaVideo.jsp b/UyTube_web/web/AltaVideo.jsp
index be67124..f80f8be 100644
--- a/UyTube_web/web/AltaVideo.jsp
+++ b/UyTube_web/web/AltaVideo.jsp
@@ -42,6 +42,7 @@
                         <div class="contenido">
                             <section class="contenido-flexible">
                                 <!--================== Aca va el contenido central para agregar ========================== -->					
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <h3>Alta de video</h3>			
                                 <form class="form-alta-video" action="/uytube/video-agregar" method="post" >
                                     <div class="form-group row">
diff --git a/UyTube_web/web/Buscar.jsp b/UyTube_web/web/Buscar.jsp
index 8203fbf..d3209df 100644
--- a/UyTube_web/web/Buscar.jsp
+++ b/UyTube_web/web/Buscar.jsp
@@ -52,32 +52,7 @@
 
                                     <!-- BOTONES DESPLEGABLES-->
 
-                                    <form>
-                                        
-                                        <div class="form-row">
-                                            <div class="form-group col-md-3">
-                                            <label for="inputState">Filtrar por</label>
-                                            <select id="inputState" class="form-control" name="filtro" form="formBuscar">
-                                                <option selected>TODO</option>
-                                                <option>CANALES</option>
-                                                <option>VIDEOS</option>
-                                                <option>LISTAS DE REPRODUCCION</option>
-                                            </select>
-                                            </div>
-                                          <div class="form-group col-md-3">
-                                            <label for="inputState">Ordenar por</label>
-                                            <select id="inputState" class="form-control" name="orden" form="formBuscar" >
-                                              <option selected>ALAFABETICO</option>
-                                              <option>FECHA</option>
-                                            </select>
-                                          </div>
-                                          <div class="form-group col-md-6">
-                                            
-                                          </div>
-                                        </div>
-                                        
-                                        
-                                      </form>
+                                    <%@ include file='include/filtro-visible.html' %>
 
                                     <!--FIN DE LOS BOTONES-->
 
diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp
index 4ff599d..4e3f914 100644
--- a/UyTube_web/web/ConsultaUsuario.jsp
+++ b/UyTube_web/web/ConsultaUsuario.jsp
@@ -45,7 +45,8 @@
                         <%@ include file='include/menu-usuario.html' %>
 
                         <div class="contenido">
-                            <section class="contenido-flexible">								
+                            <section class="contenido-flexible">
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <div class="container">
 
 
diff --git a/UyTube_web/web/IniciarSesion.jsp b/UyTube_web/web/IniciarSesion.jsp
index 1b3af1e..cac8913 100644
--- a/UyTube_web/web/IniciarSesion.jsp
+++ b/UyTube_web/web/IniciarSesion.jsp
@@ -45,7 +45,8 @@
                         <%@ include file='include/menu-visitante.html' %>
 
                         <div class="contenido">
-                            <section class="contenido-flexible">									
+                            <section class="contenido-flexible">
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <div class="principal d-flex flex-row justify-content-center">
                                     <section class="d-flex  flex-lg-row flex-wrap justify-content-lg-between">	
                                         <form class="form-signin" action="/uytube/inicio-sesion" method="post">
diff --git a/UyTube_web/web/Presentacion.jsp b/UyTube_web/web/Presentacion.jsp
index 0962041..4e9859d 100644
--- a/UyTube_web/web/Presentacion.jsp
+++ b/UyTube_web/web/Presentacion.jsp
@@ -41,7 +41,7 @@
                             <section class="contenido-flexible">
                                 <!--================== Aca va el contenido central para agregar ========================== -->					
                                 <h3>Lo nuevo</h3>
-
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <div class="card" >
                                     <a href="/uytube/video-consulta&id=1234">
                                         <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
diff --git a/UyTube_web/web/include/header-usuario.html b/UyTube_web/web/include/header-usuario.html
index f556149..3b533d7 100644
--- a/UyTube_web/web/include/header-usuario.html
+++ b/UyTube_web/web/include/header-usuario.html
@@ -16,7 +16,7 @@ and open the template in the editor.
                     </div>	
                     <div class="navbar-dark item-header item-header2">					  
                         <div id="navbarSupportedContent">		
-                            <form class="form-inline my-2 my-lg-0 formBuscar" id="formBuscar" method="get">
+                            <form class="form-inline my-2 my-lg-0 formBuscar" action="/uytube/buscar" id="formBuscar" method="get">
                                 <input class=" mr-sm-2" name="texto" type="search" placeholder="Search" aria-label="Search">
                                 <button class="btn btn-primary" id="btnBuscar" type="submit">Buscar</button>
                             </form>
diff --git a/UyTube_web/web/include/header-visitante.html b/UyTube_web/web/include/header-visitante.html
index 3ca4e50..5a94a83 100644
--- a/UyTube_web/web/include/header-visitante.html
+++ b/UyTube_web/web/include/header-visitante.html
@@ -14,7 +14,7 @@ Header para el visitante
                     </div>	
                     <div class="navbar-dark item-header item-header2">					  
                         <div id="navbarSupportedContent">		
-                            <form class="form-inline my-2 my-lg-0 formBuscar" id="formBuscar" method="get">
+                            <form class="form-inline my-2 my-lg-0 formBuscar" action="/uytube/buscar" id="formBuscar" method="get">
                                 <input class=" mr-sm-2" name="texto" type="search" placeholder="Search" aria-label="Search">
                                 <button class="btn btn-primary" id="btnBuscar" type="submit">Buscar</button>
                             </form>
diff --git a/UyTube_web/web/index.jsp b/UyTube_web/web/index.jsp
index f446353..23ed5dd 100644
--- a/UyTube_web/web/index.jsp
+++ b/UyTube_web/web/index.jsp
@@ -44,7 +44,7 @@
                             <section class="contenido-flexible">
                                 <!--================== Aca va el contenido central para agregar ========================== -->					
                                 <h3>Lo nuevo</h3>
-
+                                <%@ include file='include/filtro-invisible.html' %>
                                 <div class="card" >
                                     <a href="/uytube/video-consulta&id=1234">
                                         <img src="https://i.ytimg.com/vi/MiiK2JB6FHo/hqdefault.jpg" class="card-img-top" alt="Nombre del video">
-- 
GitLab