Unfixes de unicode para evitar bug de Python (!?).

[software/sercom.git] / sercom / controllers.py

diff --git a/sercom/controllers.py b/sercom/controllers.py
index b16424f5c20bfb026aeaf8cd24aa75c5a6231702..3bd0d8af0106f1c392d53eb64e3c607069cb16f2 100644 (file)
--- 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 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 *
 # from sercom import json
 
 from subcontrollers import *


@@ -52,7 +53,14 @@ class Root(controllers.RootController):
                 AND(InstanciaDeEntrega.q.inicio <= now,
                     InstanciaDeEntrega.q.fin > now)).orderBy(InstanciaDeEntrega.q.fin))
             # Ultimas N entregas realizadas
                 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)[:5])
+            # Grupos en los que el usuario formo parte
+            m = [i.grupo.id for i in Grupo.selectByAlumno(identity.current.user)]
+            try:
+                entregador = AlumnoInscripto.selectByAlumno(identity.current.user)
+                m.append(entregador.id)
+            except:
+                pass
+            entregas = list(Entrega.select(IN(Entrega.q.entregadorID, m))[:5])

             return dict(instancias_activas=instancias, now=now, entregas=entregas)
         return dict()
 
             return dict(instancias_activas=instancias, now=now, entregas=entregas)
         return dict()
 


@@ -125,6 +133,8 @@ class Root(controllers.RootController):
 
     mis_entregas = MisEntregasController()
 
 
     mis_entregas = MisEntregasController()
 

+    mis_correcciones = MisCorreccionesController()
+

 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):
     """Summarize a string if it's length is greater than a specified size. This
 #{{{ Agrega summarize a namespace tg de KID
 def summarize(text, size, concat=True, continuation='...'):
     """Summarize a string if it's length is greater than a specified size. This


@@ -154,8 +164,13 @@ def summarize(text, size, concat=True, continuation='...'):
             text = text[:size-len(continuation)] + continuation
     return text
 
             text = text[:size-len(continuation)] + continuation
     return text
 

+def strbool(bool):
+    if bool:
+        return _(u'Sí')
+    return _(u'No')
+

 def add_custom_stdvars(vars):
 def add_custom_stdvars(vars):

-    return vars.update(dict(summarize=summarize))
+    return vars.update(dict(summarize=summarize, strbool=strbool))

 
 view.variable_providers.append(add_custom_stdvars)
 #}}}
 
 view.variable_providers.append(add_custom_stdvars)
 #}}}