Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Fixes for formula computation

Browse Source 
Added default quantity
This commit is contained in:
cryptogopher
2020-05-05 22:02:48 +02:00
parent 8749710330
commit 9c3d31c131
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/formula.rb
View File

@@ -30,7 +30,7 @@ class Formula < ActiveRecord::Base
args = []
@parts.each do |p|
code = p[:type] == :indexed ?
"length.times.map { |index| #{p[:content]} }" : p[:content]
"length.times.map { |_index| #{p[:content]} }" : p[:content]
args << get_binding(quantities, args, length).eval(code)
end
args.last.map { |v| [v, self.unit] }
@@ -47,8 +47,8 @@ class Formula < ActiveRecord::Base
identifiers, parts = parser.parse
errors = parser.errors
quantities = Quantity.where(project: self.quantity.project, name: identifiers)
(identifiers - quantities.map(&:name) - quantity_m.keys).each do |q|
quantities = Quantity.where(project: self.quantity.project, name: identifiers.to_a)
(identifiers - quantities.map(&:name) - q_methods.keys).each do |q|
errors << [:unknown_quantity, {quantity: q}]
end