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 849d25cb94f9cca2b2fb98b7eb2f824cd48169af..048a7b506c32fe6e4f402892e45481cc1330ec82 100644 (file)
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -6,7 +6,7 @@ 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
+from model import InstanciaDeEntrega, Correccion, AND, DateTimeCol, Entrega

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


@@ -34,17 +34,27 @@ class Root(controllers.RootController):
     @expose(template='.templates.welcome')
     @identity.require(identity.not_anonymous())
     def dashboard(self):
     @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()
         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))
             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:
+            # 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,


@@ -113,6 +123,8 @@ class Root(controllers.RootController):
 
     admin = identity.SecureObject(CatWalk(model), identity.has_permission('admin'))
 
 
     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