X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/d0d6d4b23b65897a3897e424879779253aa81232..1013c167ae4a4d891572b0eadbe4e31008f14ad6:/sercom/controllers.py?ds=inline diff --git a/sercom/controllers.py b/sercom/controllers.py index 849d25c..4954d56 100644 --- a/sercom/controllers.py +++ b/sercom/controllers.py @@ -34,17 +34,25 @@ class Root(controllers.RootController): @expose(template='.templates.welcome') @identity.require(identity.not_anonymous()) def dashboard(self): + now = DateTimeCol.now() if 'admin' in identity.current.permissions: # TODO : Fijar el curso !! correcciones = Correccion.selectBy(corrector=identity.current.user, corregido=None).count() - now = DateTimeCol.now() instancias = list(InstanciaDeEntrega.select( AND(InstanciaDeEntrega.q.inicio <= now, InstanciaDeEntrega.q.fin > now)) .orderBy(InstanciaDeEntrega.q.fin)) - return dict(a_corregir=correcciones, - instancias_activas=instancias, now=now) + return dict(a_corregir=correcciones, + instancias_activas=instancias, now=now) + + if 'entregar' in identity.current.permissions: + instancias = list(InstanciaDeEntrega.select( + AND(InstanciaDeEntrega.q.inicio <= now, + InstanciaDeEntrega.q.fin > now)) + .orderBy(InstanciaDeEntrega.q.fin)) + return dict(instancias_activas=instancias, now=now) + return dict() @expose(template='.templates.login') def login(self, forward_url=None, previous_url=None, tg_errors=None, *args, @@ -113,6 +121,8 @@ class Root(controllers.RootController): admin = identity.SecureObject(CatWalk(model), identity.has_permission('admin')) + mis_entregas = MisEntregasController() + #{{{ 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