diff --git a/UyTube_web/src/java/com/uytube/AltaVideo.java b/UyTube_web/src/java/com/uytube/AltaVideo.java
index 1cf3efbcab3a7fb10d181b4f15ee4795e9a9617f..909983397d6042a2b3f88e7bec3a1c76c6d53466 100644
--- a/UyTube_web/src/java/com/uytube/AltaVideo.java
+++ b/UyTube_web/src/java/com/uytube/AltaVideo.java
@@ -5,8 +5,24 @@
*/
package com.uytube;
+import Logica.DataType.DtCanal;
+import Logica.DataType.DtUsuario;
+import Logica.DataType.DtVideo;
+import Logica.Enumerados.Privacidad;
+import Logica.Fabrica;
+import Logica.Interfaces.IUsuario;
+import static com.sun.org.apache.xalan.internal.lib.ExsltDatetime.time;
import java.io.IOException;
import java.io.PrintWriter;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.sql.Time;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.scene.input.DataFormat;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -18,7 +34,6 @@ import javax.servlet.http.HttpServletResponse;
*
* @author administrador
*/
-
public class AltaVideo extends HttpServlet {
/**
@@ -38,7 +53,7 @@ public class AltaVideo extends HttpServlet {
out.println("<!DOCTYPE html>");
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet AltaVideo</title>");
+ out.println("<title>Servlet AltaVideo</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet AltaVideo at " + request.getContextPath() + "</h1>");
@@ -59,9 +74,23 @@ public class AltaVideo extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- RequestDispatcher rd; //objeto para despachar
- rd = request.getRequestDispatcher("/AltaVideo.jsp");
- rd.forward(request, response);
+ try {
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ boolean sesionIniciada = sys.sesionIniciada();
+ ArrayList<String> cate = sys.listarCategorias();
+
+ request.setAttribute("Categorias", cate);
+ request.setAttribute("sesionIniciada", sesionIniciada);
+
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/AltaVideo.jsp");
+ rd.forward(request, response);
+ } catch (Exception e) {
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/");
+ rd.forward(request, response);
+ }
+
}
/**
@@ -75,27 +104,51 @@ public class AltaVideo extends HttpServlet {
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- //Se guardan los datos del usuario en la base de datos
- // Y se redigire por ahora al JSP presentacion
-
-
- String pNombre = request.getParameter("nombre");
- String pDuracion = request.getParameter("duracion");
- String pUrl = request.getParameter("url");
- String pFecha = request.getParameter("fecha");
- String pDescripcion = request.getParameter("descripcion");
- String pCategoria = request.getParameter("categoria");
-
- System.out.println("nombre: "+pNombre);
- System.out.println("duracion: "+pDuracion);
- System.out.println("url: "+pUrl);
- System.out.println("fecha: "+pFecha);
- System.out.println("descripcion: "+pDescripcion);
- System.out.println("categoria: "+pCategoria);
-
- RequestDispatcher rd; //objeto para despachar
- rd = request.getRequestDispatcher("/Presentacion.jsp");
- rd.forward(request, response);
+
+ try {
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ String pNombre = request.getParameter("nombre");
+ String pDuracion = request.getParameter("duracion");
+ String pUrl = request.getParameter("url");
+ String pFecha = request.getParameter("fecha");
+ String pDescripcion = request.getParameter("descripcion");
+ String pPrivacidad = request.getParameter("privacidad");
+ String pCategoria = request.getParameter("categoria");
+
+ Privacidad Priv = Privacidad.PRIVADO;
+ if (pPrivacidad != null && pPrivacidad.equals("PUBLICO")) {
+ Priv = Privacidad.PUBLICO;
+ }
+ //============ Casteo de string a date =================================
+ SimpleDateFormat formato = new SimpleDateFormat("yyyy-mm-dd");
+ Date fechaDate = null;
+ try {
+ fechaDate = formato.parse(pFecha);
+ } catch (ParseException ex) {
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/");
+ rd.forward(request, response);
+ }
+ java.sql.Date data = new java.sql.Date(fechaDate.getTime());
+ //======================================================================
+ //============= Casteo de string a Time ================================
+ Time duracion = java.sql.Time.valueOf(pDuracion);
+
+ //======================================================================
+ DtVideo vid = new DtVideo(0, pNombre, pDescripcion,duracion, data, pUrl, Priv, pCategoria, 0, 0);
+
+ sys.altaVideo(vid);
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/IniciarSesion.jsp");
+ rd.forward(request, response);
+
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/Presentacion.jsp");
+ rd.forward(request, response);
+ }
+
}
/**
diff --git a/UyTube_web/src/java/com/uytube/ModificarUsuario.java b/UyTube_web/src/java/com/uytube/ModificarUsuario.java
index b22d85361fc20362c23701131afecf95e131febd..f241330ca0de43c3a3e0ad79eba17a2b10b1d445 100644
--- a/UyTube_web/src/java/com/uytube/ModificarUsuario.java
+++ b/UyTube_web/src/java/com/uytube/ModificarUsuario.java
@@ -127,6 +127,7 @@ public class ModificarUsuario extends HttpServlet {
rd = request.getRequestDispatcher("/");
rd.forward(request, response);
}
+
java.sql.Date data = new java.sql.Date(fechaDate.getTime());
DtUsuario Usu = new DtUsuario(pNickname, pPassword, pNombre, pApellido, pEmail, data, pImaguen, 0);
diff --git a/UyTube_web/web/AltaVideo.jsp b/UyTube_web/web/AltaVideo.jsp
index be67124298cb0a935c76512f55c8b96097fa217a..3f04f8f3c5d874358564b7c65088d6efd2c66dfa 100644
--- a/UyTube_web/web/AltaVideo.jsp
+++ b/UyTube_web/web/AltaVideo.jsp
@@ -3,10 +3,16 @@
Created on : 06/10/2019, 06:14:18 PM
Author : administrador
--%>
-
+<%@page import="java.util.ArrayList"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html lang="es">
+
+ <%
+ ArrayList<String> Categorias = (ArrayList) request.getAttribute("Categorias");
+ boolean sesionIniciada = (boolean) request.getAttribute("sesionIniciada");
+ %>
+
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -24,7 +30,17 @@
</head>
<body>
+ <%
+ if (sesionIniciada) {
+ %>
<%@ include file='include/header-usuario.html' %>
+ <%
+ } else {
+ %>
+ <%@ include file='include/header-visitante.html' %>
+ <%
+ }
+ %>
<div class="container-fluid">
<div class="row">
<div class="col-12">
@@ -36,8 +52,18 @@
<div class="row">
<div class="col-12">
<section class="principal">
-
+
+ <%
+ if (sesionIniciada) {
+ %>
<%@ include file='include/menu-usuario.html' %>
+ <%
+ } else {
+ %>
+ <%@ include file='include/menu-visitante.html' %>
+ <%
+ }
+ %>
<div class="contenido">
<section class="contenido-flexible">
@@ -51,7 +77,7 @@
</div>
<div class="form-group col-md-2">
<label for="inputDuracion">Duración</label>
- <input type="time" class="form-control" name="duracion" id="inputDuracion" placeholder="Duración">
+ <input type="time" step='1' class="form-control" name="duracion" id="inputDuracion" placeholder="Duración">
</div>
</div>
<div class="form-group row">
@@ -69,15 +95,33 @@
<div class="form-group row">
<div class="form-group col-md-4">
<label for="inputFecha">Fecha</label>
- <input type="datetime-local" name="fecha" class="form-control" id="inputFecha">
+ <input type="date" name="fecha" class="form-control" id="inputFecha">
</div>
- <div class="form-group col-md-8">
+
+ <div class="form-group col-md-4">
+
+ <label for="cc-name">Privacidad del video</label>
+ <div class="custom-control custom-radio">
+ <input id="publico" name="privacidad" type="radio" class="custom-control-input" >
+ <label class="custom-control-label" for="publico">Publico</label>
+ </div>
+ <div class="custom-control custom-radio">
+ <input id="privado" name="privacidad" name="foto" type="radio" class="custom-control-input" checked>
+ <label class="custom-control-label" for="privado">Privado</label>
+ </div>
+ </div>
+
+ <div class="form-group col-md-4">
<label for="inputCategoria">CategorÃa</label>
<select id="inputCategoria" name="categoria" class="form-control">
- <option selected>Undefain</option>
- <option>Musica</option>
- <option>Deportes</option>
- <option>Informática</option>
+ <%
+ for (String l : Categorias) {
+ %>
+ <option> <%= l%> </option>
+ <%
+ }
+ %>
+
</select>
</div>
</div>
@@ -87,7 +131,6 @@
<!-- Fin del contenido central -->
</section>
</div>
-
</section>
</div>
</div>
@@ -95,7 +138,7 @@
<%@ include file='include/widgets.html' %>
<%@ include file='include/footer.html' %>
-
+
<script src="js/jquery-3.4.1.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/bootstrap.min.js"></script>
diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp
index 53061ee1019e598357ea7ace81914c54e13673f8..54f30d1b540b54331e3036fa51d2a143c20bcd68 100644
--- a/UyTube_web/web/ConsultaUsuario.jsp
+++ b/UyTube_web/web/ConsultaUsuario.jsp
@@ -127,7 +127,7 @@
<%
if (sesionIniciada && propietario) {
%>
- <a href="/usuario-modificar?id=<%= usuario.getNickname()%>">
+ <a href="usuario-modificar?id=<%= usuario.getNickname()%>">
<button class="btn btn-primary" id="btnBuscar" type="submit">
Modificar
</button>
diff --git a/UyTube_web/web/ListarUsuario.jsp b/UyTube_web/web/ListarUsuario.jsp
deleted file mode 100644
index 9321dd5dfc9b755b28410f5347d7d2dcc65a0e4e..0000000000000000000000000000000000000000
--- a/UyTube_web/web/ListarUsuario.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Document : ListarUsuario
- Created on : 09/10/2019, 07:31:07 PM
- Author : administrador
---%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JSP Page</title>
- </head>
- <body>
- <h1>ListarUsuario</h1>
- </body>
-</html>