Displaying heirarchical quantity headers
This commit is contained in:
@@ -37,4 +37,38 @@ module BodyTrackersHelper
|
||||
[u.shortname, u.id]
|
||||
end
|
||||
end
|
||||
|
||||
def table_header_spec(quantities)
|
||||
# spec: table of rows (tr), where each row is a hash of cells (td) (hash keeps items
|
||||
# ordered the way they were added). Hash values determine cell property:
|
||||
# * int > 0 - quantity name-labelled cell with 'int' size colspan
|
||||
# * int < 0 - quantity name-labelled cell with 'int' size rowspan
|
||||
# * nil - non-labelled cell without col-/rowspan
|
||||
spec = []
|
||||
default_row = Hash.new(0)
|
||||
|
||||
# Determine colspans first...
|
||||
quantities.each do |q|
|
||||
ancestors = q.self_and_ancestors.each_with_index do |a, i|
|
||||
spec[i] ||= default_row.dup
|
||||
spec[i][a] += 1
|
||||
end
|
||||
spec[ancestors.length...spec.length].each { |row| row[ancestors.last] = nil }
|
||||
default_row[ancestors.last] = nil
|
||||
end
|
||||
|
||||
# ...then rowspans
|
||||
single_columns = []
|
||||
spec.each_with_index do |row, i|
|
||||
single_columns.each { |q| row.delete(q) }
|
||||
row.each do |q, span|
|
||||
if span == 1
|
||||
row[q] = -(spec.length - i)
|
||||
single_columns << q
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
spec
|
||||
end
|
||||
end
|
||||
|
||||
@@ -8,21 +8,33 @@
|
||||
<table id="meals" class="list odd-even">
|
||||
<tbody>
|
||||
<% total_width = 4 + @quantities.length %>
|
||||
<% header = table_header_spec(@quantities) %>
|
||||
<% @meals_by_date.reverse_each do |date, meals| %>
|
||||
<tr class="header">
|
||||
<td colspan="2" rowspan="2"
|
||||
style="width:<%= 3 * 100/total_width %>%; border: none;"></td>
|
||||
<td class="quantityhead" style="width:<%= 100/total_width %>%;">
|
||||
<%= l(:field_amount) %>
|
||||
</td>
|
||||
<% @quantities.each do |q| %>
|
||||
<td class="quantityhead" style="width: <%= 100/total_width %>%;"
|
||||
title="<%= q.description %>">
|
||||
<%= q.name %>
|
||||
</td>
|
||||
<% end %>
|
||||
<td rowspan="2" style="width:<%= 100/total_width %>%; border: none;"></td>
|
||||
</tr>
|
||||
<% header.each_with_index do |row, i| %>
|
||||
<tr class="header">
|
||||
<% if i == 0 %>
|
||||
<td colspan="2" rowspan="<%= 1 + header.length %>"
|
||||
style="width:<%= 3 * 100/total_width %>%; border: none;"></td>
|
||||
<td class="quantityhead" rowspan="<%= header.length %>"
|
||||
style="width:<%= 100/total_width %>%;"><%= l(:field_amount) %></td>
|
||||
<% end %>
|
||||
|
||||
<% row.each do |q, span| %>
|
||||
<td class="<%= span ? 'quantityhead' : 'quantityheadempty' %>"
|
||||
<%= "colspan=#{span}" if span && span > 0 %>
|
||||
<%= "rowspan=#{-span}" if span && span < 0 %>
|
||||
style="width: <%= (span && span > 0 ? span : 1) * 100/total_width %>%;"
|
||||
title="<%= q.description %>">
|
||||
<%= q.name if span %>
|
||||
</td>
|
||||
<% end %>
|
||||
|
||||
<% if i == 0 %>
|
||||
<td rowspan="<%= 1 + header.length %>"
|
||||
style="width:<%= 100/total_width %>%; border: none;"></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<tr class="header">
|
||||
<td class="quantityhead"><%= "[#{@amount_mfu_unit.shortname}]" %></td>
|
||||
|
||||
Reference in New Issue
Block a user