Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Nutrients list expandable, displays description

Browse Source
This commit is contained in:
cryptogopher
2019-10-28 22:08:05 +01:00
parent c4e89def0a
commit 6f9e8926d7
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/ingredients_controller.rb
View File

@@ -20,18 +20,20 @@ class IngredientsController < ApplicationController
ingredients = @project.ingredients.includes(:ref_unit, nutrients: [:quantity, :unit])
@header = @project.quantities.where(primary: true)
@nutrients = Hash.new { |h,k| h[k] = {} }
@descriptions = Hash.new { |h,k| h[k] = [] }
@nutrients = {}
@descriptions = {}
ingredients.each do |i|
@nutrients[i] = {}
@descriptions[i] = []
i.nutrients.sort_by { |n| n.quantity.lft }.each do |n|
if @header.include?(n.quantity)
@nutrients[i.name][n.quantity_id] = "#{n.amount} [#{n.unit.shortname}]"
@nutrients[i][n.quantity_id] = "#{n.amount} [#{n.unit.shortname}]"
else
@descriptions[i.name] << "#{n.quantity.name}: #{n.amount} [#{n.unit.shortname}]"
@descriptions[i] << "#{n.quantity.name}: #{n.amount} [#{n.unit.shortname}]"
end
end
end
@descriptions.each { |k, v| @descriptions[k] = v.join(", ") }
@descriptions.each { |i, v| @descriptions[i] = v.join(", ") }
end
def create