Muevo alumno_inscripto dentro de curso

diff --git a/sercom/controllers.py b/sercom/controllers.py
index 9f8283867bb52b7980db2376b1bacf3f421d4718..732755b840b7f0c75d8dcf93d81befd4223f853f 100644 (file)
--- a/sercom/controllers.py
+++ b/sercom/controllers.py
@@ -125,8 +125,6 @@ class Root(controllers.RootController):
 
     docente_inscripto = DocenteInscriptoController()
 
 
     docente_inscripto = DocenteInscriptoController()
 

-    alumno_inscripto = AlumnoInscriptoController()
-

     correccion = CorreccionController()
 
     admin = identity.SecureObject(CatWalk(model), identity.has_permission('admin'))
     correccion = CorreccionController()
 
     admin = identity.SecureObject(CatWalk(model), identity.has_permission('admin'))

diff --git a/sercom/subcontrollers/__init__.py b/sercom/subcontrollers/__init__.py
index 6ca2f5903c3fadcb0400bc01e0b5badd75e88f6e..906540c40e08abd04e76daea33fc8793ff59fe95 100644 (file)
--- a/sercom/subcontrollers/__init__.py
+++ b/sercom/subcontrollers/__init__.py
@@ -7,7 +7,6 @@ from ejercicio import EjercicioController
 from docente_inscripto import DocenteInscriptoController
 from grupo import GrupoController
 from correccion import CorreccionController
 from docente_inscripto import DocenteInscriptoController
 from grupo import GrupoController
 from correccion import CorreccionController

-from alumno_inscripto import AlumnoInscriptoController

 from misentregas import MisEntregasController
 from grupo_admin import GrupoAdminController
 from miscorrecciones import MisCorreccionesController
 from misentregas import MisEntregasController
 from grupo_admin import GrupoAdminController
 from miscorrecciones import MisCorreccionesController

diff --git a/sercom/subcontrollers/curso/__init__.py b/sercom/subcontrollers/curso/__init__.py
index 34e93e5f371574eb02b77b186c00a609208a4303..b40fdb0d067e50ef00804831bc9083edd8ef02cb 100644 (file)
--- a/sercom/subcontrollers/curso/__init__.py
+++ b/sercom/subcontrollers/curso/__init__.py
@@ -15,6 +15,7 @@ from curso_alumno import *
 from sqlobject import *
 from sqlobject.dberrors import *
 from sercom.widgets import *
 from sqlobject import *
 from sqlobject.dberrors import *
 from sercom.widgets import *

+from alumno import AlumnoInscriptoController

 #}}}
 
 #{{{ Configuración
 #}}}
 
 #{{{ Configuración


@@ -168,6 +169,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
     """Basic model admin interface"""
     require = identity.has_permission('admin')
     curso_alumno = CursoAlumnoController()
     """Basic model admin interface"""
     require = identity.has_permission('admin')
     curso_alumno = CursoAlumnoController()

+    alumno = AlumnoInscriptoController()

 
     @expose()
     def default(self, tg_errors=None):
 
     @expose()
     def default(self, tg_errors=None):

diff --git a/sercom/subcontrollers/alumno_inscripto/__init__.py b/sercom/subcontrollers/curso/alumno/__init__.py
similarity index 80%
rename from sercom/subcontrollers/alumno_inscripto/__init__.py
rename to sercom/subcontrollers/curso/alumno/__init__.py
index 80f892c6e76ddf149473b691f2ad0d4778cfd2f6..763bc06acb940267c03b38444c531a3c3c2b0e45 100644 (file)
--- a/sercom/subcontrollers/alumno_inscripto/__init__.py
+++ b/sercom/subcontrollers/curso/alumno/__init__.py
@@ -44,12 +44,6 @@ class AlumnoInscriptoForm(W.TableForm):
 def get_cursos():
     return [(0, u'---')] + [(fk1.id, fk1.shortrepr()) for fk1 in Curso.select()]
 
 def get_cursos():
     return [(0, u'---')] + [(fk1.id, fk1.shortrepr()) for fk1 in Curso.select()]
 

-class AlumnoInscriptoFiltros(W.TableForm):
-    class Fields(W.WidgetsList):
-        cursoID = W.SingleSelectField(label=_(u'Curso'), options = get_cursos, validator = V.Int(not_empty=True))
-    fields = Fields()
-
-filtro = AlumnoInscriptoFiltros()

 form = AlumnoInscriptoForm()
 #}}}
 
 form = AlumnoInscriptoForm()
 #}}}
 


