File tree 1 file changed +29
-20
lines changed
marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/summaries
1 file changed +29
-20
lines changed Original file line number Diff line number Diff line change 41
41
import java .time .ZonedDateTime ;
42
42
import java .time .format .DateTimeFormatter ;
43
43
import java .util .ArrayList ;
44
+ import java .util .Arrays ;
44
45
import java .util .Date ;
45
46
import java .util .HashMap ;
46
47
import java .util .HashSet ;
@@ -116,26 +117,34 @@ public String execute() throws Exception {
116
117
ZonedDateTime timezone = ZonedDateTime .now ();
117
118
DateTimeFormatter format = DateTimeFormatter .ofPattern ("yyyy-MM-d 'at' HH:mm " );
118
119
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
+
139
148
// Set Main_Query
140
149
CompoundDataFactory cdf = CompoundDataFactory .normalize (masterReport .getDataFactory ());
141
150
String masterQueryName = "main" ;
You can’t perform that action at this time.
0 commit comments