actualizo data de test para que sea coherente

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

diff --git a/sercom/subcontrollers/alumno/__init__.py b/sercom/subcontrollers/alumno/__init__.py
index b3da1ad2da340a03c8f33bf662e1354f6152e92f..2eb418ff48e030729b77f967b284aa3064ffb093 100644 (file)
--- a/sercom/subcontrollers/alumno/__init__.py
+++ b/sercom/subcontrollers/alumno/__init__.py
@@ -10,7 +10,8 @@ from turbogears import identity
 from turbogears import paginate
 from docutils.core import publish_parts
 from sercom.subcontrollers import validate as val
-from sercom.model import Alumno
+from sercom.model import Alumno, Rol
+from sqlobject import *
 #}}}
 
 #{{{ Configuración
@@ -147,23 +148,51 @@ class AlumnoController(controllers.Controller, identity.SecureResource):
     def from_file(self):
         return dict()
 
-    @expose()
+    @expose(template='kid:%s.templates.import_results' % __name__)
     def from_file_add(self, archivo):
         """ Se espera :
              padron,nombre,email,telefono
         """
         import csv
         lines = archivo.file.read().split('\n')
+        ok = []
+        fail = []
+        entregador = Rol.get(2)
         for line in lines:
             for row in csv.reader([line]):
                 if row == []:
                     continue
-                print row[1]
-                u = Alumno(row[0], nombre=row[1])
-                u.email = row[2]
-                u.telefono = row[3]
-                u.contrasenia = row[0]
-                u.activo = True
-        raise redirect('./list')
+                try:
+                    u = Alumno(row[0], nombre=row[1])
+                    u.email = row[2]
+                    u.telefono = row[3]
+                    u.password = row[0]
+                    u.activo = True
+                    u.add_rol(entregador)
+                    ok.append(row)
+                except Exception, e:
+                    row.append(str(e))
+                    fail.append(row)
+        return dict(ok=ok, fail=fail)
+    
+    @expose('json')
+    def get_alumno(self, padron):
+        msg = u''
+        error=False
+        try:
+            # Busco el alumno inscripto
+            alumno = Alumno.byPadron(padron=padron)
+            msg = {}
+            msg['id'] = alumno.id
+            msg['value'] = alumno.shortrepr()
+        except SQLObjectNotFound:
+            msg = 'No existe el alumno con padron: %s.' % padron
+            error=True
+        except Exception, (inst):
+            msg = u"""Se ha producido un error inesperado al buscar el registro:\n      %s""" % str(inst)
+            error = True
+        return dict(msg=msg, error=error)
+
+   
 #}}}