Commit dd5ae078 authored by Tugce Nur Tas's avatar Tugce Nur Tas

Merge branch 'features/add-hours-activity-field-to-review-semester-form' into 'develop'

Features/add hours activity field to review semester form

See merge request !860
parents c137b3b9 24c06842
Pipeline #31628 passed with stage
in 50 minutes and 55 seconds
......@@ -2,6 +2,14 @@
.limit-width {
width: 5%;
}
.limit-width-10 {
width: 10%;
}
.limit-width-40 {
width: 40%;
}
}
.table-scrollable {
......
.form-group.float.optional.semester_process_volunteer_semester_feedbacks_hour_hours {
display: inline-flex;
}
......@@ -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
......
table.table.table-striped.hours-table
thead
tr
th= t_attr(:meeting_date, Hour)
th= t_attr(:duration, Hour)
th= t_attr(:activity, Hour)
th= t_attr(:comments, Hour)
th.limit-width-10= t_attr(:meeting_date, Hour)
th.limit-width-10= t_attr(:duration, Hour)
th.limit-width-40= t_attr(:activity, Hour)
th.limit-width-40= t_attr(:comments, Hour)
tbody
- hours.each do |record|
tr
......
......@@ -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|
......
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