Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
aoz-003
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
aoz-003
Commits
03b093f5
Commit
03b093f5
authored
Nov 23, 2018
by
Tugce Nur Tas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add activity field to additional hours on review form
parent
be95958a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/controllers/semester_process_volunteers_controller.rb
app/controllers/semester_process_volunteers_controller.rb
+1
-1
app/views/semester_process_volunteers/review_semester.html.slim
...ews/semester_process_volunteers/review_semester.html.slim
+3
-1
No files found.
app/controllers/semester_process_volunteers_controller.rb
View file @
03b093f5
...
...
@@ -101,7 +101,7 @@ class SemesterProcessVolunteersController < ApplicationController
params
.
require
(
:semester_process_volunteer
).
permit
(
volunteer_attributes:
[
:id
,
:waive
,
:iban
,
:bank
],
semester_feedbacks_attributes:
[[
semester_feedback:
[
:mission
,
:goals
,
:achievements
,
:future
,
:comments
,
:conversation
,
:spv_mission_id
]],
[
hour:
[
:hours
,
:spv_mission_id
]]]
[
hour:
[
:hours
,
:spv_mission_id
,
:activity
]]]
)
end
...
...
app/views/semester_process_volunteers/review_semester.html.slim
View file @
03b093f5
...
...
@@ -28,11 +28,13 @@
=
spvm
.
simple_fields_for
:hour
,
Hour
.
new
do
|
hf
|
=
hf
.
input
:spv_mission_id
,
as: :hidden
,
input_html:
{
value:
spvm
.
object
.
id
}
h4
.m-b-20.m-t-20
=
"Restliche Stunden in diesem Semester (
#{
@semester_process_volunteer
.
semester_period
}
)"
.row
.col-xs-
12
=
hf
.
input
:hours
,
label:
"Restliche Stunden in diesem Semester
#{
@semester_process_volunteer
.
semester_period
}
"
,
.col-xs-
2
=
hf
.
input
:hours
,
label:
'Stunden'
,
input_html
:
{
value:
f
.object.hours
=
=
0
?
''
:
f
.
object
.
hours
,
min:
0
},
required
:
false,
disabled
:
disabled
.col-xs-10
=
hf
.
input
:activity
,
disabled:
disabled
h3
Spesen
=
f
.simple_fields_for
:volunteer,
@volunteer
do
|vf|
...
...
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