From 1aa48652e63b9fc1a29002ede8df2a1906b2d7bc Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Thu, 10 Sep 2015 00:43:35 -0300
Subject: [PATCH] adding more data in csv

---
 lib/juventude_plugin/people_job.rb | 7 ++++---
 lib/juventude_plugin/report_job.rb | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/juventude_plugin/people_job.rb b/lib/juventude_plugin/people_job.rb
index 392b625..7e8f62a 100644
--- a/lib/juventude_plugin/people_job.rb
+++ b/lib/juventude_plugin/people_job.rb
@@ -15,21 +15,22 @@ class JuventudePlugin::PeopleJob < JuventudePlugin::ReportJob
     people = Person.all
     filepath = "/tmp/#{report_path}/people.csv"
     CSV.open(filepath, 'w', {:col_sep => ';', :force_quotes => true} ) do |csv|
-      csv << ['Identificador', 'Nome', 'Email', 'Orientação Sexual', 'Identidade de Gênero', 'Transgenero', 'Raça', 'Estado', 'Cidade']
+      csv << ['Identificador','Criado em','Nome', 'Email', 'Orientação Sexual', 'Identidade de Gênero', 'Transgenero', 'Raça', 'Estado', 'Cidade']
       count = 0
       people.map do |person|
         count += 1
         puts "%s de %s: adicionando pessoa: %s" % [count, people.count, person.id ]
         info = []
         info.push(person.identifier)
+        info.push(person.created_at.strftime("%d/%m/%y %H:%M"))
         info.push(person.name)
         info.push(person.email)
         info.push(ORIENTACAO_SEXUAL[person.orientacao_sexual.to_i])
         info.push(GENERO[person.identidade_genero.to_i])
         info.push(person.transgenero)
         info.push(ETNIA[person.etnia.to_i])
-        info.push(person.city ? person.city.name : '')
-        info.push(person.state ? person.state.name : '')
+        info.push(person.city)
+        info.push(person.state)
         csv << info
       end
     end
diff --git a/lib/juventude_plugin/report_job.rb b/lib/juventude_plugin/report_job.rb
index 1aaab76..91838b2 100644
--- a/lib/juventude_plugin/report_job.rb
+++ b/lib/juventude_plugin/report_job.rb
@@ -33,7 +33,7 @@ class JuventudePlugin::ReportJob < Struct.new(:profile_id, :report_path)
     CSV.open(filepath, 'w', {:col_sep => ';', :force_quotes => true} ) do |csv|
       proposals = ProposalsDiscussionPlugin::Proposal.all
       count = 0
-      csv << ['Identificador','Criada em', 'Autor', 'Titulo', 'Proposta', 'Comentarios', 'Seguidores', 'Votos']
+      csv << ['Identificador','Criada em', 'Autor', 'Eixo', 'Titulo', 'Proposta', 'Comentarios', 'Seguidores', 'Votos', 'Cidade']
       proposals.map do |proposal|
         count += 1
         puts "%s de %s: adicionando proposta: %s" % [count, proposals.count, proposal.id ]
@@ -41,11 +41,13 @@ class JuventudePlugin::ReportJob < Struct.new(:profile_id, :report_path)
         info.push(proposal.id)
         info.push(proposal.created_at.strftime("%d/%m/%y %H:%M"))
         info.push(proposal.author ? proposal.author.identifier : '')
+        info.push(proposal.topic.name)
         info.push(proposal.title)
         info.push(proposal.abstract.present? ? proposal.abstract.gsub(/\s+/, ' ').strip : '')
         info.push(proposal.comments_count)
         info.push(proposal.followers.count)
         info.push(proposal.votes_for)
+        info.push(proposal.cities.map{|c|c.path}.join(','))
         csv << info
       end
     end
--
libgit2 0.21.2