Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
c950efd7
Commit
c950efd7
authored
Nov 14, 2018
by
Tugce Nur Tas
Browse files
truncate semester_feedback on spv_index
parent
47e66be3
Pipeline
#30790
passed with stage
in 36 minutes and 38 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/models/semester_process_volunteer.rb
View file @
c950efd7
...
...
@@ -66,4 +66,8 @@ class SemesterProcessVolunteer < ApplicationRecord
subject:
semester_process
.
mail_subject_template
,
body:
semester_process
.
mail_body_template
)
end
def
render_feedback
(
field
)
semester_feedbacks
.
map
(
&
field
).
join
(
', '
)
end
end
app/views/semester_process_volunteers/index.html.slim
View file @
c950efd7
...
...
@@ -13,6 +13,10 @@ h1= t_title(:index)
th
Freiwilige/r
th
Einsätze
th
Missions
th
Ziele
th
Erfolge
th
Zukunft
th
Bemerkungen
th
=
t_attr
(
:commited_by
)
th
Letzte
Bestätigung
...
...
@@ -29,6 +33,10 @@ h1= t_title(:index)
td
=
link_to_if
policy
(
Volunteer
).
edit?
,
spv
.
volunteer
.
contact
.
full_name
,
edit_volunteer_path
(
spv
.
volunteer
)
td
=
spv
.
semester_t
td
=
render_missions
(
spv
)
=
td_truncate_content_modal
(
spv
.
render_feedback
(
:goals
),
'Ziele'
,
shorten_size:
300
)
=
td_truncate_content_modal
(
spv
.
render_feedback
(
:achievements
),
'Erfolge'
,
shorten_size:
300
)
=
td_truncate_content_modal
(
spv
.
render_feedback
(
:future
),
'Zukunft'
,
shorten_size:
300
)
=
td_truncate_content_modal
(
spv
.
render_feedback
(
:comments
),
'Bemerkungen'
,
shorten_size:
300
)
td
=
spv
.
commited_by
td
=
spv
.
commited_at
&&
l
(
spv
.
commited_at
)
...
...
test/system/semester_feedback_test.rb
View file @
c950efd7
...
...
@@ -13,6 +13,20 @@ class SemesterFeedbackTest < ApplicationSystemTestCase
visit
review_semester_semester_process_volunteer_path
(
@subject_volunteer
)
end
def
submit_feedback
(
semester_process_volunteer
)
visit
review_semester_semester_process_volunteer_path
(
semester_process_volunteer
)
fill_in_required_feedback_fields
check
'Ich verzichte auf die Auszahlung von Spesen.'
click_on
'Bestätigen'
,
match: :first
semester_process_volunteer
.
reload
end
def
fill_in_required_feedback_fields
fill_in
'Was waren die wichtigsten Inhalte (oder Ziele) Ihres Einsatzes in den letzten Monaten?'
,
with:
'being on time'
fill_in
'Was konnte in den letzten Monaten erreicht werden?'
,
with:
'everything'
fill_in
'Soll der Einsatz weiterlaufen und wenn ja, mit welchen Inhalten (Zielen)?'
,
with:
'continue'
end
test
'volunteer with unsubmitted feedback should see a warning'
do
second_spv
=
create
(
:semester_process_volunteer
,
:with_mission
,
volunteer:
@volunteer
,
semester_process:
@subject
)
...
...
@@ -85,17 +99,41 @@ class SemesterFeedbackTest < ApplicationSystemTestCase
assert_equal
@subject_volunteer
.
hours
.
last
.
hours
,
33
end
def
submit_feedback
(
semester_process_volunteer
)
visit
review_semester_semester_process_volunteer_path
(
semester_process_volunteer
)
fill_in_required_feedback_fields
test
'truncate_modal_shows_all_text'
do
goals
=
FFaker
::
Lorem
.
paragraph
(
20
)
achievements
=
FFaker
::
Lorem
.
paragraph
(
20
)
future
=
FFaker
::
Lorem
.
paragraph
(
20
)
comments
=
FFaker
::
Lorem
.
paragraph
(
20
)
@superadmin
=
create
:user
login_as
@superadmin
visit
review_semester_semester_process_volunteer_path
(
@subject_volunteer
)
fill_in
'Was waren die wichtigsten Inhalte (oder Ziele) Ihres Einsatzes in den letzten Monaten?'
,
with:
goals
fill_in
'Was konnte in den letzten Monaten erreicht werden?'
,
with:
achievements
fill_in
'Soll der Einsatz weiterlaufen und wenn ja, mit welchen Inhalten (Zielen)?'
,
with:
future
fill_in
'Kommentare'
,
with:
comments
# submit feedback without revisiting review form
check
'Ich verzichte auf die Auszahlung von Spesen.'
click_on
'Bestätigen'
,
match: :first
semester_process
_volunteer
.
reload
end
@subject
_volunteer
.
reload
visit
semester_process_volunteers_path
def
fill_in_required_feedback_fields
fill_in
'Was waren die wichtigsten Inhalte (oder Ziele) Ihres Einsatzes in den letzten Monaten?'
,
with:
'being on time'
fill_in
'Was konnte in den letzten Monaten erreicht werden?'
,
with:
'everything'
fill_in
'Soll der Einsatz weiterlaufen und wenn ja, mit welchen Inhalten (Zielen)?'
,
with:
'continue'
page
.
find
(
'td'
,
text:
goals
.
truncate
(
300
)).
click
assert
page
.
has_text?
goals
click_button
'Schliessen'
page
.
find
(
'td'
,
text:
achievements
.
truncate
(
300
)).
click
assert
page
.
has_text?
achievements
click_button
'Schliessen'
page
.
find
(
'td'
,
text:
future
.
truncate
(
300
)).
click
assert
page
.
has_text?
future
click_button
'Schliessen'
page
.
find
(
'td'
,
text:
comments
.
truncate
(
300
)).
click
assert
page
.
has_text?
comments
click_button
'Schliessen'
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment