Merge pull request #77 from dhis2/d2-condition

feat: add d2:condition to rule engine grammar
dhis2 · Feb 27, 2025 · acf6eaf · acf6eaf
2 parents 787153a + 472542e
commit acf6eaf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.kt b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.kt
@@ -92,6 +92,7 @@ object ExpressionGrammar {
         fn(NamedFunction.variance, expr)
     )
     private val CommonD2Functions = listOf( // (alphabetical)
+        fn(NamedFunction.d2_condition, STRING, expr, expr),
         fn(NamedFunction.d2_contains, expr, expr.plus()),
         fn(NamedFunction.d2_containsItems, expr, expr.plus()),
         fn(NamedFunction.d2_count, dataItem),
@@ -130,7 +131,6 @@ object ExpressionGrammar {
         fn(NamedFunction.d2_zScoreWFH, expr, expr, expr)
     )
     private val ProgramIndicatorD2Functions = listOf(
-        fn(NamedFunction.d2_condition, STRING, expr, expr),
         fn(NamedFunction.d2_countIfCondition, expr, STRING),
         fn(NamedFunction.d2_minutesBetween, expr, expr),
         fn(NamedFunction.d2_relationshipCount, UID.quoted().maybe())