From a9a47c2e43601f45d61090778e79301b3b3839ed Mon Sep 17 00:00:00 2001 From: Tony Valle Date: Tue, 6 Jan 2026 14:21:48 +0100 Subject: [PATCH 1/2] fix: support `d2:minutesBetween` in program rule expressions --- .../org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.kt | 2 +- 1 file changed, 1 insertion(+), 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 index a462709..0398e35 100644 --- a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.kt +++ b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.kt @@ -106,6 +106,7 @@ object ExpressionGrammar { fn(NamedFunction.d2_daysBetween, expr, expr), fn(NamedFunction.d2_hasValue, dataItem), fn(NamedFunction.d2_maxValue, dataItem), + fn(NamedFunction.d2_minutesBetween, expr, expr), fn(NamedFunction.d2_minValue, dataItem), fn(NamedFunction.d2_monthsBetween, expr, expr), fn(NamedFunction.d2_oizp, expr), @@ -139,7 +140,6 @@ object ExpressionGrammar { ) private val ProgramIndicatorD2Functions = listOf( fn(NamedFunction.d2_countIfCondition, expr, STRING), - fn(NamedFunction.d2_minutesBetween, expr, expr), fn(NamedFunction.d2_relationshipCount, UID.quoted().maybe()) ) private val CommonConstants = listOf( From 32f3683efc284621e12ec674fdbe66bbb6d33839 Mon Sep 17 00:00:00 2001 From: Tony Valle Date: Wed, 7 Jan 2026 13:59:14 +0100 Subject: [PATCH 2/2] chore: bump version number --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5df688e..f492b8e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -version = "1.3.0-SNAPSHOT" +version = "1.3.1-SNAPSHOT" group = "org.hisp.dhis.lib.expression" if (project.hasProperty("removeSnapshotSuffix")) {