Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
8fa52fdd
Commit
8fa52fdd
authored
May 22, 2014
by
igoshin
Committed by
Matija Obreza
Jul 03, 2014
Browse files
Bugfixes to filtering
parent
3705c8b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java
View file @
8fa52fdd
...
...
@@ -279,7 +279,7 @@ public class ExplorerController extends BaseController {
String
[]
selectedFilters
=
new
String
[
0
];
jsonFilter
=
jsonFilter
.
replaceAll
(
"_"
,
":"
);
Crop
crop
=
null
;
if
(
StringUtils
.
isNotBlank
(
jsonPick
))
{
// Cleanup JSON pick
try
{
...
...
@@ -297,7 +297,7 @@ public class ExplorerController extends BaseController {
if
(
filters
.
get
(
"crop"
)
!=
null
)
{
String
shortName
=
filters
.
get
(
"crop"
).
get
(
0
);
// Add crop descriptors
Crop
crop
=
cropService
.
getCrop
(
shortName
);
crop
=
cropService
.
getCrop
(
shortName
);
if
(
crop
!=
null
)
{
List
<
ParameterCategory
>
categories
=
traitService
.
listCategories
();
...
...
@@ -348,8 +348,7 @@ public class ExplorerController extends BaseController {
Page
<
Accession
>
accessions
=
filterService
.
listAccessions
(
jsonTree
,
new
PageRequest
(
page
-
1
,
50
,
new
Sort
(
"acceNumb"
)));
_logger
.
info
(
"Got: "
+
accessions
);
List
<
GenesysFilterService
.
GenesysFilter
>
additionalFilters
=
filterService
.
selectFilters
(
selectedFilters
);
List
<
GenesysFilterService
.
GenesysFilter
>
additionalFilters
=
filterService
.
selectFilters
(
crop
,
selectedFilters
);
List
<
GenesysFilterService
.
GenesysFilter
>
availableFilters
=
filterService
.
listAvailableFilters
();
List
<
GenesysFilterService
.
GenesysFilter
>
allFilters
=
new
ArrayList
<>();
...
...
src/main/webapp/WEB-INF/jsp/accession/explore_new.jsp
View file @
8fa52fdd
...
...
@@ -420,7 +420,9 @@
jsonValue
=
jsonData
[
key
];
}
if
(
!
isNaN
(
inputValue1
)
&&
!
isNaN
(
inputValue2
))
{
var
notNull
=
inputValue1
!=
''
&&
inputValue2
!=
''
;
if
(
!
isNaN
(
inputValue1
)
&&
!
isNaN
(
inputValue2
)
&&
notNull
)
{
if
(
inputValue1
==
inputValue2
)
{
jsonValue
.
push
(
parseFloat
(
inputValue1
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment