Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added ingredient source setting/display/import

Browse Source
This commit is contained in:
cryptogopher
2019-09-23 22:33:40 +02:00
parent 0e6bbd8c74
commit 9664df4888
7 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/ingredients/_form.html.erb
View File

@@ -7,6 +7,14 @@
<%= f.select :ref_unit_id, unit_options, {label: '', required: true} %>
</p>
<p><%= f.select :group, group_options, required: true %></p>
<div class="splitcontent">
<div class="splitcontentleft">
<p><%= f.select :source_id, source_options, required: false, include_blank: true %></p>
</div>
<div class="splitcontentright">
<p><%= f.text_field :source_ident, size: 25, required: false %></p>
</div>
</div>
<% @ingredient.nutrients.each_with_index do |n, index| %>
<%= f.fields_for 'nutrients_attributes', n, index: '' do |ff| %>
<p class="nutrient">

5
app/views/ingredients/index.html.erb
View File

@@ -64,7 +64,10 @@
<td class="name"><%= i.name %></td>
<td class="reference"><%= i.ref_amount %> [<%= i.ref_unit.shortname %>]</td>
<td class="group"><%= i.group %></td>
<td class="source"><%#= i.source %></td>
<td class="source">
<%= i.source.name if i.source.present? %>
<%= ", #{i.source_ident}" if i.source_ident.present? %>
</td>
<td><%= delete_link ingredient_path(i), data: {} %></td>
</tr>
<% end %>