Commit 45b591e1 authored by Hussain Kashef's avatar Hussain Kashef

added dates of engagement in volunteers

parent 2b96b4c2
Pipeline #50628 failed with stage
in 45 minutes and 37 seconds
......@@ -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)
td = l(volunteer.resigned_at.to_date) if volunteer.resigned_at
\ No newline at end of file
......@@ -29,7 +29,9 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
t_attr(:updated_at),
t_attr(:assignment_count),
t_attr(:waive_alternative),
t_attr(:intro_course)
t_attr(:intro_course),
t_attr(:accepted_at),
t_attr(:resigned_at)
]
......@@ -42,6 +44,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
sheet.add_row [
volunteer.id,
t("salutation.#{volunteer.salutation}"),
......@@ -62,7 +66,9 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
l(volunteer.updated_at.localtime),
volunteer.assignments.count,
volunteer.waive,
volunteer.intro_course
volunteer.intro_course,
volunteer.accepted_at.to_date,
resigned_at
], types: cell_types, style: cell_styles
end
end
......@@ -34,7 +34,9 @@ class VolunteersXlsxExportTest < ActionDispatch::IntegrationTest
'Aktualisiert am',
'Anzahl begleitungen',
'Spesenverzicht',
'Einführungskurs besucht'
'Einführungskurs besucht',
'Akzeptiert am',
'Beendet am'
)
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment