Skip to content
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

add select text to entity list response #1529

Merged
merged 2 commits into from
Jan 22, 2024
Merged

add select text to entity list response #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b216548
add select text to entity list response
Robert-Costello Jan 15, 2024
36b522c
update submodule
Robert-Costello Jan 22, 2024
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 libs/commcare
Open in desktop
Submodule commcare updated 5 files
+16 −1 src/main/java/org/commcare/suite/model/Detail.java
+10 −1 src/main/java/org/commcare/xml/DetailParser.java
+6 −0 src/test/java/org/commcare/backend/suite/model/test/AppStructureTests.java
+2 −1 src/test/resources/app_structure/app_strings.txt
+5 −0 src/test/resources/app_structure/suite.xml
20 changes: 20 additions & 0 deletions src/main/java/org/commcare/formplayer/beans/menus/EntityListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class EntityListResponse extends MenuBean {
private boolean useUniformUnits;
private int[] sortIndices;
private String noItemsText;
private String selectText;

private int pageCount;
private int currentPage;
Expand Down Expand Up @@ -102,6 +103,7 @@ public EntityListResponse(EntityScreen nextScreen) {
entities = new EntityBean[entityBeans.size()];
entityBeans.toArray(entities);
setNoItemsText(getNoItemsTextLocaleString(detail));
setSelectText(getSelectTextLocaleString(detail));
hasDetails = nextScreen.getLongDetail() != null;

processTitle(session);
Expand Down Expand Up @@ -517,6 +519,24 @@ private String getNoItemsTextLocaleString(Detail detail) {
return noItemsTextString;
}

private void setSelectText(String selectText) {
this.selectText = selectText;
}

public String getSelectText() {
return selectText;
}

private String getSelectTextLocaleString(Detail detail) {
String selectTextString;
try {
selectTextString = detail.getSelectText().evaluate();
} catch (NoLocalizedTextException | NullPointerException e) {
return null;
}
return selectTextString;
}

public QueryResponseBean getQueryResponse() {
return queryResponse;
}
Expand Down