Commit b90c6a39 authored by Tugce Nur Tas's avatar Tugce Nur Tas Committed by Tuğçe Nur Taş
Browse files

better description for voluntary work expirence and remove conditional

parent 9c424dbe
......@@ -46,7 +46,7 @@
.col-xs-12
= f.input :experience
.col-xs-12
= conditional_field f, :volunteer_experience_desc, :experience
= f.input :volunteer_experience_desc
h3= t('volunteer_engagement_type_will')
.row
......
......@@ -43,7 +43,10 @@
td= @volunteer.motivation
tr
td= t_attr(:experience)
td= Volunteer.human_boolean(@volunteer.experience)
td
dl.dl-horizontal
dt= Volunteer.human_boolean(@volunteer.experience)
dd= @volunteer.volunteer_experience_desc if @volunteer.volunteer_experience_desc.present?
tr
td= t_attr(:expectations)
td= @volunteer.expectations
......
......@@ -144,7 +144,7 @@ de:
strengths: Stärken
teenagers: Jugendliche
training: Bildung
volunteer_experience_desc: Erläuterung der Erfahrungen mit FW-Arbeit
volunteer_experience_desc: Falls sie bereits Erfahrungen mit Freiwilligenarbeit haben, bitte diese genauer erläutern.
woman: Frau
working_percent: Stellenprozent
zip: Postleitzahl
......@@ -494,7 +494,7 @@ de:
role: Rolle
volunteer:
expectations: Was erwarten Sie von einer Person, die Sie begleiten würden / Ihrem Freiwilligeneinsatz?
experience: Haben Sie bereits Erfahrung mit FW-Arbeit?
experience: Bitte ankreuzen falls Sie bereits Erfahrungen mit Freiwilligenarbeit haben.
interests: Welche sind Ihre wichtigsten Freizeitinteressen?
motivation: Was ist Ihre Motivation, Freiwilligenarbeit mit Migrant/innen zu leisten?
region: In welcher Region können Sie sich Ihren Einsatz vorstellen?
......
......@@ -45,6 +45,7 @@ en:
single_accompaniment: Single accompaniment
sport: Sport
training: Training
volunteer_experience_desc: If you have any experiences with voluntary work, please describe any further here.
woman: Woman
working_percent: Employment rate (in Percent)
volunteer_email:
......@@ -65,7 +66,7 @@ en:
volunteer: Volunteer
volunteer_application: Volunteer Registration
volunteer_email: Confirmation email
volunteer_experience_desc: Description of voluntary experience
volunteer_experience_desc: If you have any experiences with voluntary work, please describe any further here.
add_entry: Add entry
add_journal_entry: Write a journal entry
add_language: Add language
......@@ -345,7 +346,7 @@ en:
labels:
volunteer:
expectations: What do you expect from a person who would accompany you / your volunteer work?
experience: Do you already have experience with voluntary work?
experience: Please check this field if you already have some experience with voluntary work.
interests: What are your most important leisure interests?
motivation: What is your motivation to volunteer with migrants?
region: In which region can you imagine your employment?
......
......@@ -38,6 +38,7 @@ class VolunteerApplicationsTest < ApplicationSystemTestCase
fill_in 'Education', with: 'Gurke'
fill_in 'What is your motivation to volunteer with migrants?', with: 'asfd'
page.check('volunteer_experience')
fill_in 'If you have any experiences with voluntary work, please describe any further here.', with: 'sdfsdfsdf'
fill_in 'What do you expect from a person who would accompany you / your volunteer work?', with: 'asdf'
fill_in 'Where do you see your strengths? (Social competencies that you could contribute to voluntary work)', with: 'asdf'
fill_in 'What are your most important leisure interests?', with: 'asdf'
......@@ -63,13 +64,4 @@ class VolunteerApplicationsTest < ApplicationSystemTestCase
visit new_volunteer_application_path
assert_not page.has_text? 'State'
end
test 'hidden conditional field is shown on checkbox checked' do
visit new_volunteer_application_path
refute page.has_field? 'Volunteer experience desc'
page.check('volunteer_experience')
assert page.has_field? 'Volunteer experience desc'
page.uncheck('volunteer_experience')
refute page.has_field? 'Volunteer experience desc'
end
end
......@@ -58,20 +58,6 @@ class VolunteersTest < ApplicationSystemTestCase
end
end
test 'hidden conditional field is shown on checkbox checked' do
visit new_volunteer_path
page.check('volunteer_experience')
assert page.has_field? 'Volunteer experience desc'
page.uncheck('volunteer_experience')
refute page.has_field? 'Volunteer experience desc'
end
test 'hidden conditional field is shown if edited volunteer checkbox is checked' do
volunteer = create :volunteer, experience: true
visit edit_volunteer_path(volunteer)
assert page.has_field? 'Volunteer experience desc'
end
test 'conditional field for radio button is shown on radio chosen' do
visit new_volunteer_path
refute page.has_field? 'volunteer_region_specific'
......
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