From 93a288ddb4c0bd3034e7dee9dd93576206968e97 Mon Sep 17 00:00:00 2001
From: "Starlone (Estagiario)" <starlone>
Date: Tue, 3 May 2011 21:35:02 +0000
Subject: [PATCH] Adicionando pagina web e email no arquivo csv

---
 sigi/apps/casas/templates/casas/carrinho.html | 14 +++++++++++++-
 sigi/apps/casas/views.py                      | 10 +++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/sigi/apps/casas/templates/casas/carrinho.html b/sigi/apps/casas/templates/casas/carrinho.html
index c0a763d..690818e 100644
--- a/sigi/apps/casas/templates/casas/carrinho.html
+++ b/sigi/apps/casas/templates/casas/carrinho.html
@@ -146,6 +146,18 @@
 						value="Telefone" class="action-select" checked="checked" />
 					<label>Telefone</label>
 				</li>
+				<li>
+					<span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
+					<input type="checkbox" name="itens_csv_selected"
+						value="Página web" class="action-select" checked="checked" />
+					<label>Página Web</label>
+				</li>
+				<li>
+					<span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
+					<input type="checkbox" name="itens_csv_selected"
+						value="Email" class="action-select" checked="checked" />
+					<label>Email</label>
+				</li>
 			</ul>
 			</fieldset>
 			<ul class="botoes">
@@ -155,4 +167,4 @@
 	</div>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/sigi/apps/casas/views.py b/sigi/apps/casas/views.py
index 5bfd389..2bccf1c 100644
--- a/sigi/apps/casas/views.py
+++ b/sigi/apps/casas/views.py
@@ -258,8 +258,8 @@ def export_csv(request):
     
     if request.POST:
         atributos = request.POST.getlist("itens_csv_selected")
-        map(unicode,atributos)
-        csv_writer.writerow(atributos)        
+	atributos2 = [s.encode("utf-8") for s in atributos]
+        csv_writer.writerow(atributos2)        
         
     for casa in casas:
         lista = []
@@ -271,7 +271,7 @@ def export_csv(request):
             elif u"Nome" == atributo:
                 lista.append(casa.nome.encode("utf-8"))
             elif u"Município" == atributo:
-                lista.append(str(casa.municipio).encode("utf-8"))            
+                lista.append(str(casa.municipio))            
             elif u"Presidente" == atributo:
                 lista.append(casa.presidente.encode("utf-8"))
             elif u"Logradouro" == atributo:
@@ -282,6 +282,10 @@ def export_csv(request):
                 lista.append(casa.cep.encode("utf-8"))
             elif u"Telefone" == atributo:
                 lista.append(casa.telefone.encode("utf-8"))
+            elif u"Página web" == atributo:
+                lista.append(casa.pagina_web.encode("utf-8"))
+            elif u"Email" == atributo:
+                lista.append(casa.email.encode("utf-8"))
             else:
                 pass