From cbeb78fd7ebeff56a70a0d3c2524de1ccf7d30f4 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Wed, 13 Jul 2016 09:20:52 +0200
Subject: [PATCH] fix members full export

---
 .../api/members/export_members.xlsx.axlsx     | 46 +++++++------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/app/views/api/members/export_members.xlsx.axlsx b/app/views/api/members/export_members.xlsx.axlsx
index 2ce8740ca..6d3fe0060 100644
--- a/app/views/api/members/export_members.xlsx.axlsx
+++ b/app/views/api/members/export_members.xlsx.axlsx
@@ -19,46 +19,34 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet|
   # data rows
   @members.each do |member|
     data = [
-        member.id, member.profile.last_name, member.profile.first_name, member.email,
-        member.profile.gender ? t('export_members.man') : t('export_members.woman'),
-        member.profile.age,
-        member.profile.address ? member.profile.address.address : '',
-        member.profile.phone, member.profile.website, member.profile.job,
-        member.profile.interest, member.profile.software_mastered,
-        member.group.name,
+        member.id, member.profile.last_name, member.profile.first_name,
+        member.email, member.profile.gender ? t('export_members.man') : t('export_members.woman'), member.profile.age,
+        member.profile.address ? member.profile.address.address : '', member.profile.phone, member.profile.website,
+        member.profile.job, member.profile.interest, member.profile.software_mastered, member.group.name,
         (member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.plan.name : t('export_members.without_subscriptions'),
         (member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.expired_at.to_date : nil,
-        member.trainings.map(&:name).join("\n"), member.tags.map(&:name).join("\n"),
-        member.invoices.size,
-        member.projects.map(&:name).join("\n"),
-        member.profile.facebook || '', member.profile.twitter || '', member.profile.echosciences || ''
+        member.trainings.map(&:name).join("\n"), member.tags.map(&:name).join("\n"), member.invoices.size,
+        member.projects.map(&:name).join("\n"), member.profile.facebook || '', member.profile.twitter || '',
+        member.profile.echosciences || ''
     ]
     styles = [nil, nil, nil,
-              nil,
-              nil,
-              nil,
               nil, nil, nil,
-              nil, nil,
-              nil,
+              nil, nil, nil,
+              nil, nil, nil, nil,
               nil,
               date,
-              nil, nil,
-              nil,
-              nil,
-              nil, nil, nil]
+              nil, nil, nil,
+              nil, nil, nil,
+              nil]
     types = [:integer, :string, :string,
-             :string,
-             :string,
-             :integer,
+             :string, :string, :integer,
              :string, :string, :string,
-             :string, :string,
-             :string,
+             :string, :string, :string, :string,
              :string,
              :date,
-             :string, :string,
-             :integer,
-             :string,
-             :string, :string, :string]
+             :string, :string, :integer,
+             :string, :string, :string,
+             :string]
 
     sheet.add_row data, :style =>  styles, :types => types
   end