From d1827529a6d3f5ae75dd7016d2ec4136c2cb6cd5 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Fri, 24 Jan 2014 18:07:10 +0100
Subject: [PATCH] =?UTF-8?q?export=20adh=C3=A9rent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/sheets/index.xls.erb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/sheets/index.xls.erb b/app/views/admin/sheets/index.xls.erb
index 2f7f953..fc5f58c 100644
--- a/app/views/admin/sheets/index.xls.erb
+++ b/app/views/admin/sheets/index.xls.erb
@@ -27,6 +27,9 @@
 		   <Cell><Data ss:Type="String"> Dernier renouvellement </Data></Cell>
 		   <Cell><Data ss:Type="String"> Création de la fiche </Data></Cell>
 		    <Cell><Data ss:Type="String"> mise à jour</Data></Cell>
+        <Cell><Data ss:Type="String"> Paiement pour 2013</Data></Cell>
+        <Cell><Data ss:Type="String"> Type d'adhésion pour 2013</Data></Cell>
+        <Cell><Data ss:Type="String"> Pouvoirs pour 2013</Data></Cell>
 		  
 		
 
@@ -65,7 +68,18 @@
 		  <Cell><Data ss:Type="String"><%= sheet.last_year %></Data></Cell>
 		  <Cell><Data ss:Type="String"><%= l sheet.created_at %></Data></Cell>
 		  <Cell><Data ss:Type="String"><%= l sheet.updated_at %></Data></Cell>
-		   
+      <% if sheet.sheet_years.where(:year => 2013).first %>
+      <% sy = sheet.sheet_years.where(:year => 2013).first %>
+      
+		  <Cell><Data ss:Type="String"><%= l(sy.paid_at) if sy.paid_at %></Data></Cell>
+		  <Cell><Data ss:Type="String"><%= SheetYear::JOIN_TYPE[sy.join_type] %></Data></Cell>
+		  <Cell><Data ss:Type="String"><%= sy.join_type == 1 ? 1 : 2 %></Data></Cell>
+      
+      <% else %>
+  	 	 <%3.times do %>
+  		  	<Cell><Data ss:Type="String"></Data></Cell>
+  		  <%end%>
+      <% end %>
  		 
       
       </Row>