Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Quantity computing from formula looks done, savepoint

Browse Source
This commit is contained in:
cryptogopher
2019-11-06 15:59:39 +01:00
parent d70a17f58b
commit eff672318b
3 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,24 +1,24 @@
<% if @primary_nutrients.any? %>
<% if @nutrients.any? %>
<%= render :partial => 'ingredients/options' %>
<table class="nutrients list odd-even">
<thead>
<tr>
<% total_width = 3 + @primary_quantities.length %>
<% total_width = 3 + @quantities.length %>
<th style="width:<%= 3 * 100/total_width%>%"><%= l(:field_name) %></th>
<% @primary_quantities.each do |q| %>
<% @quantities.each do |q| %>
<th style="width:<%= 100/total_width %>%"><%= q.name %></th>
<% end %>
</tr>
</thead>
<tbody>
<% @primary_nutrients.each do |i, values| %>
<% @nutrients.each do |i, values| %>
<% row_class = "ingredient#{' hidden' if i.hidden} #{cycle('odd', 'even')}" %>
<tr id="ingredient-<%= i.id %>" class="primary <%= row_class %>">
<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>
<% @primary_quantities.each do |q| %>
<% @quantities.each do |q| %>
<td class="primary value">
<%= values[q.id] || '-' %>
</td>
@@ -29,7 +29,7 @@
<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>
<% @primary_quantities.each do |q| %>
<% @quantities.each do |q| %>
<td class="primary quantity">
<%= q.name %>
</td>
@@ -37,7 +37,7 @@
</tr>
<tr class="<%= row_class %>" style="display:none">
<td class="space"></td>
<% @primary_quantities.each do |q| %>
<% @quantities.each do |q| %>
<td class="primary value">
<%= values[q.id] || '-' %>
</td>
@@ -45,7 +45,7 @@
</tr>
<% extras = @extra_nutrients[i].keys %>
<% extras.each_slice(@primary_quantities.length).with_index do |names, index| %>
<% extras.each_slice(@quantities.length).with_index do |names, index| %>
<tr class="extra <%= row_class %>" style="display:none">
<td class="space"></td>
<% names.each do |name| %>
@@ -53,8 +53,8 @@
<%= name %>
</td>
<% end %>
<% if @primary_quantities.length > names.length %>
<td class="space" colspan="<%= @primary_quantities.length-names.length %>"></td>
<% if @quantities.length > names.length %>
<td class="space" colspan="<%= @quantities.length-names.length %>"></td>
<% end %>
</tr>
<tr class="extra <%= row_class %>" style="display:none">
@@ -64,8 +64,8 @@
<%= @extra_nutrients[i][name] %>
</td>
<% end %>
<% if @primary_quantities.length > names.length %>
<td class="space" colspan="<%= @primary_quantities.length-names.length %>"></td>
<% if @quantities.length > names.length %>
<td class="space" colspan="<%= @quantities.length-names.length %>"></td>
<% end %>
</tr>
<% end %>