Skip to content

feat: Add dataEntryForm attribute to program stage #533

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

Open
LeonardoGonzales wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −1
Open

feat: Add dataEntryForm attribute to program stage #533

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
f9637ac
feat: Add dataEntryForm attribute to program stage
LeonardoGonzales May 28, 2026
1f095bc
chore: Use dataEntryForm only in PROGRAM_STAGE_EXT_FIELDS fields
LeonardoGonzales May 28, 2026
4614955
fix: Update Api fields test
LeonardoGonzales May 28, 2026
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
3 changes: 3 additions & 0 deletions src/main/java/org/hisp/dhis/api/ApiFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,9 @@ public class ApiFields {
PROGRAM_STAGE_DATA_ELEMENT_FIELDS,
PROGRAM_STAGE_SECTION_FIELDS);

public static final String PROGRAM_STAGE_EXT_FIELDS =
String.format("%1$s,dataEntryForm[%2$s]", PROGRAM_STAGE_FIELDS, ID_FIELDS);

public static final String PROGRAM_TRACKED_ENTITY_ATTRIBUTES_FIELDS =
String.format(
"""
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/hisp/dhis/model/ProgramStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ public class ProgramStage extends NameableObject {

@JsonProperty private FeatureType featureType;

@JsonProperty private DataEntryForm dataEntryForm;

/**
* Constructor.
*
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/hisp/dhis/model/metadata/MetadataEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import static org.hisp.dhis.api.ApiFields.PROGRAM_RULE_FIELDS;
import static org.hisp.dhis.api.ApiFields.PROGRAM_RULE_VARIABLE_FIELDS;
import static org.hisp.dhis.api.ApiFields.PROGRAM_SECTION_FIELDS;
import static org.hisp.dhis.api.ApiFields.PROGRAM_STAGE_EXT_FIELDS;
import static org.hisp.dhis.api.ApiFields.PROGRAM_STAGE_FIELDS;
import static org.hisp.dhis.api.ApiFields.PROGRAM_STAGE_SECTION_FIELDS;
import static org.hisp.dhis.api.ApiFields.RELATIONSHIP_TYPE_FIELDS;
Expand Down Expand Up @@ -343,7 +344,7 @@ public enum MetadataEntity {
PROGRAM_STAGE(
ProgramStage.class,
PROGRAM_STAGE_FIELDS,
PROGRAM_STAGE_FIELDS,
PROGRAM_STAGE_EXT_FIELDS,
"programStages",
Dhis2Objects::getProgramStages),
PROGRAM_STAGE_SECTION(
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/hisp/dhis/ProgramStageApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ void getGetProgramStage() {
assertNotNull(programStage.getReferral());
}

@Test
void getGetProgramStageWithDataEntryForm() {
Dhis2 dhis2 = new Dhis2(TestFixture.DEFAULT_CONFIG);

ProgramStage programStage = dhis2.getProgramStage("pSllsjpfLH2");
assertNotNull(programStage);
assertEquals("pSllsjpfLH2", programStage.getId());
assertNotNull(programStage.getDataEntryForm());
}

@Test
void getProgramStages() {
Dhis2 dhis2 = new Dhis2(TestFixture.DEFAULT_CONFIG);
Expand Down
Loading