Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

FormulaBuilder now recognizes qualified quantity identifiers

Browse Source
This commit is contained in:
cryptogopher 2020-06-06 15:58:12 +02:00
parent 6785090045
commit 74c863c73a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/body_tracking/formula_builder.rb
View File

@ -110,7 +110,12 @@ module BodyTracking
case left[0] case left[0]
when :bt_quantity when :bt_quantity
if @quantity_methods[left[1]].include?(right[1]) case
when dot == :'::'
token = "#{left[1]}#{dot}#{right[1]}"
@identifiers << token
[:bt_quantity, token]
when @quantity_methods[left[1]].include?(right[1])
part_index = @parts.length part_index = @parts.length
if @quantity_methods.has_key?(left[1]) if @quantity_methods.has_key?(left[1])
[:bt_numeric_method_call, [:bt_numeric_method_call,

11
test/unit/formula_test.rb
View File

@ -70,7 +70,16 @@ class FormulaTest < ActiveSupport::TestCase
"quantities['Meal'][_index].created_at"}, "quantities['Meal'][_index].created_at"},
{type: :unindexed, content: "quantities['RM'].lastBefore(parts[0])"}, {type: :unindexed, content: "quantities['RM'].lastBefore(parts[0])"},
{type: :indexed, content: "100*quantities['Energy'][_index]/parts[1][_index]"} {type: :indexed, content: "100*quantities['Energy'][_index]/parts[1][_index]"}
] ],
# Qualified quantity identifiers
'Energy::calculated > Energy', Set['Energy::calculated', 'Energy'], [
{type: :indexed, content: "quantities['Energy::calculated'][_index]>" \
"quantities['Energy'][_index]"}
],
'"Energy::as %RM" < 100', Set['Energy::as %RM'], [
{type: :indexed, content: "quantities['Energy::as %RM'][_index]<100"}
],
] ]
d_methods = ['nil?', 'abs'] d_methods = ['nil?', 'abs']