X-Git-Url: https://git.llucax.com/z.facultad/75.52/sercom.git/blobdiff_plain/94b32d115d412a3baa90a96c9165d7f57a189ba0..ad77b3566169e514d5fe31c724281d5db91c18e3:/sercom/controllers.py?ds=inline

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 48b0086..4954d56 100644
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -1,10 +1,12 @@
-# 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 model import InstanciaDeEntrega, Correccion
+from turbogears.toolbox.catwalk import CatWalk
+import model
+from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol
 # from sercom import json
 
 from subcontrollers import *
@@ -27,24 +29,30 @@ class Root(controllers.RootController):
 
     @expose()
     def index(self):
-        raise redirect('/dashboard')
+        raise redirect(url('/dashboard'))
 
     @expose(template='.templates.welcome')
-    @identity.require(identity.has_permission('entregar'))
+    @identity.require(identity.not_anonymous())
     def dashboard(self):
-        import time
-        record = {}
+        now = DateTimeCol.now()
         if 'admin' in identity.current.permissions:
-            from sqlobject import DateTimeCol
             # TODO : Fijar el curso !!
-            record['entregas_para_corregir'] = Correccion.selectBy(corrector=identity.current.user, nota=None).count()
-            try:
-                record['proxima_entrega'] = InstanciaDeEntrega.select(InstanciaDeEntrega.q.inicio >= DateTimeCol.now() and InstanciaDeEntrega.q.fin > DateTimeCol.now()).getOne()
-                record['proxima_entrega'] = record['proxima_entrega'][0]
-            except:
-                record['proxima_entrega'] = None
-        log.debug('Happy TurboGears Controller Responding For Duty')
-        return dict(now=time.ctime(), record=record)
+            correcciones = Correccion.selectBy(corrector=identity.current.user,
+                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)
+        
+        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,
@@ -89,7 +97,7 @@ class Root(controllers.RootController):
     @expose()
     def logout(self):
         identity.current.logout()
-        raise redirect('/')
+        raise redirect(url('/'))
 
     docente = DocenteController()
 
@@ -104,11 +112,16 @@ class Root(controllers.RootController):
     caso_de_prueba = CasoDePruebaController()
 
     curso = CursoController()
-    
+
     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='...'):