@@ -71,33 +65,36 @@ class AlumnoInscriptoController(controllers.Controller, identity.SecureResource)
     @paginate('records')
     def list(self, cursoID = 0):
         """List records in model"""
     @paginate('records')
     def list(self, cursoID = 0):
         """List records in model"""

-        vfilter = dict(cursoID = cursoID)
-        if int(cursoID) == 0:
-            r = cls.select()
+        cursoID = int(cursoID)
+        if cursoID == 0:
+            raise redirect('..')

         else:
             r = cls.select(cls.q.cursoID == cursoID)
         else:
             r = cls.select(cls.q.cursoID == cursoID)

-        return dict(records=r, name=name, namepl=namepl, form=filtro, vfilter=vfilter)
+        return dict(records=r, name=name, namepl=namepl, cursoid=cursoID)

 
     @expose(template='kid:%s.templates.notas' % __name__)
 
     @expose(template='kid:%s.templates.notas' % __name__)

-    def notas(self, id, **kw):
+    def notas(self, id, cursoID, **kw):

         """Edit record in model"""
         """Edit record in model"""

+        cursoID = int(cursoID)

         r = validate_get(id)
         r = validate_get(id)

-        return dict(name=name, namepl=namepl, record=r, form=form)
+        return dict(name=name, namepl=namepl, record=r, form=form, cursoid=cursoID)

 
     @validate(form=form)
     @error_handler(notas)
     @expose()
 
     @validate(form=form)
     @error_handler(notas)
     @expose()

-    def update(self, id, **kw):
+    def update(self, id, cursoID, **kw):

         """Save or create record to model"""
         """Save or create record to model"""

+        cursoID = int(cursoID)

         r = validate_set(id, kw)
         flash(_(u'El %s fue actualizado.') % name)
         r = validate_set(id, kw)
         flash(_(u'El %s fue actualizado.') % name)

-        raise redirect('../list')
+        raise redirect('../list/%d' % cursoID)

 
     @expose(template='kid:%s.templates.show' % __name__)
 
     @expose(template='kid:%s.templates.show' % __name__)

-    def show(self,id, **kw):
+    def show(self,id,cursoID, **kw):

         """Show record in model"""
         """Show record in model"""

+        cursoID = int(cursoID)

         r = validate_get(id)
         r = validate_get(id)

-        return dict(name=name, namepl=namepl, record=r)
+        return dict(name=name, namepl=namepl, record=r, cursoid=cursoID)

 
 #}}}
 
 
 #}}}
 

diff --git a/sercom/subcontrollers/alumno_inscripto/templates/__init__.py b/sercom/subcontrollers/curso/alumno/templates/__init__.py
similarity index 100%
rename from sercom/subcontrollers/alumno_inscripto/templates/__init__.py
rename to sercom/subcontrollers/curso/alumno/templates/__init__.py

diff --git a/sercom/subcontrollers/alumno_inscripto/templates/list.kid b/sercom/subcontrollers/curso/alumno/templates/list.kid
similarity index 70%
rename from sercom/subcontrollers/alumno_inscripto/templates/list.kid
rename to sercom/subcontrollers/curso/alumno/templates/list.kid
index fb2fd7c5750dd62dbea043818fac7204211a430a..73f1f997a4955aa0ed9fbb6b7615ea31635d78cc 100644 (file)
--- a/sercom/subcontrollers/alumno_inscripto/templates/list.kid
+++ b/sercom/subcontrollers/curso/alumno/templates/list.kid
@@ -1,16 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python from sercom.model import Grupo, AlumnoInscripto ?>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python from sercom.model import Grupo, AlumnoInscripto ?>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'../../../templates/master.kid'">
+    py:extends="'../../../../templates/master.kid'">

 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>list</title>
 </head>
 <body>
 
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>list</title>
 </head>
 <body>
 

-<h1>Administración de <span py:replace="namepl">Objetos</span></h1>
-
-<div py:replace="form(value=vfilter, action=tg.url('/alumno_inscripto/list'),  submit_text=_(u'Filtrar'))">Filtros</div>
+<h1>Alumnos</h1>

 
 <table class="list">
     <tr>
 
 <table class="list">
     <tr>


