...
  View open merge request
Commits (3)
......@@ -26,6 +26,8 @@
th= t_attr(:comments)
th= sort_link @q, :external
th= sort_link @q, :created_at, t_attr(:created_at)
th= sort_link @q, :accepted_at, t_attr(:accepted_at)
th= sort_link @q, :resigned_at, t_attr(:resigned_at)
tbody
= render volunteers
......
......@@ -52,3 +52,5 @@ tr id=(dom_id(volunteer))
= td_truncate_content_modal(volunteer.comments, 'Bemerkungen')
td = volunteer.external? ? t_attr(:external, Volunteer) : t_attr(:internal, Volunteer)
td = l(volunteer.created_at.to_date)
td = l(volunteer.accepted_at.to_date) if volunteer.accepted_at
td = l(volunteer.resigned_at.to_date) if volunteer.resigned_at
\ No newline at end of file
......@@ -30,7 +30,9 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
t_attr(:assignment_count),
t_attr(:group_assignment_count),
t_attr(:waive_alternative),
t_attr(:intro_course)
t_attr(:intro_course),
t_attr(:accepted_at),
t_attr(:resigned_at)
]
......@@ -43,6 +45,8 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
cell_styles[6] = postal_code
@volunteers.each do |volunteer|
contact = volunteer.contact
resigned_at = volunteer.resigned_at.to_date if volunteer.resigned_at
accepted_at = volunteer.accepted_at.to_date if volunteer.accepted_at
sheet.add_row [
volunteer.id,
t("salutation.#{volunteer.salutation}"),
......@@ -64,7 +68,9 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
volunteer.assignments.count,
volunteer.group_assignments.count,
volunteer.waive,
volunteer.intro_course
volunteer.intro_course,
accepted_at,
resigned_at
], types: cell_types, style: cell_styles
end
end
......@@ -3,7 +3,7 @@ require 'selenium/webdriver'
Capybara.register_driver :chrome_headless do |app|
chrome_options = {
chromeOptions: { args: %w[headless disable-gpu no-sandbox window-size=1600x2000] }
chromeOptions: { args: %w[headless disable-gpu no-sandbox window-size=1600x2000], w3c: false }
}
capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(chrome_options)
Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: capabilities)
......
......@@ -35,7 +35,9 @@ class VolunteersXlsxExportTest < ActionDispatch::IntegrationTest
'Anzahl begleitungen',
'Anzahl Gruppenangebote',
'Spesenverzicht',
'Einführungskurs besucht'
'Einführungskurs besucht',
'Akzeptiert am',
'Beendet am'
)
end
......