Merge branch 'master' into test-fix

2026-08-13 19:54:02 +00:00 · 2017-11-08 09:32:19 -08:00 · 2017-11-08 09:32:19 -08:00 · 20b849d9ce
commit 20b849d9ce
parent 574ac63a05 aeded80a11
11 changed files with 99 additions and 24 deletions
--- a/app/models/event.rb
+++ b/app/models/event.rb
@ -204,11 +204,12 @@ class Event < ActiveRecord::Base
  end

  def speaker_names
-    result = Set.new
-    speakers.each do |speaker|
-      result.add(speaker.name)
-    end
-    result.to_a.to_sentence
+    speakers.map(&:name).join(', ')
+  end
+
+  # Returns emails of all the speaker belongs to a particular event
+  def speaker_emails
+    speakers.map(&:email).join(', ')
  end

  ##
--- a/app/views/admin/events/_all_events.csv.haml
+++ b/app/views/admin/events/_all_events.csv.haml
@ -4,6 +4,7 @@
             'Start time',
             'Submitter',
             'Speaker',
+             'Speaker Email',
             'Event Type',
             'Track',
             'Difficulty Level',
@ -12,8 +13,15 @@
 = CSV.generate_line ['All Events']
 = CSV.generate_line headers
 - @events.each do |event|
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")}#{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                       (event.track.present? ? event.track.name : ''),
                       (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state]).html_safe
--- a/app/views/admin/events/_all_events.pdf.prawn
+++ b/app/views/admin/events/_all_events.pdf.prawn
@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                  'Start time',
                  'Submitter',
                  'Speaker',
+                  'Speaker Email',
                  'Event Type',
                  'Track',
                  'Difficulty Level',
@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
@ -30,5 +32,5 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
  end

  pdf.text "#{@conference.short_title} Events", font_size: 25, align: :center
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]
 end
--- a/app/views/admin/events/_all_events.xlsx.axlsx
+++ b/app/views/admin/events/_all_events.xlsx.axlsx
@ -1,6 +1,18 @@
 wb.add_worksheet(name: 'all events') do |sheet|
  bold_style = wb.styles.add_style(b: true)
-  row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State']
+  wrap_text = wb.styles.add_style alignment: {wrap_text: true}
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State']
  sheet.add_row row, style: bold_style

  @events.each do |event|
@ -11,11 +23,13 @@ wb.add_worksheet(name: 'all events') do |sheet|
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
    row << (event.room.present? ? event.room.name : '')
    row << event.state
-    sheet.add_row row
+    sheet.add_row row , style: wrap_text
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
  end
 end
--- a/app/views/admin/events/_all_with_comments.csv.haml
+++ b/app/views/admin/events/_all_with_comments.csv.haml
@ -4,6 +4,7 @@
             'Start time',
             'Submitter',
             'Speaker',
+             'Speaker Email',
             'Event Type',
             'Track',
             'Difficulty Level',
@ -16,8 +17,17 @@
  - all_comments = ''
  - event.root_comments.each do |comment|
    - all_comments << "#{comment.created_at.strftime("%Y-%m-%d")} #{comment.created_at.strftime("%I:%M%p")}  #{comment.user.name}: #{comment.body}\n"
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")}#{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                       (event.track.present? ? event.track.name : ''),
                       (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state, all_comments]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state,
+                       all_comments]).html_safe
+
--- a/app/views/admin/events/_all_with_comments.pdf.prawn
+++ b/app/views/admin/events/_all_with_comments.pdf.prawn
@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                  'Start time',
                  'Submitter',
                  'Speaker',
+                  'Speaker Email',
                  'Event Type',
                  'Track',
                  'Difficulty Level',
@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
@ -31,7 +33,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:

  pdf.text "#{@conference.short_title} Events", font_size: 25, align: :center
  pdf.move_down 10
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1, position: :center}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1, position: :center},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]
  pdf.start_new_page
  pdf.text "#{@conference.short_title} Comments", font_size: 25, align: :center
  pdf.move_down 20
--- a/app/views/admin/events/_all_with_comments.xlsx.axlsx
+++ b/app/views/admin/events/_all_with_comments.xlsx.axlsx
@ -1,8 +1,20 @@
 wb.use_shared_strings = true
 wb.add_worksheet(name: 'events with comments') do |sheet|
-  bold_style = wb.styles.add_style(b: true )
+  bold_style = wb.styles.add_style(b: true)
  cell_style = wb.styles.add_style(alignment: { wrap_text: true, vertical: :top })
-row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State', 'Comments']
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State',
+         'Comments']
  sheet.add_row row, style: bold_style

  @events.each do |event|
@ -17,6 +29,7 @@ row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'E
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
@ -24,5 +37,6 @@ row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'E
    row << event.state
    row << all_comments.strip
    sheet.add_row row, style: cell_style
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
  end
 end
--- a/app/views/admin/events/_confirmed_events.csv.haml
+++ b/app/views/admin/events/_confirmed_events.csv.haml
@ -4,6 +4,7 @@
             'Start time',
             'Submitter',
             'Speaker',
+             'Speaker Email',
             'Event Type',
             'Track',
             'Difficulty Level',
@ -12,8 +13,15 @@
 = CSV.generate_line ["Confirmed Events"]
 = CSV.generate_line headers
 - @events.confirmed.each do |event|
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                       (event.track.present? ? event.track.name : ''),
                       (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state]).html_safe
--- a/app/views/admin/events/_confirmed_events.pdf.prawn
+++ b/app/views/admin/events/_confirmed_events.pdf.prawn
@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                  'Start time',
                  'Submitter',
                  'Speaker',
+                  'Speaker Email',
                  'Event Type',
                  'Track',
                  'Difficulty Level',
@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
@ -30,6 +32,6 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
  end

  pdf.text "#{@conference.short_title} Confirmed Events", font_size: 25, align: :center
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]

 end
--- a/app/views/admin/events/_confirmed_events.xlsx.axlsx
+++ b/app/views/admin/events/_confirmed_events.xlsx.axlsx
@ -1,6 +1,18 @@
 wb.add_worksheet(name: 'confirmed events') do |sheet|
  bold_style = wb.styles.add_style(b: true)
-  row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State']
+  wrap_text = wb.styles.add_style alignment: {wrap_text: true}
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State']
  sheet.add_row row, style: bold_style

  @events.confirmed.each do |event|
@ -11,11 +23,13 @@ wb.add_worksheet(name: 'confirmed events') do |sheet|
    row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
    row << event.submitter.name
    row << event.speaker_names
+    row << event.speaker_emails
    row << event.event_type.title
    row << (event.track.present? ? event.track.name : '')
    row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
    row << (event.room.present? ? event.room.name : '')
    row << event.state
-    sheet.add_row row
+    sheet.add_row row , style: wrap_text
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
  end
 end
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@ -362,7 +362,7 @@ describe Event do
        new_event.submitter = submitter
        new_event.speakers = [speaker1, speaker2]

-        expect(new_event.speaker_names).to eq 'user speaker 1 and user speaker 2'
+        expect(new_event.speaker_names).to eq 'user speaker 1, user speaker 2'
      end
    end
  end