Skip to content

feat: implement d2:condition #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
superskip wants to merge 3 commits into from
Closed

feat: implement d2:condition #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7616e7f
feat: implement d2:condition
superskip Oct 8, 2025
c9fa27e
fix: Bump version from 1.2.1-SNAPSHOT to 1.3.1-SNAPSHOT
ameenhere Dec 22, 2025
0b049fa
Merge branch 'main' into DHIS2-20283
ameenhere Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down
4 changes: 4 additions & 0 deletions src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Copy link
Copy Markdown
Collaborator

@enricocolasante enricocolasante Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This funciton is already declared at line 63.
It was implemented in version 1.2.2, I think you were not seeing it before.

Copy link
Copy Markdown
Collaborator

@enricocolasante enricocolasante Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This funciton is already declared at line 63.
It was implemented in version 1.2.2, I think you were not seeing it before.

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)))
Expand Down