From b2ea016e641373ce8bd7cc02bb081ce24e7437cf Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 16 Jan 2023 11:09:32 +0000 Subject: [PATCH] Count everyone under 20 as children if relationship is "C" --- app/models/derived_variables/sales_log_variables.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 0dc57ab46..b00a16b63 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -30,8 +30,11 @@ private end def total_child - relationships = [relat2, relat3, relat4, relat5, relat6] - relationships.count("C") + (2..6).count do |i| + age = public_send("age#{i}") + relat = public_send("relat#{i}") + age.present? && ((age < 20 && %w[C].include?(relat))) + end end def total_adult @@ -39,7 +42,7 @@ private total + (2..6).count do |i| age = public_send("age#{i}") relat = public_send("relat#{i}") - age.present? && ((age.between?(16, 17) && %w[P X].include?(relat)) || age.between?(18, 59)) + age.present? && ((age.between?(20, 59) || age.between?(18, 19) && relat != "C")) end end