Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarWeb/src/src/MenuPrincipalServlet.java
diff options
context:
space:
mode:
authorsreyes <sreyes@dataworks.com.py>2014-12-07 13:34:38 (GMT)
committer sreyes <sreyes@dataworks.com.py>2014-12-07 13:34:38 (GMT)
commitea0d23a9057a8d9822d4debba9aa60b32a370e26 (patch)
tree35c37655a25581ce630011c05841cb81fd83bec5 /EjercitarWeb/src/src/MenuPrincipalServlet.java
parent516af5bac6c6574a4db5404610ba44c34cea08f1 (diff)
parent532ccec9fa6dbe02738ef7fbaaec1dfcac001f3e (diff)
Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey
Diffstat (limited to 'EjercitarWeb/src/src/MenuPrincipalServlet.java')
-rw-r--r--EjercitarWeb/src/src/MenuPrincipalServlet.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/EjercitarWeb/src/src/MenuPrincipalServlet.java b/EjercitarWeb/src/src/MenuPrincipalServlet.java
index 2bee6fd..ade744a 100644
--- a/EjercitarWeb/src/src/MenuPrincipalServlet.java
+++ b/EjercitarWeb/src/src/MenuPrincipalServlet.java
@@ -15,7 +15,6 @@ import javax.servlet.http.HttpServletResponse;
import model.Asignatura;
import model.Profesor;
-import beans.SimulacionBeanRemote;
/**
* Servlet implementation class MenuPrincipalServlet
@@ -28,8 +27,7 @@ public class MenuPrincipalServlet extends HttpServlet {
/**
* @see HttpServlet#HttpServlet()
*/
- @EJB
- SimulacionBeanRemote simular;
+
public MenuPrincipalServlet() {
super();
@@ -45,7 +43,7 @@ public class MenuPrincipalServlet extends HttpServlet {
response.setContentType("text/html;charset=UTF-8");
Profesor profesor = (Profesor)request.getSession().getAttribute("profesor");
Profesor profTemp = em.find(Profesor.class, profesor.getIdProfesor());
- simular.simular();
+
List<Asignatura> asignaturas = em.createQuery("select a from Asignatura a where a.profesor = :profesor ").setParameter("profesor", profTemp).getResultList();
request.setAttribute("lista_asignatura", asignaturas);