@@ -22,12 +20,11 @@
     </tr>
     <tr py:for="record in records">
                                <td><a href="${tg.url('/curso/show/%d' % record.curso.id)}" py:content="record.curso.shortrepr()">curso</a></td>
     </tr>
     <tr py:for="record in records">
                                <td><a href="${tg.url('/curso/show/%d' % record.curso.id)}" py:content="record.curso.shortrepr()">curso</a></td>

-        <td><a href="${tg.url('/alumno/show/%d' % record.alumno.id)}" py:content="record.alumno.shortrepr()">alumno</a></td>
+        <td><a href="${tg.url('/curso/alumno/show/%d' % record.alumno.id)}" py:content="record.alumno.shortrepr()">alumno</a></td>

         <td><span py:replace="record.condicional">fecha corregido</span></td>
         <td><a py:if="record.tutor" href="${tg.url('/docente/show/%d' % record.tutor.id)}" py:content="record.tutor.shortrepr()">Tutor</a></td>
                                <td>
         <td><span py:replace="record.condicional">fecha corregido</span></td>
         <td><a py:if="record.tutor" href="${tg.url('/docente/show/%d' % record.tutor.id)}" py:content="record.tutor.shortrepr()">Tutor</a></td>
                                <td>

-                                       <a href="${tg.url('/alumno_inscripto/show/%d' % record.id)}">Ver</a>
-                                       <a href="${tg.url('/alumno_inscripto/notas/%d' % record.id)}">Notas</a>
+                                       <a href="${tg.url('/curso/alumno/notas/%d/%d' % (record.id, cursoid))}">Notas</a>

                                </td>
     </tr>
 </table>
                                </td>
     </tr>
 </table>

diff --git a/sercom/subcontrollers/alumno_inscripto/templates/show.kid b/sercom/subcontrollers/curso/alumno/templates/show.kid
similarity index 91%
rename from sercom/subcontrollers/alumno_inscripto/templates/show.kid
rename to sercom/subcontrollers/curso/alumno/templates/show.kid
index b3b9bdb85d1968d7525c2e155d1a45fbcf21b302..9556a5975ac9ebcf6fc1396cb1cd6b0723ad79c7 100644 (file)
--- a/sercom/subcontrollers/alumno_inscripto/templates/show.kid
+++ b/sercom/subcontrollers/curso/alumno/templates/show.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"

-    py:extends="'../../../templates/master.kid'">
+    py:extends="'../../../../templates/master.kid'">

 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>show</title>
 <head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
 <title>show</title>


@@ -67,8 +67,7 @@
 </table>
 
 <br/>
 </table>
 
 <br/>

-<a href="${tg.url('/alumno/edit/%d' % record.id)}">Editar</a> |
-<a href="${tg.url('/alumno/list')}">Volver</a>
+<a href="${tg.url('/curso/alumno/list')}">Volver</a>

 
 </body>
 </html>
 
 </body>
 </html>

diff --git a/sercom/subcontrollers/curso/templates/list.kid b/sercom/subcontrollers/curso/templates/list.kid
index 059c7d3b519c226ce9852ffcef20762fa80ebd20..005d41d2cbfc6619f97a69455802bfa644df6c67 100644 (file)
--- a/sercom/subcontrollers/curso/templates/list.kid
+++ b/sercom/subcontrollers/curso/templates/list.kid
@@ -32,7 +32,7 @@
         <td><span py:replace="record.anio">anio</span></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><span py:replace="record.anio">anio</span></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.alumnos)"  href="${tg.url('/curso/alumno/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/%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>
         <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>

diff --git a/sercom/subcontrollers/grupo/templates/show.kid b/sercom/subcontrollers/grupo/templates/show.kid
index 6bacb0a936460301d81d240fb8c2dab09fd2286b..3d593d116a6698918b9ddba9125b72d989721301 100644 (file)
--- a/sercom/subcontrollers/grupo/templates/show.kid
+++ b/sercom/subcontrollers/grupo/templates/show.kid
@@ -33,7 +33,7 @@
         <th>Integrantes:</th>
                                <td>
                                        <span py:for="a in record.miembros">
         <th>Integrantes:</th>
                                <td>
                                        <span py:for="a in record.miembros">

-                                               <a href="${tg.url('/alumno_inscripto/show/%d' % a.alumno.id)}" py:content="a.alumno.shortrepr()" />
+                                               <a href="${tg.url('/curso/alumno/show/%d/%d' % (a.alumno.id, a.alumno.curso.id))}" py:content="a.alumno.shortrepr()" />

                                                <br />
                                        </span>         
                                </td>
                                                <br />
                                        </span>         
                                </td>