Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
80bdb64
fix: Update code
larshelge Mar 26, 2025
499981a
fix: Update code
larshelge Mar 26, 2025
2884960
fix: Update code
larshelge Mar 26, 2025
06537a1
Merge branch 'master' of github.com:dhis2/dhis2-java-client
larshelge Mar 26, 2025
081a283
fix: Update code
larshelge Mar 26, 2025
85bd30b
Merge branch 'master' into lars-dev
larshelge Apr 4, 2025
be831da
fix: Update code
larshelge Apr 4, 2025
299daa8
fix: Update code
larshelge Apr 4, 2025
01c4efb
fix: Update code
larshelge Apr 4, 2025
b44b735
fix: Update code
larshelge Apr 4, 2025
62dfd65
fix: Update code
larshelge Apr 4, 2025
5bb4375
fix: Update code
larshelge Apr 4, 2025
bd8ffe2
fix: Update code
larshelge Apr 4, 2025
bedb09f
fix: Update code
larshelge Apr 4, 2025
f6e54bd
fix: Update code
larshelge Apr 4, 2025
0640deb
Merge branch 'master' into lars-dev
larshelge Apr 4, 2025
e3f981b
fix: Update code
larshelge Apr 4, 2025
9358a80
merge: Merge from master branch
larshelge Apr 11, 2025
c390277
fix: Add ConfigUtils and ConfigUtilsTest
larshelge Apr 11, 2025
e155590
fix: Add ConfigUtils and ConfigUtilsTest
larshelge Apr 11, 2025
76c2475
chore: Bump version
larshelge Apr 12, 2025
98bc67c
chore: Bump version
larshelge Apr 12, 2025
27f264d
chore: Bump version
larshelge Apr 12, 2025
d834b42
merge: Merge from master branch
larshelge Apr 12, 2025
bd46009
merge: Merge from master branch
larshelge Apr 12, 2025
ca1ddfa
Merge branch 'master' into lars-dev
larshelge Apr 12, 2025
41834a9
fix: Update code
larshelge Apr 12, 2025
b510e60
fix: Update code
larshelge Apr 13, 2025
a7994c0
fix: Update code
larshelge Apr 13, 2025
8b1a0f1
fix: Update code
larshelge Apr 13, 2025
8ef4ecd
fix: Update code
larshelge Apr 13, 2025
5a851cb
fix: Update code
larshelge Apr 13, 2025
5665d46
merge: Merge from master branch
larshelge Apr 13, 2025
e2d2bfc
fix: Update code
larshelge Apr 13, 2025
857ab7c
merge: Merge from master branch
larshelge Apr 13, 2025
5849092
fix: Update code
larshelge Apr 14, 2025
046feeb
merge: Merge from master branch
larshelge Apr 14, 2025
0c1fd58
fix: Update code
larshelge Apr 14, 2025
26b783f
merge: Merge from master branch
larshelge Apr 14, 2025
bb64c75
fix: Update code
larshelge Apr 14, 2025
ac31733
merge: Merge from master branch
larshelge Apr 14, 2025
33c08e2
fix: Update code
larshelge Apr 14, 2025
00a6519
merge: Merge from master branch
larshelge Apr 14, 2025
116e8fe
chore: Bump version
larshelge Apr 14, 2025
02c1d7f
fix: Update code
larshelge Apr 14, 2025
f4d924f
fix: Update code
larshelge Apr 15, 2025
8c7e47c
fix: Update code
larshelge Apr 16, 2025
4c9526c
merge: Merge from master branch
larshelge Apr 16, 2025
c210ffe
merge: Merge from master branch
larshelge Apr 16, 2025
fab02fe
fix: Update code
larshelge Apr 22, 2025
7c1c13b
fix: Update code
larshelge Apr 22, 2025
f6913b3
fix: Update code
larshelge Apr 22, 2025
836d50c
fix: Update code
larshelge Apr 22, 2025
4d42e0b
fix: Update code
larshelge Apr 22, 2025
5dfb97c
fix: Update code
larshelge Apr 22, 2025
6040064
fix: Update code
larshelge Apr 22, 2025
dd34118
fix: Update code
larshelge Apr 22, 2025
c06e72d
fix: Update code
larshelge Apr 22, 2025
f4593c4
merge: Merge from master branch
larshelge Apr 22, 2025
2f409aa
fix: Update code
larshelge Apr 22, 2025
9b6ea03
Merge branch 'master' into lars-dev
larshelge Apr 22, 2025
7a31027
fix: Update code
larshelge Apr 22, 2025
5ca7cdf
fix: Update code
larshelge Apr 22, 2025
95a0e96
fix: Update code
larshelge Apr 22, 2025
62c50a4
fix: Update code
larshelge Apr 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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ To create an org unit:
OrgUnit orgUnit = new OrgUnit();
orgUnit.setName("Ngelehun");
orgUnit.setCode("NGLH");
orgUnit.setPointGeometry(-11.452, 8.057);

ObjectResponse response = dhis2.saveOrgUnit(orgUnit);
```
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.hisp</groupId>
<artifactId>dhis2-java-client</artifactId>
<version>2.1.6-SNAPSHOT</version>
<version>2.1.5</version>
<packaging>jar</packaging>

<name>DHIS 2 API client for Java</name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hisp/dhis/model/event/Event.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public boolean isGeometryPoint() {
/**
* Indicates whether geometry is of the given type.
*
* @param the type, use {@link Geometry} > {@code TYPENAME} constant values.
* @param type the type, use {@link Geometry} {@code TYPENAME} constant values.
* @return true if geometry is of the given type.
*/
public boolean isGeometryType(String type) {
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/org/hisp/dhis/query/analytics/AnalyticsQuery.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.hisp.dhis.model.AggregationType;
import org.hisp.dhis.model.IdScheme;

/** Analytics data query. */
@Getter
@Setter
@Accessors(chain = true)
Expand Down Expand Up @@ -63,19 +64,43 @@ public class AnalyticsQuery {

private AnalyticsQuery() {}

/**
* Creates a new instance of this query.
*
* @return an {@link AnalyticsQuery}.
*/
public static AnalyticsQuery instance() {
return new AnalyticsQuery();
}

/**
* Adds a dimension to this query.
*
* @param dimension the {@link Dimension}.
* @return this {@link AnalyticsQuery}.
*/
public AnalyticsQuery addDimension(Dimension dimension) {
this.dimensions.add(dimension);
return this;
}

/**
* Adds a dimension and items to this query.
*
* @param dimension the dimension identifier.
* @param items the list of dimension items.
* @return this {@link AnalyticsQuery}.
*/
public AnalyticsQuery addDimension(String dimension, List<String> items) {
return addDimension(new Dimension(dimension, items));
}

/**
* Adds a filter to this query.
*
* @param filter the {@link Dimension}.
* @return this {@link AnalyticsQuery}.
*/
public AnalyticsQuery addFilter(Dimension filter) {
this.filters.add(filter);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.hisp.dhis.response.BaseHttpResponse;

/** Asynchronous import summary response. */
@Getter
@Setter
@NoArgsConstructor
Expand Down