fix: evalToVar - do var lookup by name for strings

dhis2 · Nov 29, 2023 · ec30f4d · ec30f4d
1 parent bfcf7e6
commit ec30f4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/ast/Typed.kt b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/ast/Typed.kt
@@ -59,7 +59,7 @@ fun interface Typed {
             else value
         }
 
-        fun isNonFractionValue(value: Number): Boolean {
+        private fun isNonFractionValue(value: Number): Boolean {
             return value.toDouble() % 1.0 == 0.0
         }
     }

diff --git a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
@@ -313,7 +313,7 @@ internal class Calculator(
     }
 
     private fun evalToVar(node: Node<*>): VariableValue? {
-        return eval(node, "Variable") { v: Any? -> v as VariableValue? }
+        return eval(node, "Variable") { v: Any? -> if (v is String) data.programRuleVariableValues[v] else v as VariableValue? }
     }
 
     private fun evalToMixed(nodes: Sequence<Node<*>>): List<*> {