Skip to content

Commit 00d0527

Browse files
committed
#775 Solve this issue
1 parent dc35ecf commit 00d0527

File tree

1 file changed

+29
-20
lines changed

1 file changed

+29
-20
lines changed

marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/summaries/SearchTermsSummaryAction.java

+29-20
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.time.ZonedDateTime;
4242
import java.time.format.DateTimeFormatter;
4343
import java.util.ArrayList;
44+
import java.util.Arrays;
4445
import java.util.Date;
4546
import java.util.HashMap;
4647
import java.util.HashSet;
@@ -116,26 +117,34 @@ public String execute() throws Exception {
116117
ZonedDateTime timezone = ZonedDateTime.now();
117118
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-d 'at' HH:mm ");
118119
String current_date = timezone.format(format) + timezone.getZone();
119-
// TODO: Get front keys
120-
// Add keys for search
121-
keys.add("gender");
122-
keys.add("female");
123-
keys.add("male");
124-
keys.add("men");
125-
keys.add("elderly");
126-
keys.add("caste");
127-
keys.add("women");
128-
keys.add("equitable");
129-
keys.add("inequality");
130-
keys.add("equity");
131-
keys.add("social");
132-
keys.add("differentiation");
133-
keys.add("social");
134-
keys.add("inclusion");
135-
keys.add("youth");
136-
keys.add("social class");
137-
keys.add("children");
138-
keys.add("child");
120+
String parameters = this.getRequest().getParameter("keys");
121+
if (parameters != null) {
122+
if (parameters.isEmpty()) {
123+
// Add keys for search
124+
keys.add("gender");
125+
keys.add("female");
126+
keys.add("male");
127+
keys.add("men");
128+
keys.add("elderly");
129+
keys.add("caste");
130+
keys.add("women");
131+
keys.add("equitable");
132+
keys.add("inequality");
133+
keys.add("equity");
134+
keys.add("social");
135+
keys.add("differentiation");
136+
keys.add("social");
137+
keys.add("inclusion");
138+
keys.add("youth");
139+
keys.add("social class");
140+
keys.add("children");
141+
keys.add("child");
142+
} else {
143+
keys = Arrays.asList(parameters.split("~/"));
144+
}
145+
}
146+
147+
139148
// Set Main_Query
140149
CompoundDataFactory cdf = CompoundDataFactory.normalize(masterReport.getDataFactory());
141150
String masterQueryName = "main";

0 commit comments

Comments
 (0)