Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Fixed references to formula as model

Browse Source
This commit is contained in:
cryptogopher 2020-03-10 22:17:20 +01:00
parent 503266d546
commit 320fe93388
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/body_tracking/items_with_quantities.rb
View File

@ -67,7 +67,7 @@ module BodyTracking
q, deps = unchecked_q.shift q, deps = unchecked_q.shift
# quantity not computable (no formula) or not requiring calculation/computed # quantity not computable (no formula) or not requiring calculation/computed
if !q.formula? || !q.formula_valid? || (subitems[q.name].length == items.count) if !q.formula || !q.formula.valid? || (subitems[q.name].length == items.count)
completed_q[q.name] = subitems.delete(q.name) { {} } completed_q[q.name] = subitems.delete(q.name) { {} }
completed_q[q.name].default = [nil, nil] completed_q[q.name].default = [nil, nil]
next next
@ -75,7 +75,7 @@ module BodyTracking
# quantity with formula requires refresh of dependencies availability # quantity with formula requires refresh of dependencies availability
if deps.nil? || !deps.empty? if deps.nil? || !deps.empty?
deps ||= q.formula_quantities deps ||= q.formula.quantities
deps.reject! { |q| completed_q.has_key?(q.name) } deps.reject! { |q| completed_q.has_key?(q.name) }
deps.each { |q| unchecked_q << [q, nil] unless unchecked_q.index { |u| u[0] == q } } deps.each { |q| unchecked_q << [q, nil] unless unchecked_q.index { |u| u[0] == q } }
end end
@ -83,9 +83,9 @@ module BodyTracking
# quantity with formula has all dependencies satisfied, requires calculation # quantity with formula has all dependencies satisfied, requires calculation
if deps.empty? if deps.empty?
output_ids = items.select { |i| subitems[q.name][i.id].nil? }.map(&:id) output_ids = items.select { |i| subitems[q.name][i.id].nil? }.map(&:id)
input_q = q.formula_quantities input_q = q.formula.quantities
inputs = input_q.map { |i_q| [i_q, completed_q[i_q.name].values_at(*output_ids)] } inputs = input_q.map { |i_q| [i_q, completed_q[i_q.name].values_at(*output_ids)] }
q.formula_calculate(inputs.to_h).each_with_index do |result, index| q.formula.calculate(inputs.to_h).each_with_index do |result, index|
subitems[q.name][output_ids[index]] = result subitems[q.name][output_ids[index]] = result
end end
unchecked_q.unshift([q, deps]) unchecked_q.unshift([q, deps])