Bugfix: la carga masiva de alumnos guardaba el password sin encriptar.

[z.facultad/75.52/sercom.git] / sercom / subcontrollers / curso / __init__.py

diff --git a/sercom/subcontrollers/curso/__init__.py b/sercom/subcontrollers/curso/__init__.py
index 0528def2609a34c60f8702eb7139d7f2db40549d..d73b01beb5aac2c6e37c6bfa572b298f3fc8a838 100644 (file)
--- a/sercom/subcontrollers/curso/__init__.py
+++ b/sercom/subcontrollers/curso/__init__.py
@@ -104,17 +104,8 @@ def validate_del(id):
     return val.validate_del(cls, name, id)
 #}}}
 
     return val.validate_del(cls, name, id)
 #}}}
 

-def get_ejercicios():
-    return [(fk1.id, fk1.shortrepr()) for fk1 in Ejercicio.select()]
-

 def get_docentes():
 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
 
 
 #{{{ Formulario


@@ -229,20 +220,10 @@ class CursoController(controllers.Controller, identity.SecureResource):
     def edit(self, id, **kw):
         """Edit record in model"""
         r = validate_get(id)
     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
         # 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)
 
     @validate(form=form)
     @error_handler(edit)


@@ -323,7 +304,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
                 try:
                     u.email = row[2]
                     u.telefono = row[3]
                 try:
                     u.email = row[2]
                     u.telefono = row[3]

-                    u.contrasenia = row[0]
+                    u.password = row[0]

                     u.activo = True
                     curso.add_alumno(u)
                     ok.append(row)
                     u.activo = True
                     curso.add_alumno(u)
                     ok.append(row)


@@ -372,7 +353,7 @@ class CursoController(controllers.Controller, identity.SecureResource):
                         if c[0].nota > 7:
                             correctas += 1
                     else:
                         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
             col["EA"] = correctas
             col["NP"] = i.nota_practica
             col["NF"] = i.nota_final


@@ -427,7 +408,6 @@ class CursoController(controllers.Controller, identity.SecureResource):
         s = ",".join(cols) + "\n"
         for i in rows:
             s = s + ",".join(i) + "\n"
         s = ",".join(cols) + "\n"
         for i in rows:
             s = s + ",".join(i) + "\n"

-        

         return s
 #}}}
 
         return s
 #}}}