Fixes de unicode.

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

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 13f6172c36c027bfc8bf4c20e53e489811e172f9..3bd0d8af0106f1c392d53eb64e3c607069cb16f2 100644 (file)
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -1,25 +1,68 @@
-# 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
-from turbogears import widgets as w, validators
+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 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, Grupo, AlumnoInscripto
+from sqlobject import *

 # from sercom import json
 
 # from sercom import json
 

-from subcontrollers import DocenteController
+from subcontrollers import *

 
 import logging
 log = logging.getLogger("sercom.controllers")
 
 
 import logging
 log = logging.getLogger("sercom.controllers")
 

+class LoginForm(W.TableForm):
+    class Fields(W.WidgetsList):
+        login_user = W.TextField(label=_(u'Usuario'),
+            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):
 
 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
+            # Grupos en los que el usuario formo parte
+            m = [i.grupo.id for i in Grupo.selectByAlumno(identity.current.user)]
+            try:
+                entregador = AlumnoInscripto.selectByAlumno(identity.current.user)
+                m.append(entregador.id)
+            except:
+                pass
+            entregas = list(Entrega.select(IN(Entrega.q.entregadorID, m))[:5])
+            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,


@@ -46,22 +89,13 @@ class Root(controllers.RootController):
             msg = _(u'Por favor ingrese.')
             forward_url = request.headers.get('Referer', '/')
 
             msg = _(u'Por favor ingrese.')
             forward_url = request.headers.get('Referer', '/')
 

-        fields = [
-            w.TextField(name='login_user', label=_(u'Usuario'),
-                validator=validators.NotEmpty()),
-            w.PasswordField(name='login_password', label=_(u'Contraseña'),
-                validator=validators.NotEmpty())
-        ]
+        fields = list(LoginForm.fields)

         if forward_url:
         if forward_url:

-            fields.append(w.HiddenField(name='forward_url'))
-        fields.extend([w.HiddenField(name=name) for name in request.params
+            fields.append(W.HiddenField(name='forward_url'))
+        fields.extend([W.HiddenField(name=name) for name in request.params

                 if name not in ('login_user', 'login_password', 'login_submit',
                                 'forward_url')])
                 if name not in ('login_user', 'login_password', 'login_submit',
                                 'forward_url')])

-
-        submit = w.SubmitButton(name='login_submit')
-
-        login_form = w.TableForm(fields=fields, action=previous_url,
-                        submit_text=_(u'Ingresar'), submit=submit)
+        login_form = LoginForm(fields=fields, action=previous_url)

 
         values = dict(forward_url=forward_url)
         values.update(request.params)
 
         values = dict(forward_url=forward_url)
         values.update(request.params)


@@ -73,7 +107,71 @@ 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()
+
+    ejercicio = EjercicioController()
+
+    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()
+
+    mis_correcciones = MisCorreccionesController()
+
+#{{{ 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
+    is useful for table listings where you don't want the table to grow because
+    of a large field.
+
+    >>> from sercome.controllers
+    >>> text = '''Why is it that nobody remembers the name of Johann
+    ... Gambolputty de von Ausfern-schplenden-schlitter-crasscrenbon-fried-
+    ... digger-dingle-dangle-dongle-dungle-burstein-von-knacker-thrasher-apple-
+    ... banger-horowitz-ticolensic-grander-knotty-spelltinkle-grandlich-
+    ... grumblemeyer-spelterwasser-kurstlich-himbleeisen-bahnwagen-gutenabend-
+    ... bitte-ein-nurnburger-bratwustle-gernspurten-mitz-weimache-luber-
+    ... hundsfut-gumberaber-shonedanker-kalbsfleisch-mittler-aucher von
+    ... Hautkopft of Ulm?'''
+    >>> summarize(text, 30)
+    'Why is it that nobody remem...'
+    >>> summarize(text, 68, False, ' [...]')
+    'Why is it that nobody remembers the name of Johann\nGambolputty [...]'
+    >>> summarize(text, 68, continuation=' >>')
+    'Why is it that nobody remembers the name of Johann Gambolputty de >>'
+    """
+    if text is not None:
+        if concat:
+            text = text.replace('\n', ' ')
+        if len(text) > size:
+            text = text[:size-len(continuation)] + continuation
+    return text
+
+def strbool(bool):
+    if bool:
+        return _(u'Sí')
+    return _(u'No')
+
+def add_custom_stdvars(vars):
+    return vars.update(dict(summarize=summarize, strbool=strbool))
+
+view.variable_providers.append(add_custom_stdvars)
+#}}}
+