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

Jt/visually segmented case search group #1389

Merged
merged 16 commits into from
Dec 13, 2023
Merged

Jt/visually segmented case search group #1389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0556f8b
feat: parses group_key from <prompt>
Jtang-1 Dec 4, 2023
3935a61
feat: parses group element from suite
Jtang-1 Dec 4, 2023
7af8ca5
feat: serialization and deserialization support for the userQueryGrou…
Jtang-1 Dec 5, 2023
96ffdfa
feat: adds a groupHeaders param to query definition
Jtang-1 Dec 5, 2023
e51a149
test: group_key attribute of prompt element is parsed correctly
Jtang-1 Dec 7, 2023
4874f31
Merge branch 'formplayer' into jt/visually-segmented-case-search-group
Jtang-1 Dec 8, 2023
e151a12
test: group element is parsed and contains key
Jtang-1 Dec 8, 2023
6c8447c
Merge branch 'formplayer' into jt/visually-segmented-case-search-group
Jtang-1 Dec 11, 2023
83ac7aa
style: correct variable name
Jtang-1 Dec 12, 2023
7d0abe8
refactor: groupHeaders do not need to be ordered. It will be used by …
Jtang-1 Dec 12, 2023
31321d9
style: use constant variable
Jtang-1 Dec 12, 2023
abc4006
refactor: use key that QueryGroupParser already parsed
Jtang-1 Dec 12, 2023
3fec350
feat: validate group block contains expected elements/attributes
Jtang-1 Dec 12, 2023
2b4ba65
minor style + refactor
Jtang-1 Dec 12, 2023
643a7a2
test: adds display block to group element to pass validation
Jtang-1 Dec 12, 2023
15a0d9e
refactor: moves evaluation of groupHeader text to QueryScreen
Jtang-1 Dec 13, 2023
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
4 changes: 4 additions & 0 deletions src/main/java/org/commcare/suite/model/QueryGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ public class QueryGroup implements Externalizable {
private String key;
private DisplayUnit display;

@SuppressWarnings("unused")
public QueryGroup() {
}

public QueryGroup(String key, DisplayUnit display) {
this.key = key;
this.display = display;
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/org/commcare/suite/model/RemoteQueryDatum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
public class RemoteQueryDatum extends SessionDatum {
private List<QueryData> hiddenQueryValues;
private OrderedHashtable<String, QueryPrompt> userQueryPrompts;
private OrderedHashtable<String, QueryGroup> userQueryGroupHeaders;
private boolean useCaseTemplate;
private boolean defaultSearch;
private boolean dynamicSearch;
Expand All @@ -46,10 +47,12 @@ public RemoteQueryDatum() {
public RemoteQueryDatum(URL url, String storageInstance,
List<QueryData> hiddenQueryValues,
OrderedHashtable<String, QueryPrompt> userQueryPrompts,
boolean useCaseTemplate, boolean defaultSearch, boolean dynamicSearch, Text title, Text description) {
boolean useCaseTemplate, boolean defaultSearch, boolean dynamicSearch, Text title, Text description,
shubham1g5 marked this conversation as resolved.
Show resolved Hide resolved
OrderedHashtable<String, QueryGroup> userQueryGroupHeaders) {
super(storageInstance, url.toString());
this.hiddenQueryValues = hiddenQueryValues;
this.userQueryPrompts = userQueryPrompts;
this.userQueryGroupHeaders = userQueryGroupHeaders;
this.useCaseTemplate = useCaseTemplate;
this.defaultSearch = defaultSearch;
this.dynamicSearch = dynamicSearch;
Expand All @@ -61,6 +64,10 @@ public OrderedHashtable<String, QueryPrompt> getUserQueryPrompts() {
return userQueryPrompts;
}

public OrderedHashtable<String, QueryGroup> getUserQueryGroupHeaders() {
return userQueryGroupHeaders;
}

public List<QueryData> getHiddenQueryValues() {
return hiddenQueryValues;
}
Expand Down Expand Up @@ -104,6 +111,9 @@ public void readExternal(DataInputStream in, PrototypeFactory pf)
userQueryPrompts =
(OrderedHashtable<String, QueryPrompt>)ExtUtil.read(in,
new ExtWrapMap(String.class, QueryPrompt.class, ExtWrapMap.TYPE_ORDERED), pf);
userQueryGroupHeaders =
(OrderedHashtable<String, QueryGroup>)ExtUtil.read(in,
new ExtWrapMap(String.class, QueryGroup.class, ExtWrapMap.TYPE_ORDERED), pf);
title = (Text) ExtUtil.read(in, new ExtWrapNullable(Text.class), pf);
description = (Text) ExtUtil.read(in, new ExtWrapNullable(Text.class), pf);
useCaseTemplate = ExtUtil.readBool(in);
Expand All @@ -116,6 +126,7 @@ public void writeExternal(DataOutputStream out) throws IOException {
super.writeExternal(out);
ExtUtil.write(out, new ExtWrapList(hiddenQueryValues, new ExtWrapTagged()));
ExtUtil.write(out, new ExtWrapMap(userQueryPrompts));
ExtUtil.write(out, new ExtWrapMap(userQueryGroupHeaders));
ExtUtil.write(out, new ExtWrapNullable(title));
ExtUtil.write(out, new ExtWrapNullable(description));
ExtUtil.writeBool(out, useCaseTemplate);
Expand Down