diff options
author | cecigg <caggsld@gmail.com> | 2014-09-29 14:04:44 (GMT) |
---|---|---|
committer | cecigg <caggsld@gmail.com> | 2014-09-29 14:04:44 (GMT) |
commit | 51a7a69b9f97d3e26e57b55d0a3acc27cab8e204 (patch) | |
tree | 2bf0d9ed3b6e53e93d0e119714757f99cd4fe5e3 | |
parent | 22ebd3fcc195bb2ee6023864dc55b93f2876f687 (diff) | |
parent | 0184c1d5bea2f663f5b5f3234a8264a57bb13e33 (diff) |
Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia
-rw-r--r-- | EjercitarServer/ejbModule/beans/EjercitarWSBean.java | 12 | ||||
-rw-r--r-- | EjercitarWeb/WebContent/WEB-INF/web.xml | 19 | ||||
-rw-r--r-- | EjercitarWeb/WebContent/login.jsp | 2 | ||||
-rw-r--r-- | EjercitarWeb/src/control/LogInFilter.java | 7 | ||||
-rw-r--r-- | EjercitarWeb/src/src/CargarDatosPersonalesServlet.java | 8 | ||||
-rw-r--r-- | EjercitarWeb/src/src/LogInServlet.java | 4 | ||||
-rw-r--r-- | EjercitarWeb/src/src/MenuPrincipalServlet.java | 2 |
7 files changed, 38 insertions, 16 deletions
diff --git a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java index 74b6d60..c6491e2 100644 --- a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java +++ b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java @@ -352,23 +352,23 @@ public class EjercitarWSBean implements EjercitarWSRemote { //obtener cantidad de ejercicios maximos a resolver
Integer cantMaxEjercicio = sesion.getTarea().getCantidadEjercicioParada();
- System.out.println(cantMaxEjercicio + " canti max");
+ System.out.println(cantMaxEjercicio + " ca max");
//persistir la cantidad de ejercicios resueltos
sesion.setCantidadEjerciciosResueltos(cantResuelto);
em.persist(sesion);
-
- //compara el maximo con la cantidad actual resuelta.
+ return "ccuuc";
+ /*/compara el maximo con la cantidad actual resuelta.
if (cantResuelto.compareTo(cantMaxEjercicio) == 0) {
System.out.println("SI");
- return "SI";
+ return "SiiiiiiiiiiiiI";
} else{
System.out.println("NO");
- return "NO";
+ return "NiiiiiiiiiiiiiiiiiiiiiiiiiiiiiO";
}
//return "cualquier otra cosa";
-
+ */
}
@WebMethod
diff --git a/EjercitarWeb/WebContent/WEB-INF/web.xml b/EjercitarWeb/WebContent/WEB-INF/web.xml index 1453125..7a7344a 100644 --- a/EjercitarWeb/WebContent/WEB-INF/web.xml +++ b/EjercitarWeb/WebContent/WEB-INF/web.xml @@ -1,6 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<display-name>EjercitarWeb</display-name>
+ <filter>
+ <filter-name>LogInFilter</filter-name>
+ <filter-class>control.LogInFilter</filter-class>
+</filter>
+<filter-mapping>
+ <filter-name>LogInFilter</filter-name>
+ <url-pattern>/MenuPrincipalServlet</url-pattern>
+ <url-pattern>/NuevaAsignaturaServlet</url-pattern>
+ <url-pattern>/VistaAsignaturaServlet</url-pattern>
+ <url-pattern>/EditarConceptoServlet</url-pattern>
+ <url-pattern>/IniciarCursoServlet</url-pattern>
+ <url-pattern>/EditarTemaServlet</url-pattern>
+ <url-pattern>/NuevaTareaServlet</url-pattern>
+ <url-pattern>/NuevoConceptoServlet</url-pattern>
+ <url-pattern>/VerResultadosServlet</url-pattern>
+</filter-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
@@ -9,6 +26,8 @@ <welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
+
+
<servlet>
<servlet-name>NuevoEjercicioServlet</servlet-name>
<servlet-class>src.NuevoEjercicioServlet</servlet-class>
diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp index ea3d7b3..ea908a1 100644 --- a/EjercitarWeb/WebContent/login.jsp +++ b/EjercitarWeb/WebContent/login.jsp @@ -41,7 +41,7 @@ <div class="alert alert-danger" id="e-msg-error-cnt"> <a class="close" data-dismiss="alert" href="#">x</a><div id="e-msg-error"><%= request.getAttribute("error") %></div> </div> - <form class="e-form" method="post" role="form"> + <form class="e-form" action="LogInServlet" method="post" role="form"> <div class="input-group"> <span class="input-group-addon"><i class="e-icon-user"></i></span> <input type="text" name="usuario" class="form-control" placeholder="Usuario" required autofocus/> diff --git a/EjercitarWeb/src/control/LogInFilter.java b/EjercitarWeb/src/control/LogInFilter.java index 99b55cb..c444269 100644 --- a/EjercitarWeb/src/control/LogInFilter.java +++ b/EjercitarWeb/src/control/LogInFilter.java @@ -19,6 +19,8 @@ public class LogInFilter implements Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { //Obtenemos un HttpServletRequest con un casting HttpServletRequest requestMod = ((HttpServletRequest) request); + + if (isPermited(requestMod) == false){ requestMod.getSession().setAttribute("requestedPage", requestMod.getRequestURL().toString()); RequestDispatcher rd = request.getRequestDispatcher("/login.jsp"); @@ -30,8 +32,9 @@ public class LogInFilter implements Filter { } private boolean isPermited(HttpServletRequest request) { - if (request.getSession().getAttribute("usuario") == null) { - return false; + if (request.getSession().getAttribute("profesor") == null) { + return false; + } else{ return true; } diff --git a/EjercitarWeb/src/src/CargarDatosPersonalesServlet.java b/EjercitarWeb/src/src/CargarDatosPersonalesServlet.java index f598b4e..32c1c16 100644 --- a/EjercitarWeb/src/src/CargarDatosPersonalesServlet.java +++ b/EjercitarWeb/src/src/CargarDatosPersonalesServlet.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.joda.time.DateTime;
+//import org.joda.time.DateTime;
//import org.joda.time.Period;
import model.Alumno;
@@ -58,8 +58,8 @@ public class CargarDatosPersonalesServlet extends HttpServlet { DateFormat df = DateFormat.getDateInstance(DateFormat.FULL);
String fecha = df.format(alumno.getFechaNacimiento());
- DateTime d1 = new DateTime(alumno.getFechaNacimiento());
- DateTime d2 = new DateTime(new Date());
+ //DateTime d1 = new DateTime(alumno.getFechaNacimiento());
+ //DateTime d2 = new DateTime(new Date());
// Period p = new Period(new DateTime(alumno.getFechaNacimiento()), new DateTime(new Date()));//new Period(alumno.getFechaNacimiento(), new Date());
@@ -67,7 +67,7 @@ public class CargarDatosPersonalesServlet extends HttpServlet { try {
out.printf("<h1>" + alumno.getNombre() + " " + alumno.getApellido() + "</h1>");
out.printf("<p><legend> Naciķ el " + fecha + "</legend></p>");
- out.printf("<p><legend> Tiene " + (d2.getYear() - d1.getYear()) + " aņos</legend></p>");
+ //out.printf("<p><legend> Tiene " + (d2.getYear() - d1.getYear()) + " aņos</legend></p>");
} finally {
out.close();
}
diff --git a/EjercitarWeb/src/src/LogInServlet.java b/EjercitarWeb/src/src/LogInServlet.java index 851acb1..4ac0c4f 100644 --- a/EjercitarWeb/src/src/LogInServlet.java +++ b/EjercitarWeb/src/src/LogInServlet.java @@ -58,8 +58,8 @@ public class LogInServlet extends HttpServlet { if (profesor != null) { request.getSession().setAttribute("auth", true); request.getSession().setAttribute("profesor", profesor); - - response.sendRedirect("/EjercitarWeb/MenuPrincipalServlet"); + System.out.println(request.getSession().getAttribute("profesor")); + response.sendRedirect("/EjercitarWeb/"); }else{ response.setContentType("text/html;charset=UTF-8"); System.out.println("fail"); diff --git a/EjercitarWeb/src/src/MenuPrincipalServlet.java b/EjercitarWeb/src/src/MenuPrincipalServlet.java index 785e47b..eb3d4f9 100644 --- a/EjercitarWeb/src/src/MenuPrincipalServlet.java +++ b/EjercitarWeb/src/src/MenuPrincipalServlet.java @@ -18,7 +18,7 @@ import model.Profesor; /** * Servlet implementation class MenuPrincipalServlet */ -@WebServlet("/MenuPrincipalServlet") +@WebServlet(name = "MenuPrincipalServlet", urlPatterns = "") public class MenuPrincipalServlet extends HttpServlet { private static final long serialVersionUID = 1L; @PersistenceContext |