X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/40a56893faa8289299260432e65d1b54e9ae53ed..c5e6579e46589c8af4175e16283337bc0ac75df6:/sercom/controllers.py?ds=sidebyside

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 048a7b5..fe303b8 100644
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -6,7 +6,8 @@ from turbogears import identity, redirect
 from cherrypy import request, response
 from turbogears.toolbox.catwalk import CatWalk
 import model
-from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol, Entrega
+from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol, Entrega, Grupo, AlumnoInscripto
+from sqlobject import *
 # from sercom import json
 
 from subcontrollers import *
@@ -52,7 +53,11 @@ class Root(controllers.RootController):
                 AND(InstanciaDeEntrega.q.inicio <= now,
                     InstanciaDeEntrega.q.fin > now)).orderBy(InstanciaDeEntrega.q.fin))
             # Ultimas N entregas realizadas
-            entregas = list(Entrega.select(Entrega.q.entregadorID == identity.current.user.id))
+            # Grupos en los que el usuario formo parte
+            m = [i.grupo.id for i in Grupo.selectByAlumno(identity.current.user)]
+            entregador = AlumnoInscripto.selectByAlumno(identity.current.user)
+            m.append(entregador.id)
+            entregas = list(Entrega.select(IN(Entrega.q.entregadorID, m))[:5])
             return dict(instancias_activas=instancias, now=now, entregas=entregas)
         return dict()