From 7616e7f2af479a9b5940fcbaa4483cf1495e74f1 Mon Sep 17 00:00:00 2001 From: Tony Valle Date: Wed, 8 Oct 2025 11:20:05 +0200 Subject: [PATCH 1/2] feat: implement d2:condition --- .../kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 index d5494cd..fb8e70b 100644 --- a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt +++ b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt @@ -76,6 +76,10 @@ internal class Calculator( evalToNumber(fn.child(1))) NamedFunction.d2_ceil -> functions.d2_ceil(evalToNumber(fn.child(0))) NamedFunction.d2_concatenate -> functions.d2_concatenate(evalToStrings(fn.children())) + NamedFunction.d2_condition -> functions.ifThenElse( + evalToBoolean(fn.child(0)), + evalToMixed(fn.child(1)), + evalToMixed(fn.child(2))) NamedFunction.d2_contains -> functions.contains(evalToString(fn.child(0)), evalToStrings(fn.children()).drop(1)) NamedFunction.d2_containsItems -> functions.containsItems(evalToString(fn.child(0)), evalToStrings(fn.children()).drop(1)) NamedFunction.d2_count -> functions.d2_count(evalToVar(fn.child(0))) From c9fa27ec6fdc6cc02e8cde8db6bbaa88d9696914 Mon Sep 17 00:00:00 2001 From: Mohamed Ameen Date: Mon, 22 Dec 2025 14:47:13 +0100 Subject: [PATCH 2/2] fix: Bump version from 1.2.1-SNAPSHOT to 1.3.1-SNAPSHOT --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b761bea..d59b616 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -version = "1.2.1-SNAPSHOT" +version = "1.3.1-SNAPSHOT" group = "org.hisp.dhis.lib.expression" if (project.hasProperty("removeSnapshotSuffix")) {