correcion simular

17 files changed, 70 insertions, 27 deletions

diff --git a/EjercitarJPA/build/classes/META-INF/MANIFEST.MF b/EjercitarJPA/build/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/EjercitarJPA/build/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/EjercitarJPA/build/classes/META-INF/persistence.xml b/EjercitarJPA/build/classes/META-INF/persistence.xml
deleted file mode 100644
index a5aee30..0000000
--- a/EjercitarJPA/build/classes/META-INF/persistence.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<persistence-unit name="EjercitarJPA" transaction-type="JTA">
-		<jta-data-source>java:/EjercitarDS</jta-data-source>
-		<class>model.Alumno</class>
-		<class>model.Concepto</class>
-		<class>model.Curso</class>
-		<class>model.Ejercicio</class>
-		<class>model.Escuela</class>
-		<class>model.Profesor</class>
-		<class>model.Respuesta</class>
-		<class>model.Sesion</class>
-		<class>model.Tarea</class>
-		<class>model.Tema</class>
-		<class>model.Asignatura</class>
-		<class>model.EjercicioResueltoAlumno</class>
-	</persistence-unit>
-</persistence>
diff --git a/EjercitarJPA/build/classes/model/Concepto.class b/EjercitarJPA/build/classes/model/Concepto.class
deleted file mode 100644
index 2775171..0000000
--- a/EjercitarJPA/build/classes/model/Concepto.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Curso.class b/EjercitarJPA/build/classes/model/Curso.class
deleted file mode 100644
index 6ae6052..0000000
--- a/EjercitarJPA/build/classes/model/Curso.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Ejercicio.class b/EjercitarJPA/build/classes/model/Ejercicio.class
deleted file mode 100644
index 36b817f..0000000
--- a/EjercitarJPA/build/classes/model/Ejercicio.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class b/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class
deleted file mode 100644
index 85e75c1..0000000
--- a/EjercitarJPA/build/classes/model/EjercicioResueltoAlumno.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Escuela.class b/EjercitarJPA/build/classes/model/Escuela.class
deleted file mode 100644
index 7adf95a..0000000
--- a/EjercitarJPA/build/classes/model/Escuela.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Profesor.class b/EjercitarJPA/build/classes/model/Profesor.class
deleted file mode 100644
index 138adc7..0000000
--- a/EjercitarJPA/build/classes/model/Profesor.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Respuesta.class b/EjercitarJPA/build/classes/model/Respuesta.class
deleted file mode 100644
index 42b82a2..0000000
--- a/EjercitarJPA/build/classes/model/Respuesta.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Sesion.class b/EjercitarJPA/build/classes/model/Sesion.class
deleted file mode 100644
index bc715b2..0000000
--- a/EjercitarJPA/build/classes/model/Sesion.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Tarea.class b/EjercitarJPA/build/classes/model/Tarea.class
deleted file mode 100644
index 2d5e2d5..0000000
--- a/EjercitarJPA/build/classes/model/Tarea.class
+++ /dev/null
diff --git a/EjercitarJPA/build/classes/model/Tema.class b/EjercitarJPA/build/classes/model/Tema.class
deleted file mode 100644
index 2077d27..0000000
--- a/EjercitarJPA/build/classes/model/Tema.class
+++ /dev/null
diff --git a/EjercitarJPA/src/model/Ejercicio.java b/EjercitarJPA/src/model/Ejercicio.java
index bee8957..b569f9a 100644
--- a/EjercitarJPA/src/model/Ejercicio.java
+++ b/EjercitarJPA/src/model/Ejercicio.java
@@ -76,7 +76,7 @@ public class Ejercicio implements Serializable {
     @OneToMany(mappedBy = "ejercicio")
     private List<EjercicioResueltoAlumno> ejercicioResueltoAlumnoList;
     
-    @ManyToMany(mappedBy = "ejercicioList", fetch=FetchType.EAGER)
+    @ManyToMany(mappedBy = "ejercicioList")
     private List<Sesion> sesionList;
     
     private byte [] imagen;
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBean.java b/EjercitarServer/ejbModule/beans/AdministracionBean.java
index f1f22c2..3ceb832 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBean.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBean.java
@@ -281,7 +281,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
     
     public Integer obtenerIdAlumno(){
     	
-    	return em.createQuery("select nextval('alumno_id_alumno_seq')").getFirstResult();
+    	return em.createQuery("select max(a.idAlumno) from Alumno a").getFirstResult();
     	
     }
     public void calcularProbabilidades(int idAsignatura) {
diff --git a/EjercitarServer/ejbModule/beans/SimulacionBean.java b/EjercitarServer/ejbModule/beans/SimulacionBean.java
index 59d5064..5a8a692 100644
--- a/EjercitarServer/ejbModule/beans/SimulacionBean.java
+++ b/EjercitarServer/ejbModule/beans/SimulacionBean.java
@@ -42,7 +42,7 @@ public class SimulacionBean {
 		
 		Alumno alumno = new Alumno();
 		
-		Integer idAlumno = admin.obtenerIdAlumno();
+		Integer idAlumno = admin.obtenerIdAlumno() +  1;
 		alumno.setNombre("nom_" + idAlumno);
 		alumno.setApellido("ape_" + idAlumno);
 		alumno.setSerial(123456);
diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp
index ea908a1..3e10f05 100644
--- a/EjercitarWeb/WebContent/login.jsp
+++ b/EjercitarWeb/WebContent/login.jsp
@@ -33,11 +33,55 @@
 		.input-group {
 			margin-bottom: 5px;
 		}
+		
+		
+		body { 
+		 background: url('/img/fondo.png') no-repeat center center fixed; 
+		 -webkit-background-size: cover;
+		 -moz-background-size: cover;
+		 -o-background-size: cover;
+		 background-size: cover;
+		}
+		
+		.panel-default {
+		 opacity: 0.9;
+		 margin-top:30px;
+		}
+		.form-group.last {
+		 margin-bottom:0px;
+		}
+		
+		.white, .white a {
+		  color: #fff;
+		}
+		
+		.navbar {
+		   background-color: transparent;
+		   background: transparent;
+		   border-color: transparent;
+		}
+		
+		
+		
 	</style>
 </head>
 <body>
+
+
+
+
 	<div class="container">
-		<div class="center well">
+	<div class="row"> <br/><br/><br/><br/><br/></div>
+	<div class="row ">	
+		<div class="col-md-6 white ">
+			<h1 > Bienvenidos a Ejercitar!</h1>
+			
+			<p><h3> Ejercitar es un modelo de aprendizaje basado en el uso de computadoras. </h3></p>
+		</div>
+		<div class="col-md-4 col-md-offset-2">
+		<div class="panel panel-default">
+		<div class="panel-heading"> <strong class="">Login</strong> </div>
+            <div class="panel-body">
 			<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>
@@ -53,7 +97,24 @@
 				<button class="btn btn-lg btn-primary btn-block" type="submit" name="submit">Aceptar</button>
 				<button class="btn btn-lg btn-success btn-block" type="button" onclick="location.href='/EjercitarWeb/NuevoProfesorServlet';">Crear Cuenta</button>
 			</form>
+			</div>
+			</div>
 		</div>
 	</div>
+	</div>
+	
+	<nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
+	  	<div class="container-fluid">
+	    	
+	    	 <ul class="nav navbar-nav navbar-right">	
+	    		<a href="http://one.laptop.org/"><img src="/img/olpc-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+	    		<a href="http://www.paraguayeduca.org/"><img src="/img/educa-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+	   			<a href="http://www.pol.una.py/"><img src="/img/fpuna-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+	    		
+	    	</ul>
+
+	  	</div>
+	</nav>
+
 </body>
 </html>
diff --git a/EjercitarWeb/src/src/MenuPrincipalServlet.java b/EjercitarWeb/src/src/MenuPrincipalServlet.java
index eb3d4f9..2bee6fd 100644
--- a/EjercitarWeb/src/src/MenuPrincipalServlet.java
+++ b/EjercitarWeb/src/src/MenuPrincipalServlet.java
@@ -3,6 +3,7 @@ package src;
 import java.io.IOException;
 import java.util.List;
 
+import javax.ejb.EJB;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.servlet.RequestDispatcher;
@@ -14,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import model.Asignatura;
 import model.Profesor;
+import beans.SimulacionBeanRemote;
 
 /**
  * Servlet implementation class MenuPrincipalServlet
@@ -26,7 +28,8 @@ public class MenuPrincipalServlet extends HttpServlet {
     /**
      * @see HttpServlet#HttpServlet()
      */
-	
+	@EJB
+	SimulacionBeanRemote simular;
 	
     public MenuPrincipalServlet() {
         super();
@@ -42,7 +45,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);