X-Git-Url: https://git.llucax.com/z.facultad/75.52/sercom.git/blobdiff_plain/8b2e3360e550a5f0458d2afdc908af9d57b81cdb..899cd679d658580998a8daa9689096b00661ba47:/sercom/controllers.py?ds=sidebyside diff --git a/sercom/controllers.py b/sercom/controllers.py index 079ee79..cc237b8 100644 --- a/sercom/controllers.py +++ b/sercom/controllers.py @@ -1,10 +1,13 @@ -# 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 * +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 subcontrollers import * @@ -25,12 +28,41 @@ class LoginForm(W.TableForm): class Root(controllers.RootController): - @expose(template='.templates.welcome') - @identity.require(identity.has_permission('entregar')) + @expose() 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, @@ -75,26 +107,27 @@ class Root(controllers.RootController): @expose() def logout(self): identity.current.logout() - raise redirect('/') + raise redirect(url('/')) docente = DocenteController() - grupo = GrupoController() - alumno = AlumnoController() enunciado = EnunciadoController() - ejercicio = EjercicioController() + tarea_fuente = TareaFuenteController() - caso_de_prueba = CasoDePruebaController() + tarea_prueba = TareaPruebaController() curso = CursoController() - - docente_inscripto = DocenteInscriptoController() 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='...'): @@ -125,8 +158,13 @@ def summarize(text, size, concat=True, continuation='...'): 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)) + return vars.update(dict(summarize=summarize, strbool=strbool)) view.variable_providers.append(add_custom_stdvars) #}}}