Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Summarizing nutrients + displaying meal summary

Browse Source
This commit is contained in:
cryptogopher
2020-05-01 18:34:40 +02:00
parent 9ccd41b422
commit f6a7f0219e
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/meals/_index.html.erb
View File

@@ -22,8 +22,9 @@
<%= q.name %>
</td>
<% end %>
<td style="width:<%= 100/total_width %>%" rowspan="2"></td>
<td style="width:<%= 100/total_width %>%"></td>
</tr>
<tr>
<td class="quantityhead" style="width:<%= 100/total_width %>%;">
<%= "[#{@amount_mfu_unit.shortname}]" %>

12
app/views/meals/_show.html.erb
View File

@@ -12,7 +12,7 @@
</td>
<td id="notes-links-<%= m.id %>" class="unwrappable"
style="text-align: left; border-right: none; width: 1%;">
style="text-align: left; border-left: none; width: 1%;">
<%= link_to l(:button_cancel), '', class: 'icon icon-cancel', style: 'display: none;',
onclick: "$(event.target).closest('tr').find('form').remove();
$('td[id=notes-#{m.id}]').contents().show();
@@ -26,10 +26,19 @@
class: "icon icon-wiki-page" %>
</td>
<% if false %>
<td id="notes-<%= m.id %>" class="notes unwrappable" colspan="<%= @quantities.length + 1 %>"
style="text-align: left; border-left: none;">
<%= notes(m) %>
</td>
<% end %>
<td class="value ellipsible"></td>
<% @quantities.each do |q| %>
<td class="value ellipsible">
<%= format_value(@nutrient_summary[q][m], @nutrients[q][:precision]) %>
</td>
<% end %>
<td class="action unwrappable" style="width: 1%;"><%= meal_links(m) %></td>
</tr>
@@ -52,4 +61,3 @@
</td>
</tr>
<% end %>
</tr>