Merge remote-tracking branch 'remotes/origin/Cecilia' into samu

Conflicts:
	EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
	EjercitarWeb/src/src/VerResultadosServlet.java

18 files changed, 207 insertions, 192 deletions

diff --git a/EjercitarJPA/build/classes/model/Asignatura.class b/EjercitarJPA/build/classes/model/Asignatura.class
index 64f7a87..7b4cdcb 100644
--- a/EjercitarJPA/build/classes/model/Asignatura.class
+++ b/EjercitarJPA/build/classes/model/Asignatura.class
diff --git a/EjercitarJPA/build/classes/model/Concepto.class b/EjercitarJPA/build/classes/model/Concepto.class
index cf486cd..dd33819 100644
--- a/EjercitarJPA/build/classes/model/Concepto.class
+++ b/EjercitarJPA/build/classes/model/Concepto.class
diff --git a/EjercitarJPA/build/classes/model/Tarea.class b/EjercitarJPA/build/classes/model/Tarea.class
index 22cc31e..2a651a8 100644
--- a/EjercitarJPA/build/classes/model/Tarea.class
+++ b/EjercitarJPA/build/classes/model/Tarea.class
diff --git a/EjercitarJPA/build/classes/model/Tema.class b/EjercitarJPA/build/classes/model/Tema.class
index a7efd11..98e2972 100644
--- a/EjercitarJPA/build/classes/model/Tema.class
+++ b/EjercitarJPA/build/classes/model/Tema.class
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index d31b1e9..85b1221 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -9,7 +9,6 @@ import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -67,20 +66,22 @@ public class Concepto implements Serializable {
     private Double descuido;
     @Column(name = "apriori")
     private Double apriori;
+    @JoinTable(name = "tarea_concepto", joinColumns = {
+        @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
+        @JoinColumn(name = "id_tarea", referencedColumnName = "id_tarea")})
+    @ManyToMany
+    private List<Tarea> tareaList;
     @JoinTable(name = "ejercicio_concepto", joinColumns = {
         @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
         @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
     @ManyToMany
     private List<Ejercicio> ejercicioList;
     @JoinColumn(name = "tema", referencedColumnName = "id_tema")
-    @ManyToOne 
+    @ManyToOne
     private Tema tema;
     @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
     @ManyToOne
     private Profesor profesor;
-    @JoinColumn(name = "tarea", referencedColumnName = "id_tarea")
-    @ManyToOne
-    private Tarea tarea;
 
     public Concepto() {
     }
@@ -152,6 +153,15 @@ public class Concepto implements Serializable {
     }
 
     @XmlTransient
+    public List<Tarea> getTareaList() {
+        return tareaList;
+    }
+
+    public void setTareaList(List<Tarea> tareaList) {
+        this.tareaList = tareaList;
+    }
+
+    @XmlTransient
     public List<Ejercicio> getEjercicioList() {
         return ejercicioList;
     }
@@ -175,13 +185,7 @@ public class Concepto implements Serializable {
     public void setProfesor(Profesor profesor) {
         this.profesor = profesor;
     }
-    public Tarea getTarea() {
-        return tarea;
-    }
 
-    public void setTarea(Tarea tarea) {
-        this.tarea = tarea;
-    }
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java
index 7b0fb37..98f8262 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -6,17 +6,16 @@ package model;
 
 import java.io.Serializable;
 import java.util.List;
-
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
@@ -45,6 +44,8 @@ public class Tarea implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
+    @ManyToMany(mappedBy = "tareaList", cascade = CascadeType.ALL)
+    private List<Concepto> conceptoList;
     @JoinColumn(name = "tema", referencedColumnName = "id_tema")
     @ManyToOne
     private Tema tema;
@@ -54,13 +55,10 @@ public class Tarea implements Serializable {
     @JoinColumn(name = "curso", referencedColumnName = "id_curso")
     @ManyToOne
     private Curso curso;
-    @OneToMany(mappedBy = "tarea")
-    private List<Concepto> conceptoList;
-
     @JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
     @ManyToOne
     private Asignatura asignatura;
-    
+
     public Tarea() {
     }
 
@@ -84,6 +82,15 @@ public class Tarea implements Serializable {
         this.descripcion = descripcion;
     }
 
+    @XmlTransient
+    public List<Concepto> getConceptoList() {
+        return conceptoList;
+    }
+
+    public void setConceptoList(List<Concepto> conceptoList) {
+        this.conceptoList = conceptoList;
+    }
+
     public Tema getTema() {
         return tema;
     }
@@ -107,7 +114,7 @@ public class Tarea implements Serializable {
     public void setCurso(Curso curso) {
         this.curso = curso;
     }
-    
+
     public Asignatura getAsignatura() {
         return asignatura;
     }
@@ -116,15 +123,6 @@ public class Tarea implements Serializable {
         this.asignatura = asignatura;
     }
 
-    @XmlTransient
-    public List<Concepto> getConceptoList() {
-        return conceptoList;
-    }
-
-    public void setConceptoList(List<Concepto> conceptoList) {
-        this.conceptoList = conceptoList;
-    }
-    
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarServer/build/classes/beans/AdministracionBean.class b/EjercitarServer/build/classes/beans/AdministracionBean.class
index 56e1fab..d682013 100644
--- a/EjercitarServer/build/classes/beans/AdministracionBean.class
+++ b/EjercitarServer/build/classes/beans/AdministracionBean.class
diff --git a/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class b/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
index e614916..69a95e9 100644
--- a/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
+++ b/EjercitarServer/build/classes/beans/AdministracionBeanRemote.class
diff --git a/EjercitarServer/build/classes/beans/EjercitarWSBean.class b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
index 82f4570..6f9cdbe 100644
--- a/EjercitarServer/build/classes/beans/EjercitarWSBean.class
+++ b/EjercitarServer/build/classes/beans/EjercitarWSBean.class
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBean.java b/EjercitarServer/ejbModule/beans/AdministracionBean.java
index e79a50c..0f3cb5f 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBean.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBean.java
@@ -119,9 +119,11 @@ public class AdministracionBean implements AdministracionBeanRemote, Administrac
     	em.persist(asignatura);
     }
    
-    public void agregarTarea(Tarea tarea) {
+    public void agregarTarea(Tarea tarea, ArrayList<Concepto> conceptoList) {
     	
     	em.persist(tarea);
+    	tarea.setConceptoList(conceptoList);
+    	em.merge(tarea);
     }
     
     public void calcularProbabilidades(Profesor profesor) {
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
index 42cb3c3..23c553c 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
@@ -1,5 +1,6 @@
 package beans;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -29,7 +30,7 @@ public interface AdministracionBeanRemote {
 	public void eliminarConcepto(int idConcepto);
 
 	public void eliminarTema(int idTema);
-	public void agregarTarea(Tarea tarea);
+	public void agregarTarea(Tarea tarea, ArrayList<Concepto> conceptoList);
 
 	public String getValorNodoRed(String nombre);
     
diff --git a/EjercitarWeb/.classpath b/EjercitarWeb/.classpath
index a677218..966cf24 100644
--- a/EjercitarWeb/.classpath
+++ b/EjercitarWeb/.classpath
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="lib" path="/EjercitarJPA/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
-	<classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"/>
-	<classpathentry kind="src" path="/EjercitarServer"/>
-	<classpathentry kind="lib" path="C:/jboss-as-distribution-6.0.0.Final/jboss-6.0.0.Final/client/jboss-servlet-api_3.0_spec.jar"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">

+		<attributes>

+			<attribute name="owner.project.facets" value="java"/>

+		</attributes>

+	</classpathentry>

+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>

+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>

+	<classpathentry kind="lib" path="/EjercitarJPA/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>

+	<classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"/>

+	<classpathentry kind="src" path="/EjercitarServer"/>

+	<classpathentry kind="lib" path="C:/Users/Samu/Downloads/jboss-as-distribution-6.0.0.Final/jboss-6.0.0.Final/client/jboss-servlet-api_3.0_spec.jar"/>

+	<classpathentry kind="output" path="build/classes"/>

+</classpath>

diff --git a/EjercitarWeb/WebContent/Tarea.jsp b/EjercitarWeb/WebContent/Tarea.jsp
index 74f1b2d..e3c6604 100644
--- a/EjercitarWeb/WebContent/Tarea.jsp
+++ b/EjercitarWeb/WebContent/Tarea.jsp
@@ -7,6 +7,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Tareas</title>
 <script src="http://code.jquery.com/jquery-latest.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> 
+<script src="http://code.jquery.com/jquery-1.8.2.js" type="text/javascript"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js" type="text/javascript"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css" type="text/javascript"></script>
+<script src="jquery.multiselect.js" type="text/javascript"></script>
+<link rel="stylesheet" href="jquery.multiselect.css" type="text/css" />
+<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css" type="text/css" />
 </head>
 <body>
 <%@page import="java.util.List" import="model.Tema" %> 
@@ -19,17 +26,12 @@
 		<br>
 		<textarea  name="descripcion" id="descripcion"></textarea>
 		<br>
-		Tema: <select id="temas" name="temas" onchange="cargarConceptos()">
-				<% List<Tema> temas = (List<Tema>)request.getAttribute("lista_temas"); %>
-				<% for(Tema tema : temas) {%>
-					<option value="<%= tema.getIdTema() %>"><%= tema.getNombre() %></option>
-				<% } %>
-			</select>
-		<br>	
-		Concepto: <select id="conceptos" multiple="multiple" name="concepto" >
+		
+		Concepto: <select id="conceptos" multiple="multiple" name="concepto"  >
 					
 				</select>
-	
+		<input name="lista_conceptos" id="lista_conceptos" value="asdf">
+		<input name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>>
 		<input type="submit" name="Aceptar" value="Aceptar">
 		
 	</form>
@@ -37,12 +39,43 @@
 	
 	<script type="text/javascript">
 
-            function cargarConceptos(){
-                //obtiene los objetos productCode, y obtiene el valor del objeto
-                var tem_id=$("#temas").val(); //ya se tiene el objeto select
-                //llama al servlet con el parametro seleccionado
-                $("#conceptos").load("CargarConceptosServlet", {tema_id:tem_id})
-            }
+	  function cargarConceptos(asignatura){
+          //obtiene los objetos productCode, y obtiene el valor del objeto
+          //var tema_id=$("#temas").val(); //ya se tiene el objeto select
+          //llama al servlet con el parametro seleccionado
+          $("#conceptos").load("CargarConceptosServlet", {asignatura:asignatura});
+          //$("#conceptos").multiselect("refresh");
+          
+      }
+
+            cargarConceptos($("#asignatura").val());
+         	
+            $(document).ready(function(){
+                
+            	$("#conceptos").multiselect({
+             	   header: "Seleccione una opcion...",
+             	   click: function(event, ui){
+             		  
+                  	var lista = $("#conceptos").multiselect("getChecked").map(function(){
+                  		   return this.value;    
+                  		}).get();
+      				
+                  	$("#lista_conceptos").val(lista);
+      						
+                   },
+                   open: function(event, ui){
+                	   $("#conceptos").multiselect("refresh");
+                   }
+          	   
+                });
+            	
+            	
+            });
+
+
+            
+			
+            
         </script>
         
 
diff --git a/EjercitarWeb/WebContent/WEB-INF/web.xml b/EjercitarWeb/WebContent/WEB-INF/web.xml
index 5978e17..1453125 100644
--- a/EjercitarWeb/WebContent/WEB-INF/web.xml
+++ b/EjercitarWeb/WebContent/WEB-INF/web.xml
@@ -1,97 +1,97 @@
-<?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>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <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>
-  </servlet>
-  <servlet>
-    <servlet-name>NuevoTemaServlet</servlet-name>
-    <servlet-class>src.NuevoTemaServlet</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>CargarConceptosServlet</servlet-name>
-    <servlet-class>src.CargarConceptosServlet</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>LogInServlet</servlet-name>
-    <servlet-class>src.LogInServlet</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>NuevoConceptoServlet</servlet-name>
-    <servlet-class>src.NuevoConceptoServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>NuevoEjercicioServlet</servlet-name>
-    <url-pattern>/NuevoEjercicioServlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>NuevoTemaServlet</servlet-name>
-    <url-pattern>/NuevoTemaServlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>CargarConceptosServlet</servlet-name>
-    <url-pattern>/CargarConceptosServlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>LogInServlet</servlet-name>
-    <url-pattern>/LogInServlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>NuevoConceptoServlet</servlet-name>
-    <url-pattern>/NuevoConceptoServlet</url-pattern>
-  </servlet-mapping>
-  <ejb-local-ref>
-    <ejb-ref-name>src.NuevoEjercicioServlet/abr</ejb-ref-name>
-    <local-home>beans.AdministracionBeanRemote</local-home>
-    <local>beans.AdministracionBeanRemote</local>
-    <injection-target>
-      <injection-target-class>src.NuevoEjercicioServlet</injection-target-class>
-      <injection-target-name>abr</injection-target-name>
-    </injection-target>
-  </ejb-local-ref>
-  <ejb-local-ref>
-    <ejb-ref-name>src.NuevoTemaServlet/abr</ejb-ref-name>
-    <local-home>beans.AdministracionBeanRemote</local-home>
-    <local>beans.AdministracionBeanRemote</local>
-    <injection-target>
-      <injection-target-class>src.NuevoTemaServlet</injection-target-class>
-      <injection-target-name>abr</injection-target-name>
-    </injection-target>
-  </ejb-local-ref>
-  <ejb-local-ref>
-    <ejb-ref-name>src.CargarConceptosServlet/abr</ejb-ref-name>
-    <local-home>beans.AdministracionBeanRemote</local-home>
-    <local>beans.AdministracionBeanRemote</local>
-    <injection-target>
-      <injection-target-class>src.CargarConceptosServlet</injection-target-class>
-      <injection-target-name>abr</injection-target-name>
-    </injection-target>
-  </ejb-local-ref>
-  <ejb-local-ref>
-    <ejb-ref-name>src.LogInServlet/abr</ejb-ref-name>
-    <local-home>beans.AdministracionBeanRemote</local-home>
-    <local>beans.AdministracionBeanRemote</local>
-    <injection-target>
-      <injection-target-class>src.LogInServlet</injection-target-class>
-      <injection-target-name>abr</injection-target-name>
-    </injection-target>
-  </ejb-local-ref>
-  <ejb-local-ref>
-    <ejb-ref-name>src.NuevoConceptoServlet/abr</ejb-ref-name>
-    <local-home>beans.AdministracionBeanRemote</local-home>
-    <local>beans.AdministracionBeanRemote</local>
-    <injection-target>
-      <injection-target-class>src.NuevoConceptoServlet</injection-target-class>
-      <injection-target-name>abr</injection-target-name>
-    </injection-target>
-  </ejb-local-ref>
+<?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>

+  <welcome-file-list>

+    <welcome-file>index.html</welcome-file>

+    <welcome-file>index.htm</welcome-file>

+    <welcome-file>index.jsp</welcome-file>

+    <welcome-file>default.html</welcome-file>

+    <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>

+  </servlet>

+  <servlet>

+    <servlet-name>NuevoTemaServlet</servlet-name>

+    <servlet-class>src.NuevoTemaServlet</servlet-class>

+  </servlet>

+  <servlet>

+    <servlet-name>CargarConceptosServlet</servlet-name>

+    <servlet-class>src.CargarConceptosServlet</servlet-class>

+  </servlet>

+  <servlet>

+    <servlet-name>LogInServlet</servlet-name>

+    <servlet-class>src.LogInServlet</servlet-class>

+  </servlet>

+  <servlet>

+    <servlet-name>NuevoConceptoServlet</servlet-name>

+    <servlet-class>src.NuevoConceptoServlet</servlet-class>

+  </servlet>

+  <servlet-mapping>

+    <servlet-name>NuevoEjercicioServlet</servlet-name>

+    <url-pattern>/NuevoEjercicioServlet</url-pattern>

+  </servlet-mapping>

+  <servlet-mapping>

+    <servlet-name>NuevoTemaServlet</servlet-name>

+    <url-pattern>/NuevoTemaServlet</url-pattern>

+  </servlet-mapping>

+  <servlet-mapping>

+    <servlet-name>CargarConceptosServlet</servlet-name>

+    <url-pattern>/CargarConceptosServlet</url-pattern>

+  </servlet-mapping>

+  <servlet-mapping>

+    <servlet-name>LogInServlet</servlet-name>

+    <url-pattern>/LogInServlet</url-pattern>

+  </servlet-mapping>

+  <servlet-mapping>

+    <servlet-name>NuevoConceptoServlet</servlet-name>

+    <url-pattern>/NuevoConceptoServlet</url-pattern>

+  </servlet-mapping>

+  <ejb-local-ref>

+    <ejb-ref-name>src.NuevoEjercicioServlet/abr</ejb-ref-name>

+    <local-home>beans.AdministracionBeanRemote</local-home>

+    <local>beans.AdministracionBeanRemote</local>

+    <injection-target>

+      <injection-target-class>src.NuevoEjercicioServlet</injection-target-class>

+      <injection-target-name>abr</injection-target-name>

+    </injection-target>

+  </ejb-local-ref>

+  <ejb-local-ref>

+    <ejb-ref-name>src.NuevoTemaServlet/abr</ejb-ref-name>

+    <local-home>beans.AdministracionBeanRemote</local-home>

+    <local>beans.AdministracionBeanRemote</local>

+    <injection-target>

+      <injection-target-class>src.NuevoTemaServlet</injection-target-class>

+      <injection-target-name>abr</injection-target-name>

+    </injection-target>

+  </ejb-local-ref>

+  <ejb-local-ref>

+    <ejb-ref-name>src.CargarConceptosServlet/abr</ejb-ref-name>

+    <local-home>beans.AdministracionBeanRemote</local-home>

+    <local>beans.AdministracionBeanRemote</local>

+    <injection-target>

+      <injection-target-class>src.CargarConceptosServlet</injection-target-class>

+      <injection-target-name>abr</injection-target-name>

+    </injection-target>

+  </ejb-local-ref>

+  <ejb-local-ref>

+    <ejb-ref-name>src.LogInServlet/abr</ejb-ref-name>

+    <local-home>beans.AdministracionBeanRemote</local-home>

+    <local>beans.AdministracionBeanRemote</local>

+    <injection-target>

+      <injection-target-class>src.LogInServlet</injection-target-class>

+      <injection-target-name>abr</injection-target-name>

+    </injection-target>

+  </ejb-local-ref>

+  <ejb-local-ref>

+    <ejb-ref-name>src.NuevoConceptoServlet/abr</ejb-ref-name>

+    <local-home>beans.AdministracionBeanRemote</local-home>

+    <local>beans.AdministracionBeanRemote</local>

+    <injection-target>

+      <injection-target-class>src.NuevoConceptoServlet</injection-target-class>

+      <injection-target-name>abr</injection-target-name>

+    </injection-target>

+  </ejb-local-ref>

 </web-app>
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/vista_asignatura.jsp b/EjercitarWeb/WebContent/vista_asignatura.jsp
index 1cbdff1..6f049c2 100644
--- a/EjercitarWeb/WebContent/vista_asignatura.jsp
+++ b/EjercitarWeb/WebContent/vista_asignatura.jsp
@@ -60,7 +60,7 @@ Descripcion: <%= asignatura.getDescripcion() %>
 Tareas:
 <br>
 <br>
-<a href="/EjercitarWeb/NuevaTareaServlet?idCurso=<%= asignatura.getCurso().getIdCurso() %>&idAsignatura=<%= asignatura.getIdAsignatura()%> ">Nueva Tarea</a>
+<a href="/EjercitarWeb/NuevaTareaServlet?curso=<%= asignatura.getCurso().getIdCurso() %>&asignatura=<%= asignatura.getIdAsignatura()%> ">Nueva Tarea</a>
 
 
 </div>            
diff --git a/EjercitarWeb/build/classes/src/NuevoEjercicioServlet.class b/EjercitarWeb/build/classes/src/NuevoEjercicioServlet.class
index ae97972..0406884 100644
--- a/EjercitarWeb/build/classes/src/NuevoEjercicioServlet.class
+++ b/EjercitarWeb/build/classes/src/NuevoEjercicioServlet.class
diff --git a/EjercitarWeb/build/classes/src/NuevoTemaServlet.class b/EjercitarWeb/build/classes/src/NuevoTemaServlet.class
index 763fe0b..de002dd 100644
--- a/EjercitarWeb/build/classes/src/NuevoTemaServlet.class
+++ b/EjercitarWeb/build/classes/src/NuevoTemaServlet.class
diff --git a/EjercitarWeb/src/src/NuevaTareaServlet.java b/EjercitarWeb/src/src/NuevaTareaServlet.java
index d7f4942..3e4d4e3 100644
--- a/EjercitarWeb/src/src/NuevaTareaServlet.java
+++ b/EjercitarWeb/src/src/NuevaTareaServlet.java
@@ -53,32 +53,7 @@ public class NuevaTareaServlet extends HttpServlet {
         //Asignatura matematica = em.find(Asignatura.class, 1); // Asignatura: Matematica
      
   
-        List temas = em.createQuery("Select t from Tema t").getResultList();
-        
-       
-        List<Tema> temasTareas = new ArrayList<Tema>();
-        //listar solo los temas que tengan pendientes conceptos
        
-        for(int i=0; i < temas.size(); i++){
-        	Tema tema = (Tema) temas.get(i);
-        	
-        	System.out.println("############################ " +tema.getNombre());
-        	 if(tema.getConceptoList() != null){
-        		
-        			System.out.println("############################ 1111111" );
-        		     List<Concepto> conceptoList =  tema.getConceptoList();
-        		     
-        		     for(Concepto concepto : conceptoList){
-        				System.out.println("############################ " + concepto.getNombre());
-        				
-        				if(concepto.getTarea() == null){
-        			 
-        					temasTareas.add(tema);
-        				}
-        			}
-        	 }
-        }
-        request.setAttribute("lista_temas", temasTareas);
         rd.forward(request, response); 
 	}
 
@@ -91,36 +66,38 @@ public class NuevaTareaServlet extends HttpServlet {
 		String descripcion= request.getParameter("descripcion");
 		System.out.println(descripcion);
 		tarea.setDescripcion(descripcion);
-		String idCurso= request.getParameter("idCurso");
+		String idCurso= request.getParameter("curso");
 		System.out.println(idCurso);
 		Curso curso = em.find(Curso.class, Integer.valueOf(idCurso));
 		System.out.println(curso.getTurno());
 		tarea.setCurso(curso);
 		
-		String idTema= request.getParameter("temas");
+		/*String idTema= request.getParameter("temas");
 		System.out.println(idTema);
 		Tema tema = em.find(Tema.class, Integer.valueOf(idTema));
 		System.out.println(tema.getDescripcion());
-		tarea.setTema(tema);
+		tarea.setTema(tema);*/
+		
+		String conceptos = request.getParameter("lista_conceptos");
 		
-		String [] conceptos = request.getParameterValues("concepto");
 		ArrayList<Concepto> conceptoList = new ArrayList<Concepto>();
-		for(String idConcepto : conceptos) {
+		for(String idConcepto : conceptos.split(",")) {
 			System.out.println(idConcepto);
 			Concepto concepto = em.find(Concepto.class, Integer.valueOf(idConcepto));
 			conceptoList.add(concepto);
 		}
+		System.out.println("conceptooosss "+conceptoList.toString());
+		//tarea.setConceptoList(conceptoList);
 		
-		tarea.setConceptoList(conceptoList);
-		
-		String idAsignatura= request.getParameter("idAsignatura");
+		String idAsignatura= request.getParameter("asignatura");
 		System.out.println(idAsignatura);
 		Asignatura asignatura = em.find(Asignatura.class, Integer.valueOf(idAsignatura));
 		System.out.println(asignatura.getDescripcion());
 		tarea.setAsignatura(asignatura);
 		
 		
-		abr.agregarTarea(tarea);
+		abr.agregarTarea(tarea,conceptoList);
+		
 		response.sendRedirect("/EjercitarWeb/VistaAsignaturaServlet?asignatura=" + idAsignatura);
 	}