Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Unevaluable formulas return nil (instead of throwing error)

Browse Source 
Filter formula errors are shown in filter view
This commit is contained in:
cryptogopher
2019-11-09 20:36:10 +01:00
parent 70b6e97b87
commit 67b0cd9b66
8 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/ingredient.rb
View File

@@ -49,18 +49,20 @@ class Ingredient < ActiveRecord::Base
end
formula_q = if filters[:nutrients].present?
formula = Formula.new(project, filters[:nutrients])
if formula.valid?
project.quantities.new(name: '__internal_q', formula: filters[:nutrients])
end
end
project.quantities.new(name: '__internal_q',
formula: filters[:nutrients],
domain: :diet)
end
apply_formula = formula_q.present? && formula_q.valid?
if !requested_q.empty? || formula_q.present?
result = self.compute_nutrients(requested_q, formula_q)
requested_q.present? ? result : result[0]
else
ingredients
end
result =
if !requested_q.empty? || apply_formula
computed = ingredients.compute_nutrients(requested_q, apply_formula && formula_q)
requested_q.present? ? computed : [computed[0]]
else
[ingredients]
end
result.push(formula_q)
end
def self.compute_nutrients(requested_q, filter_q = nil)