From 2cc63705e0752cf7fdd0bbc2660904b94f2d65be Mon Sep 17 00:00:00 2001 From: Ricardo Markiewicz Date: Sat, 17 Mar 2007 18:14:24 +0000 Subject: [PATCH] varios links de volver detalles HTML --- sercom/subcontrollers/curso/alumno/__init__.py | 8 ++++---- .../curso/alumno/templates/list.kid | 12 +++++++----- .../curso/alumno/templates/show.kid | 2 +- .../curso/ejercicio/templates/list.kid | 2 +- .../curso/ejercicio/templates/show.kid | 18 +++++++++++++++--- .../curso/grupo/templates/list.kid | 2 +- .../tarea_fuente/comandos/templates/list.kid | 3 ++- .../tarea_prueba/comandos/templates/list.kid | 3 ++- 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/sercom/subcontrollers/curso/alumno/__init__.py b/sercom/subcontrollers/curso/alumno/__init__.py index 763bc06..26b87a2 100644 --- a/sercom/subcontrollers/curso/alumno/__init__.py +++ b/sercom/subcontrollers/curso/alumno/__init__.py @@ -70,7 +70,8 @@ class AlumnoInscriptoController(controllers.Controller, identity.SecureResource) raise redirect('..') else: r = cls.select(cls.q.cursoID == cursoID) - return dict(records=r, name=name, namepl=namepl, cursoid=cursoID) + curso = Curso.get(cursoID) + return dict(records=r, name=name, namepl=namepl, curso=curso) @expose(template='kid:%s.templates.notas' % __name__) def notas(self, id, cursoID, **kw): @@ -90,11 +91,10 @@ class AlumnoInscriptoController(controllers.Controller, identity.SecureResource) raise redirect('../list/%d' % cursoID) @expose(template='kid:%s.templates.show' % __name__) - def show(self,id,cursoID, **kw): + def show(self,id, **kw): """Show record in model""" - cursoID = int(cursoID) r = validate_get(id) - return dict(name=name, namepl=namepl, record=r, cursoid=cursoID) + return dict(name=name, namepl=namepl, record=r) #}}} diff --git a/sercom/subcontrollers/curso/alumno/templates/list.kid b/sercom/subcontrollers/curso/alumno/templates/list.kid index ff10ed2..fa261f3 100644 --- a/sercom/subcontrollers/curso/alumno/templates/list.kid +++ b/sercom/subcontrollers/curso/alumno/templates/list.kid @@ -7,28 +7,30 @@ list - -

Alumnos

+ +

Alumnos del curso

- -
Curso Alumno Condicional? Tutor Operaciones
curso alumno fecha corregido Tutor - Notas + Notas
+
+Volver +

+
${page} diff --git a/sercom/subcontrollers/curso/alumno/templates/show.kid b/sercom/subcontrollers/curso/alumno/templates/show.kid index 9556a59..ca1f340 100644 --- a/sercom/subcontrollers/curso/alumno/templates/show.kid +++ b/sercom/subcontrollers/curso/alumno/templates/show.kid @@ -67,7 +67,7 @@
-Volver +Volver diff --git a/sercom/subcontrollers/curso/ejercicio/templates/list.kid b/sercom/subcontrollers/curso/ejercicio/templates/list.kid index 5326670..1cdb173 100644 --- a/sercom/subcontrollers/curso/ejercicio/templates/list.kid +++ b/sercom/subcontrollers/curso/ejercicio/templates/list.kid @@ -33,7 +33,7 @@
Agregar -Volver a Cursos +| Volver a Cursos
Es grupal?: - - grupal - + + grupal + + + + Instancias de Entrega: + +
    +
  • + ${i.numero} - + ${i.inicio} - + ${i.fin} +
    • +
+ diff --git a/sercom/subcontrollers/curso/grupo/templates/list.kid b/sercom/subcontrollers/curso/grupo/templates/list.kid index d1fc808..ac46ab0 100644 --- a/sercom/subcontrollers/curso/grupo/templates/list.kid +++ b/sercom/subcontrollers/curso/grupo/templates/list.kid @@ -32,7 +32,7 @@
Agregar | -Mezclar, Juntar, Separar Grupos | +Mezclar, Juntar, Separar | Volver a Cursos

diff --git a/sercom/subcontrollers/tarea_fuente/comandos/templates/list.kid b/sercom/subcontrollers/tarea_fuente/comandos/templates/list.kid index 8d023bf..ac1589c 100644 --- a/sercom/subcontrollers/tarea_fuente/comandos/templates/list.kid +++ b/sercom/subcontrollers/tarea_fuente/comandos/templates/list.kid @@ -24,7 +24,8 @@
-Agregar +Agregar | +Volver

-Agregar +Agregar | +Volver