Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Displaying computed nutrients

Browse Source
This commit is contained in:
cryptogopher
2019-11-06 21:26:33 +01:00
parent eff672318b
commit 5c8b7e0def
5 changed files with 88 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/views/ingredients/_list_nutrients.html.erb
View File

@@ -18,10 +18,8 @@
<td class="name" style="cursor: pointer;" onclick="$(this).closest('tr').toggle(); $(this).closest('tr').nextUntil('tr.primary', 'tr').toggle(); return false;">
<span class="icon icon-bullet-closed"><%= i.name %></span>
</td>
<% @quantities.each do |q| %>
<td class="primary value">
<%= values[q.id] || '-' %>
</td>
<% values.each do |*, value| %>
<td class="primary value"><%= value %></td>
<% end %>
</tr>
@@ -29,43 +27,35 @@
<td class="name" style="cursor: pointer;" onclick="$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', 'tr').toggle(); return false;">
<span class="icon icon-bullet-closed"><%= i.name %></span>
</td>
<% @quantities.each do |q| %>
<td class="primary quantity">
<%= q.name %>
</td>
<% values.each do |q_name, *| %>
<td class="primary quantity"><%= q_name %></td>
<% end %>
</tr>
<tr class="<%= row_class %>" style="display:none">
<td class="space"></td>
<% @quantities.each do |q| %>
<td class="primary value">
<%= values[q.id] || '-' %>
</td>
<% values.each do |*, value| %>
<td class="primary value"><%= value %></td>
<% end %>
</tr>
<% extras = @extra_nutrients[i].keys %>
<% extras.each_slice(@quantities.length).with_index do |names, index| %>
<% extras = @extra_nutrients[i] %>
<% extras.each_slice(@quantities.length).with_index do |values, index| %>
<tr class="extra <%= row_class %>" style="display:none">
<td class="space"></td>
<% names.each do |name| %>
<td class="extra quantity">
<%= name %>
</td>
<% values.each do |q_name, *| %>
<td class="extra quantity"><%= q_name %></td>
<% end %>
<% if @quantities.length > names.length %>
<td class="space" colspan="<%= @quantities.length-names.length %>"></td>
<% if @quantities.length > values.length %>
<td class="space" colspan="<%= @quantities.length-values.length %>"></td>
<% end %>
</tr>
<tr class="extra <%= row_class %>" style="display:none">
<td class="space"></td>
<% names.each do |name| %>
<td class="extra value">
<%= @extra_nutrients[i][name] %>
</td>
<% values.each do |*, value| %>
<td class="extra value"><%= value %></td>
<% end %>
<% if @quantities.length > names.length %>
<td class="space" colspan="<%= @quantities.length-names.length %>"></td>
<% if @quantities.length > values.length %>
<td class="space" colspan="<%= @quantities.length-values.length %>"></td>
<% end %>
</tr>
<% end %>

4
app/views/ingredients/_options.html.erb
View File

@@ -18,9 +18,9 @@
<table class="list" style="border:none; width:100%">
<tr>
<% total_width = 3 + @primary_quantities.length %>
<% total_width = 3 + @quantities.length %>
<td style="visibility: hidden; border: none; width:<%= 3 * 100/total_width%>%"></td>
<% @primary_quantities.each do |q| %>
<% @quantities.each do |q| %>
<td class="action" style="width:<%= 100/total_width %>%">
<%= link_to l(:button_hide),
toggle_nutrient_column_project_ingredients_path(@project, id: q.id),