From 6cca1806c88f675940161b6b452301532badc78c Mon Sep 17 00:00:00 2001
From: Ricardo Markiewicz <rmarkie@fi.uba.ar>
Date: Tue, 13 Mar 2007 01:12:45 +0000
Subject: [PATCH] fixeo cambios en clases del modelo que pinchaban la vista

---
 sercom/subcontrollers/correccion/__init__.py  |  4 ---
 .../correccion/templates/entregas.kid         | 23 +++------------
 .../correccion/templates/show.kid             | 29 +++++++++----------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/sercom/subcontrollers/correccion/__init__.py b/sercom/subcontrollers/correccion/__init__.py
index 26921cb..20b3ea0 100644
--- a/sercom/subcontrollers/correccion/__init__.py
+++ b/sercom/subcontrollers/correccion/__init__.py
@@ -116,10 +116,6 @@ class CorreccionController(controllers.Controller, identity.SecureResource):
     def show(self,id, **kw):
         """Show record in model"""
         r = validate_get(id)
-        if r.observaciones is None:
-            r.obs = ''
-        else:
-            r.obs = publish_parts(r.observaciones, writer_name='html')['html_body']
         return dict(name=name, namepl=namepl, record=r)
 
     @expose(template='kid:%s.templates.entregas' % __name__)
diff --git a/sercom/subcontrollers/correccion/templates/entregas.kid b/sercom/subcontrollers/correccion/templates/entregas.kid
index 63e8bed..8808869 100644
--- a/sercom/subcontrollers/correccion/templates/entregas.kid
+++ b/sercom/subcontrollers/correccion/templates/entregas.kid
@@ -15,7 +15,7 @@
 				<th width="20%">Fecha</th>
         <th width="5%" title="Correcta?">Ok?</th>
         <th width="25%">Observaciones</th>
-        <th width="50%">Tareas Ejecutadas</th>
+        <th width="50%">Comandos Ejecutadas</th>
     </tr>
     <tr py:for="record in records">
         <td><span py:replace="record.fecha">usuario</span></td>
@@ -24,24 +24,9 @@
 				</td>
         <td><span py:replace="record.observaciones">fecha corregido</span></td>
 				<td>
-					<table width="100%;">
-						<tr>
-							<th><strong>Tarea</strong></th>
-							<th><strong>Desde</strong></th>
-							<th><strong>Hasta</strong></th>
-							<th><strong>Correcta</strong></th>
-							<th><strong>Obs</strong></th>
-						</tr>
-						<tr py:for="i in record.tareas">
-							<td >${i.tarea.shortrepr()}</td>
-							<td>${i.inicio}</td>
-							<td>${i.fin}</td>
-							<td align="center">
-								<span py:replace="tg.strbool(i.exito)">Si</span>
-							</td>
-							<td>${i.observaciones}</td>
-						</tr>
-					</table>
+						<ul>
+							<li py:for="i in record.comandos_ejecutados" py:content="i.shortrepr()" />
+						</ul>
 				</td>
     </tr>
 </table>
diff --git a/sercom/subcontrollers/correccion/templates/show.kid b/sercom/subcontrollers/correccion/templates/show.kid
index 0458e7f..c38f552 100644
--- a/sercom/subcontrollers/correccion/templates/show.kid
+++ b/sercom/subcontrollers/correccion/templates/show.kid
@@ -9,38 +9,37 @@
 
 <table class="show">
     <tr>
-        <th>Padrón:</th>
-        <td><span py:replace="record.padron">padrón</span></td>
+        <th>Instancia de Entrega:</th>
+        <td><span py:replace="record.instancia.shortrepr()">record.padrón</span></td>
     </tr>
     <tr>
-        <th>Nombre:</th>
-	<td><span py:replace="record.nombre">nombre</span></td>
+        <th>Entregador:</th>
+	<td><span py:replace="record.entregador">nombre</span></td>
     </tr>
     <tr>
-        <th>E-Mail:</th>
-	<td><span py:replace="record.email">email</span></td>
+        <th>Entrega:</th>
+	<td><span py:replace="record.entrega.shortrepr()">email</span></td>
     </tr>
     <tr>
-        <th>Teléfono:</th>
-	<td><span py:replace="record.telefono">telefono</span></td>
+        <th>Corrector:</th>
+	<td><span py:replace="record.corrector">telefono</span></td>
     </tr>
     <tr>
-        <th>Nota:</th>
-	<td><span py:replace="record.nota">nota</span></td>
+        <th>Corregido el:</th>
+	<td><span py:replace="record.corregido">nota</span></td>
     </tr>
     <tr>
-        <th>Activo:</th>
-	<td><span py:replace="record.activo">activo</span></td>
+        <th>Nota:</th>
+	<td><span py:replace="record.nota">activo</span></td>
     </tr>
     <tr>
         <th>Observaciones:</th>
-	<td><span py:replace="XML(record.obs)">observaciones</span></td>
+	<td><span py:replace="XML(record.observaciones)">observaciones</span></td>
     </tr>
 </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('/correccion/list')}">Volver</a>
 
 </body>
 </html>
-- 
2.43.0