Merge pull request #2471 from rahul2240/export

Fix broken export

Gemfile

@@ -134,7 +134,7 @@ gem 'country_select'
 
 # as PDF generator
 gem 'prawn-qrcode'
-gem 'prawn_rails'
+gem 'prawn-rails'
 gem 'rqrcode'
 
 # to render XLS spreadsheets

Gemfile.lock

@@ -364,9 +364,12 @@ GEM
     prawn-qrcode (0.3.1)
       prawn (>= 1)
       rqrcode (>= 0.4.1)
-    prawn_rails (0.0.11)
+    prawn-rails (1.2.0)
-      prawn (>= 0.11.1)
+      prawn
-      railties (>= 3.0.0)
+      prawn-table
+      rails (>= 3.1.0)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -669,7 +672,7 @@ DEPENDENCIES
   pg
   piwik_analytics (~> 1.0.1)
   prawn-qrcode
-  prawn_rails
+  prawn-rails
   puma (~> 3.0)
   rails (~> 5.0.7)
   rails-assets-bootstrap-markdown!

app/controllers/admin/booths_controller.rb

@@ -14,12 +14,12 @@ module Admin
         format.json { render json: Booth.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""
-          render 'booths'
+          render 'booths', layout: false
         end
-        format.pdf { render 'booths' }
+        format.pdf { render 'booths', layout: false }
         format.csv do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.csv\""
-          render 'booths'
+          render 'booths', layout: false
         end
       end
     end

app/controllers/admin/events_controller.rb

@@ -28,12 +28,12 @@ module Admin
         format.json { render json: Event.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""
-          render 'events'
+          render 'events', layout: false
         end
-        format.pdf { render 'events' }
+        format.pdf { render 'events', layout: false }
         format.csv do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.csv\""
-          render 'events'
+          render 'events', layout: false
         end
       end
     end

app/controllers/admin/registrations_controller.rb

@@ -15,12 +15,22 @@ module Admin
       @registration_distribution = @conference.registration_distribution
       @affiliation_distribution = @conference.affiliation_distribution
       @code_of_conduct = @conference.code_of_conduct.present?
+      @file_name = "registrations_for_#{@conference.short_title}"
 
       respond_to do |format|
         format.html
         format.json do
           render json: RegistrationDatatable.new(view_context, conference: @conference)
         end
+        format.pdf { render 'index', layout: false }
+        format.xlsx do
+          response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""
+          render 'index', layout: false
+        end
+        format.csv do
+          response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.csv\""
+          render 'index', layout: false
+        end
       end
     end
 

app/controllers/admin/tracks_controller.rb

@@ -19,12 +19,12 @@ module Admin
         format.json { render json: Track.where(state: :confirmed, program: @program).to_json }
         format.xlsx do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\""
-          render 'tracks'
+          render 'tracks', layout: false
         end
-        format.pdf { render 'tracks' }
+        format.pdf { render 'tracks', layout: false }
         format.csv do
           response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.csv\""
-          render 'tracks'
+          render 'tracks', layout: false
         end
       end
     end

app/views/admin/registrations/index.csv.haml

@@ -1,4 +1,16 @@
-- headers = ['Name', 'Email']
+- headers = ['Attended',
+             'Name',
+             'Nickname',
+             'Affilιation',
+             'Email',
+             'Arrival',
+             'Departure']
 = CSV.generate_line headers
 - @registrations.each do |registration|
-  = CSV.generate_line([registration.name, registration.email])
+  = CSV.generate_line([registration.attended ? 'X' : '',
+                       registration.name,
+                       registration.nickname,
+                       registration.affiliation,
+                       registration.email,
+                       registration.arrival.to_s,
+                       registration.departure.to_s])