X-Git-Url: https://git.llucax.com/software/sercom.git/blobdiff_plain/4e6b923c794b124aebd39d5e62ec0f5e770b8c2d..a6c473f24950a49e8af6caf1cd19759d7e0dc2ad:/sercom/subcontrollers/curso/__init__.py?ds=inline

diff --git a/sercom/subcontrollers/curso/__init__.py b/sercom/subcontrollers/curso/__init__.py
index 62dc1cc..3ad2133 100644
--- a/sercom/subcontrollers/curso/__init__.py
+++ b/sercom/subcontrollers/curso/__init__.py
@@ -16,6 +16,7 @@ from sqlobject import *
 from sqlobject.dberrors import *
 from sercom.widgets import *
 from alumno import AlumnoInscriptoController
+from grupo import GrupoController
 #}}}
 
 #{{{ Configuración
@@ -103,17 +104,8 @@ def validate_del(id):
     return val.validate_del(cls, name, id)
 #}}}
 
-def get_ejercicios():
-    return [(fk1.id, fk1.shortrepr()) for fk1 in Ejercicio.select()]
-
 def get_docentes():
-    return [(fk1.id, fk1.shortrepr()) for fk1 in Docente.select()]
-
-def get_alumnos():
-    return [(fk1.id, fk1.shortrepr()) for fk1 in Alumno.select()]
-
-def get_grupos():
-    return [(fk1.id, fk1.shortrepr()) for fk1 in Grupo.select()]
+    return [(fk1.id, fk1.shortrepr()) for fk1 in Docente.selectBy(activo=True)]
 
 
 #{{{ Formulario
@@ -170,6 +162,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
     require = identity.has_permission('admin')
     curso_alumno = CursoAlumnoController()
     alumno = AlumnoInscriptoController()
+    grupo = GrupoController()
 
     @expose()
     def default(self, tg_errors=None):
@@ -227,20 +220,10 @@ class CursoController(controllers.Controller, identity.SecureResource):
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)
-        class EmptyClass:
-            pass
-        values = EmptyClass()
-        values.id = r.id
-        values.anio = r.anio
-        values.numero = r.numero
-        values.cuatrimestre = r.cuatrimestre
-        values.cursoID = r.id
-        values.descripcion = r.descripcion
         # cargo la lista con los docentes asignados al curso
-        values.docentes_to = [{"id":d.docente.id, "label":d.docente.shortrepr()} for d in DocenteInscripto.selectBy(curso=r.id)]
-        values.alumnos_inscriptos = [{"id":a.alumno.id, "label":a.alumno.shortrepr()} for a in AlumnoInscripto.selectBy(curso=r.id)]
-
-        return dict(name=name, namepl=namepl, record=values, form=form)
+        r.docentes_to = [{"id":d.docente.id, "label":d.docente.shortrepr()} for d in r.docentes]
+        r.alumnos_inscriptos = [{"id":a.alumno.id, "label":a.alumno.shortrepr()} for a in r.alumnos]
+        return dict(name=name, namepl=namepl, record=r, form=form)
 
     @validate(form=form)
     @error_handler(edit)
@@ -370,7 +353,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
                         if c[0].nota > 7:
                             correctas += 1
                     else:
-                        col["E"+str(ej.numero)+str(ins.numero)] = "" 
+                        col["E"+str(ej.numero)+str(ins.numero)] = ""
             col["EA"] = correctas
             col["NP"] = i.nota_practica
             col["NF"] = i.nota_final
@@ -425,7 +408,6 @@ class CursoController(controllers.Controller, identity.SecureResource):
         s = ",".join(cols) + "\n"
         for i in rows:
             s = s + ",".join(i) + "\n"
-        
         return s
 #}}}