# HG changeset patch
# User Nelo@Guinea.neluz.int
# Date 1312338325 10800
# Node ID c03c4920228062b32102b6b3cd4fb7ccff5cccb9
# Parent  19bab30521da728478711b5b44de932a7f69e14e# Parent  c99636fbdc5fdcf3d5012ee0eed074cf7db2f010
Merge

diff -r 19bab30521da -r c03c49202280 Agendas/trunk/src/Agendas.Web/Controllers/HistoricoController.cs
--- a/Agendas/trunk/src/Agendas.Web/Controllers/HistoricoController.cs	Tue Aug 02 23:24:19 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Controllers/HistoricoController.cs	Tue Aug 02 23:25:25 2011 -0300
@@ -21,7 +21,10 @@
 			            		               		Titulo = e.Titulo,
 			            		               		Fecha = e.Fecha.HasValue ? e.Fecha.Value.ToShortDateString() : string.Empty,
 			            		               		Wiki = e.UrlWiki,
-													Ponente = e.Ponente.Nombre
+													Ponente = e.Ponente.Nombre,
+                                                    Numero = e.NumeroOrden.ToString(),
+                                                    Tipo = e.Tipo.ToString(),
+                                                    Duracion = "0:00"
 			            		               	}
 			            	};
 			return View(model);
diff -r 19bab30521da -r c03c49202280 Agendas/trunk/src/Agendas.Web/Models/HistoricoModel.cs
--- a/Agendas/trunk/src/Agendas.Web/Models/HistoricoModel.cs	Tue Aug 02 23:24:19 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Models/HistoricoModel.cs	Tue Aug 02 23:25:25 2011 -0300
@@ -11,10 +11,13 @@
 	public class HistoricoDto
 	{
 		public string Id { get; set; }
+        public string Numero { get; set; }
+        public string Tipo { get; set; }
 		public string Titulo { get; set; }
 		public string Fecha { get; set; }
 		public string Wiki { get; set; }
 		public string Ponente { get; set; }
+		public string Duracion { get; set; }
 	}
 
 }
\ No newline at end of file
diff -r 19bab30521da -r c03c49202280 Agendas/trunk/src/Agendas.Web/Views/Historico/Index.cshtml
--- a/Agendas/trunk/src/Agendas.Web/Views/Historico/Index.cshtml	Tue Aug 02 23:24:19 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Historico/Index.cshtml	Tue Aug 02 23:25:25 2011 -0300
@@ -6,20 +6,24 @@
 <table>
     <thead>
         <tr>
+            <th>Nro.</th>
             <th>Fecha</th>
+            <th>Tipo</th>
             <th>Evento</th>
             <th>Ponente</th>
-            <th>Wiki</th>
+            <th>Duraci&oacute;n</th>
         </tr>
     </thead>
     <tbody>
         @foreach (var item in Model.Items)
         {
         <tr>
+            <td>@item.Numero</td>
             <td>@item.Fecha</td>
-            <td>@item.Titulo</td>
+            <td>@item.Tipo</td>
+            <td><a href="@item.Wiki">@item.Titulo</a></td>
             <td>@item.Ponente</td>
-            <td>@item.Wiki</td>
+            <td>@item.Duracion</td>
         </tr>
 		}
     </tbody>