Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added zero_nil to Ingredients filter formula

Browse Source 
Displaying formulas errors for Nutrients view
Substituted onblur for Ingredients filters with hidden submit
This commit is contained in:
cryptogopher
2020-03-22 01:02:37 +01:00
parent c3b783e942
commit 10325c9c39
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/body_tracking/items_with_quantities.rb
View File

@@ -23,8 +23,8 @@ module BodyTracking
project = proxy_association.owner
domain = QUANTITY_DOMAINS[proxy_association.klass]
formula_q = if filters[:formula].present?
project.quantities.new(name: '__internal_q',
formula: filters[:formula],
project.quantities.new(name: 'Filter formula',
formula_attributes: filters[:formula],
domain: domain)
end
apply_formula = formula_q.present? && formula_q.valid?
@@ -89,7 +89,7 @@ module BodyTracking
begin
calculated = q.formula.calculate(inputs.to_h)
rescue Exception => e
output_ids.each { |oid| subitems[q.name][oid] = BigDecimal::NAN }
output_ids.each { |oid| subitems[q.name][oid] = [BigDecimal::NAN, nil] }
q.formula.errors.add(:code, :computation_failed,
{quantity: q.name, description: e.message, count: output_ids.size})
else