Muestro ultimas entregas y fix al uso de Zipfile

[z.facultad/75.52/sercom.git] / sercom / controllers.py

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 186fe510d9323cadf247d8013d33bf6785871073..048a7b506c32fe6e4f402892e45481cc1330ec82 100644 (file)
--- 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
+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 import widgets as W, validators as V
 from turbogears import identity, redirect
 from cherrypy import request, response

-from model import *
+from turbogears.toolbox.catwalk import CatWalk
+import model
+from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol, Entrega

 # from sercom import json
 
 from subcontrollers import *
 # from sercom import json
 
 from subcontrollers import *


@@ -13,24 +15,46 @@ import logging
 log = logging.getLogger("sercom.controllers")
 
 class LoginForm(W.TableForm):
 log = logging.getLogger("sercom.controllers")
 
 class LoginForm(W.TableForm):

-    fields = [
-        W.TextField(name='login_user', label=_(u'Usuario'),
-            validator=V.NotEmpty()),
-        W.PasswordField(name='login_password', label=_(u'Contraseña'),
+    class Fields(W.WidgetsList):
+        login_user = W.TextField(label=_(u'Usuario'),

             validator=V.NotEmpty())
             validator=V.NotEmpty())

-    ]
+        login_password = W.PasswordField(label=_(u'Contraseña'),
+            validator=V.NotEmpty())
+    fields = Fields()

     javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('form_login_user');")]
     submit = W.SubmitButton(name='login_submit')
     submit_text = _(u'Ingresar')
 
 class Root(controllers.RootController):
 
     javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('form_login_user');")]
     submit = W.SubmitButton(name='login_submit')
     submit_text = _(u'Ingresar')
 
 class Root(controllers.RootController):
 

-    @expose(template='.templates.welcome')
-    @identity.require(identity.has_permission('entregar'))
+    @expose()

     def index(self):
     def index(self):

-        import time
-        log.debug('Happy TurboGears Controller Responding For Duty')
-        return dict(now=time.ctime())
+        raise redirect(url('/dashboard'))
+
+    @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()
+            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:
+            # Proximas instancias de entrega
+            instancias = list(InstanciaDeEntrega.select(
+                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))
+            return dict(instancias_activas=instancias, now=now, entregas=entregas)
+        return dict()

 
     @expose(template='.templates.login')
     def login(self, forward_url=None, previous_url=None, tg_errors=None, *args,
 
     @expose(template='.templates.login')
     def login(self, forward_url=None, previous_url=None, tg_errors=None, *args,


@@ -75,14 +99,32 @@ class Root(controllers.RootController):
     @expose()
     def logout(self):
         identity.current.logout()
     @expose()
     def logout(self):
         identity.current.logout()

-        raise redirect('/')
+        raise redirect(url('/'))

 
     docente = DocenteController()
 
 
     docente = DocenteController()
 

+    grupo = GrupoController()
+
+    alumno = AlumnoController()
+

     enunciado = EnunciadoController()
 
     enunciado = EnunciadoController()
 

+    ejercicio = EjercicioController()
+

     caso_de_prueba = CasoDePruebaController()
 
     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='...'):
     """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