Filtro por Curso para Grupo y linkeo filtrado desde Curso.

diff --git a/sercom/subcontrollers/curso/templates/list.kid b/sercom/subcontrollers/curso/templates/list.kid
index 9c34d12f1f9dda2f90bc7bf54a72b251438a5e96..059c7d3b519c226ce9852ffcef20762fa80ebd20 100644 (file)
--- a/sercom/subcontrollers/curso/templates/list.kid
+++ b/sercom/subcontrollers/curso/templates/list.kid
@@ -33,7 +33,7 @@
         <td><span py:replace="record.descripcion">descripcion</span></td>
         <td><a py:if="len(record.docentes)" href="${tg.url('/docente/list')}"><span py:replace="len(record.docentes)">Docentes</span></a></td>
         <td><a py:if="len(record.alumnos)"  href="${tg.url('/alumno_inscripto/list/%d' % record.id)}"><span py:replace="len(record.alumnos)">Alumnos</span></a></td>
         <td><span py:replace="record.descripcion">descripcion</span></td>
         <td><a py:if="len(record.docentes)" href="${tg.url('/docente/list')}"><span py:replace="len(record.docentes)">Docentes</span></a></td>
         <td><a py:if="len(record.alumnos)"  href="${tg.url('/alumno_inscripto/list/%d' % record.id)}"><span py:replace="len(record.alumnos)">Alumnos</span></a></td>

-        <td><a py:if="len(record.grupos)"  href="${tg.url('/grupo/list')}"><span py:replace="len(record.grupos)">Grupos</span></a></td>
+        <td><a py:if="len(record.grupos)"  href="${tg.url('/grupo/list/%d' % record.id)}"><span py:replace="len(record.grupos)">Grupos</span></a></td>

         <td><a py:if="len(record.ejercicios)" href="${tg.url('/ejercicio/list')}"><span py:replace="len(record.ejercicios)">Ejercicio</span></a></td>
         <td><a href="${tg.url('/curso/show/%d' % record.id)}">Ver</a>
             <a href="${tg.url('/curso/edit/%d' % record.id)}">Editar</a>
         <td><a py:if="len(record.ejercicios)" href="${tg.url('/ejercicio/list')}"><span py:replace="len(record.ejercicios)">Ejercicio</span></a></td>
         <td><a href="${tg.url('/curso/show/%d' % record.id)}">Ver</a>
             <a href="${tg.url('/curso/edit/%d' % record.id)}">Editar</a>

diff --git a/sercom/subcontrollers/grupo/__init__.py b/sercom/subcontrollers/grupo/__init__.py
index 8190821f5bd8d14ef98b479298a7d1237ab81bc8..29ad202ea1a94e89dae45a62b61cda32283e55f6 100644 (file)
--- a/sercom/subcontrollers/grupo/__init__.py
+++ b/sercom/subcontrollers/grupo/__init__.py
@@ -153,6 +153,15 @@ class GrupoForm(W.TableForm):
     javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('curso');"), W.JSSource(ajax)]
     form_attrs = dict(onsubmit='return onsubmit()')
 
     javascript = [W.JSSource("MochiKit.DOM.focusOnLoad('curso');"), W.JSSource(ajax)]
     form_attrs = dict(onsubmit='return onsubmit()')
 

+def get_cursos():
+    return [(0, u'---')] + [(fk1.id, fk1.shortrepr()) for fk1 in Curso.select()]
+
+class GrupoFiltros(W.TableForm):
+    class Fields(W.WidgetsList):
+        cursoID = W.SingleSelectField(label=_(u'Curso'), options = get_cursos, validator = V.Int(not_empty=True))
+    fields = Fields()
+
+filtro = GrupoFiltros()

 form = GrupoForm()
 
 #}}}
 form = GrupoForm()
 
 #}}}


@@ -173,10 +182,14 @@ class GrupoController(controllers.Controller, identity.SecureResource):
 
     @expose(template='kid:%s.templates.list' % __name__)
     @paginate('records')
 
     @expose(template='kid:%s.templates.list' % __name__)
     @paginate('records')

-    def list(self):
+    def list(self, cursoID = 0):

         """List records in model"""
         """List records in model"""

-        r = cls.select()
-        return dict(records=r, name=name, namepl=namepl)
+        vfilter = dict(cursoID = cursoID)
+        if int(cursoID) == 0:
+            r = cls.select()
+        else:
+            r = cls.select(cls.q.cursoID == cursoID)
+        return dict(records=r, name=name, namepl=namepl, form=filtro, vfilter=vfilter)

 
     @expose()
     def activate(self, id, activo):
 
     @expose()
     def activate(self, id, activo):

diff --git a/sercom/subcontrollers/grupo/templates/list.kid b/sercom/subcontrollers/grupo/templates/list.kid
index a715913db4779c0f2e52380aa82c8face19e68f8..c166fe9a8b7c15721eee85f32443c381ee798391 100644 (file)
--- a/sercom/subcontrollers/grupo/templates/list.kid
+++ b/sercom/subcontrollers/grupo/templates/list.kid
@@ -9,6 +9,8 @@
 
 <h1>Administración de <span py:replace="namepl">Objetos</span></h1>
 
 
 <h1>Administración de <span py:replace="namepl">Objetos</span></h1>
 

+<div py:replace="form(value=vfilter, action=tg.url('/grupo/list'),     submit_text=_(u'Filtrar'))">Filtros</div>
+

 <table class="list">
     <tr>
         <th>Curso</th>
 <table class="list">
     <tr>
         <th>Curso</th>