Remove travel schedule from registration
(cherry picked from commit d18cc02f0185df39bb4213d8a63a955dfb433dcb) Re: https://github.com/openSUSE/osem/issues/2333
This commit is contained in:
parent
ab0ff0ff03
commit
7a04f3582f
16 changed files with 29 additions and 144 deletions
|
|
@ -30,8 +30,6 @@
|
|||
%th{ width: '0' } E-Mail
|
||||
%th{ width: '0' }
|
||||
%abbr{ title: 'Code of Conduct' } CoC
|
||||
%th{ width: '0' } Arrival
|
||||
%th{ width: '0' } Departure
|
||||
%th{ width: '0' } Actions
|
||||
%tbody
|
||||
|
||||
|
|
@ -81,22 +79,6 @@
|
|||
"className": "code-of-conduct text-center",
|
||||
"searchable": false
|
||||
},
|
||||
{
|
||||
"data": "arrival",
|
||||
"searchable": false,
|
||||
"render": function(data, type, row) {
|
||||
if (data) { return moment(data).format('ll LT'); }
|
||||
return '';
|
||||
}
|
||||
},
|
||||
{
|
||||
"data": "departure",
|
||||
"searchable": false,
|
||||
"render": function(data, type, row) {
|
||||
if (data) { return moment(data).format('ll LT'); }
|
||||
return '';
|
||||
}
|
||||
},
|
||||
{
|
||||
"data": null,
|
||||
"className": "actions",
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@ prawn_document(force_download: true, filename: @pdf_filename, page_layout: :land
|
|||
'Name',
|
||||
'Nickname',
|
||||
'Affiliation',
|
||||
'Email',
|
||||
'Arrival Date',
|
||||
'Departure Date']
|
||||
'Email']
|
||||
@conference.questions.each do |question|
|
||||
header_array << question.title
|
||||
end
|
||||
|
|
@ -19,8 +17,6 @@ prawn_document(force_download: true, filename: @pdf_filename, page_layout: :land
|
|||
row << registration.nickname
|
||||
row << registration.affiliation
|
||||
row << registration.email
|
||||
row << registration.arrival.to_s || ''
|
||||
row << registration.departure.to_s || ''
|
||||
|
||||
@conference.questions.each do |question|
|
||||
qa = registration.qanswers.find_by(question: question)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
wb = xlsx_package.workbook
|
||||
wb.add_worksheet(name: 'registrations') do |sheet|
|
||||
bold_style = wb.styles.add_style(b: true)
|
||||
row = ['Attended', 'Name', 'Nickname', 'Affilιation', 'Email', 'Arrival', 'Departure']
|
||||
row = ['Attended', 'Name', 'Nickname', 'Affilιation', 'Email']
|
||||
|
||||
@conference.questions.each do |question|
|
||||
row << question.title
|
||||
|
|
@ -18,8 +18,6 @@ wb.add_worksheet(name: 'registrations') do |sheet|
|
|||
row << registration.nickname
|
||||
row << registration.affiliation
|
||||
row << registration.email
|
||||
row << registration.arrival.to_s
|
||||
row << registration.departure.to_s
|
||||
@conference.questions.each do |question|
|
||||
qa = registration.qanswers.find_by(question: question)
|
||||
answer = ( qa ? qa.answer.title : '' )
|
||||
|
|
@ -30,4 +28,3 @@ wb.add_worksheet(name: 'registrations') do |sheet|
|
|||
sheet.add_row row
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
= render partial: 'devise/shared/sign_up_form_embedded'
|
||||
|
||||
= render partial: 'registration_info', locals: { f: f }
|
||||
= f.input :conference_id, as: :hidden, value: @conference.id
|
||||
.row
|
||||
.col-md-12
|
||||
%p.pull-right
|
||||
|
|
|
|||
|
|
@ -24,10 +24,4 @@
|
|||
(Scheduled on: #{event.time.to_date})
|
||||
%br
|
||||
|
||||
|
||||
|
||||
= f.inputs 'Your Travel Info' do
|
||||
= f.input :arrival, as: :string, label: 'Your arrival time', hint: "Leave blank if not sure", input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker',start_date: @conference.start_date,end_date: @conference.end_date }
|
||||
= f.input :departure, as: :string, label: 'Your departure time', hint: "Leave blank if not sure", input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker' }
|
||||
|
||||
= render 'conferences/code_of_conduct', organization: @conference.organization
|
||||
|
|
|
|||
|
|
@ -33,28 +33,6 @@
|
|||
data: { toggle: 'modal', target: '#modal-code-of-conduct'}
|
||||
= render 'conferences/code_of_conduct',
|
||||
organization: @conference.organization
|
||||
.row
|
||||
.col-md-12
|
||||
%h4
|
||||
%span.fa-stack
|
||||
%i.fa.fa-square-o.fa-stack-2x
|
||||
%i.fa.fa-plane.fa-stack-1x
|
||||
Travel Schedule
|
||||
%ul
|
||||
%li
|
||||
- if @registration.arrival.present?
|
||||
arrive at
|
||||
%strong
|
||||
= @registration.arrival.strftime('%A, %B %-d. %Y %H:%M')
|
||||
- else
|
||||
You haven't scheduled your arrival
|
||||
%li
|
||||
- if @registration.departure.present?
|
||||
depart at
|
||||
%strong
|
||||
= @registration.departure.strftime('%A, %B %-d. %Y %H:%M')
|
||||
- else
|
||||
You haven't scheduled your departure
|
||||
- if @conference.surveys.for_registration.any?
|
||||
.row
|
||||
.col-md-12
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue