X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/55e22977ea91eb5ecfef0f88e867d163ff4e2552..6025b39278d3ed9a7e6ff62f7815441447038e08:/sercom/controllers.py

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 3e96564..4954d56 100644
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -1,9 +1,11 @@
-# vim: set et sw=4 sts=4 encoding=utf-8 :
+# vim: set et sw=4 sts=4 encoding=utf-8 foldmethod=marker :
 
 from turbogears import controllers, expose, view, url
 from turbogears import widgets as W, validators as V
 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
 # from sercom import json
 
@@ -32,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,
-                nota=None).count()
-            now = DateTimeCol.now()
+                corregido=None).count()
             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,
@@ -105,8 +115,13 @@ class Root(controllers.RootController):
 
     docente_inscripto = DocenteInscriptoController()
 
+    alumno_inscripto = AlumnoInscriptoController()
+
     correccion = CorreccionController()
 
+    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='...'):