diff --git a/app/helpers/measurements_helper.rb b/app/helpers/measurements_helper.rb index cb642a9..e13348e 100644 --- a/app/helpers/measurements_helper.rb +++ b/app/helpers/measurements_helper.rb @@ -1,2 +1,19 @@ module MeasurementsHelper + def quantity_options + nested_set_options(@project.quantities.measurement) do |q| + raw("#{' ' * q.level}#{q.name}") + end + end + + def unit_options + @project.units.map do |u| + [u.shortname, u.id] + end + end + + def source_options + @project.sources.map do |s| + [s.name, s.id] + end + end end diff --git a/app/views/measurements/_form.html.erb b/app/views/measurements/_form.html.erb index e47e2f8..ab898e5 100644 --- a/app/views/measurements/_form.html.erb +++ b/app/views/measurements/_form.html.erb @@ -9,7 +9,7 @@

<%= f.text_field :name, size: 40, required: true %>

<%= f.select :source_id, source_options, required: false, include_blank: true %>

- <% @measurements.readouts.each_with_index do |r, index| %> + <% @measurement.readouts.each_with_index do |r, index| %> <%= f.fields_for 'readouts_attributes', r, index: '' do |ff| %>

<%= ff.select :quantity_id, quantity_options, diff --git a/config/locales/en.yml b/config/locales/en.yml index a01c557..8997c3b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -53,6 +53,8 @@ en: measurements: form: heading_new_measurement: 'New measurement' + button_add_readout: 'Add readout' + button_delete_readout: 'Delete' index: heading: 'Measurements' link_new_measurement: 'New measurement'