diff --git a/src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java b/src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java index 241afce8951d7164676c9d6afb11a4bcc60ac65c..354ee0f3792d4543d92d5e63ffb9384206d0aaba 100644 --- a/src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java +++ b/src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java @@ -445,6 +445,14 @@ public class ExplorerController extends BaseController { public String overview(ModelMap model, @RequestParam(value = "filter", required = false, defaultValue = "{}") String jsonFilter) throws IOException, SearchException { AppliedFilters appliedFilters = mapper.readValue(jsonFilter, AppliedFilters.class); + String[] selectedFilters = appliedFilters.getFilterNames(); + final List currentFilters = filterHandler.selectFilters(selectedFilters); + model.addAttribute("currentFilters", currentFilters); + + // JSP works with JsonObject + final Map> filters = mapper.readValue(appliedFilters.toString(), Map.class); + model.addAttribute("filters", filters); + // Composition overview overviewInstitutes(model, appliedFilters); diff --git a/src/main/webapp/WEB-INF/jsp/accession/overview.jsp b/src/main/webapp/WEB-INF/jsp/accession/overview.jsp index 0ca41939325e249d4048714d50aedc25ab2dbc0b..eec9a19955dbb42d143b76cd95d0fe8ef3715ac7 100644 --- a/src/main/webapp/WEB-INF/jsp/accession/overview.jsp +++ b/src/main/webapp/WEB-INF/jsp/accession/overview.jsp @@ -19,9 +19,72 @@ + +
+ <%-- Only render currently present filters --%> + + + + + + +
+
+

-
-
+
+

@@ -29,7 +92,7 @@
-
+

@@ -40,8 +103,8 @@

-
-
+
+

@@ -49,7 +112,7 @@
-
+

@@ -58,14 +121,14 @@
-
-
+
+

<%@include file="termresult.jspf"%>
-
+

<%@include file="termresult.jspf"%> @@ -74,8 +137,8 @@

-
-
+
+

@@ -83,7 +146,7 @@
-
+

@@ -94,8 +157,8 @@

-
-
+
+

@@ -103,7 +166,7 @@
-
+

@@ -114,8 +177,8 @@

-
-
+
+

@@ -123,7 +186,7 @@
-
+

diff --git a/src/main/webapp/WEB-INF/jsp/accession/termresult.jspf b/src/main/webapp/WEB-INF/jsp/accession/termresult.jspf index 622e782257f07ecdd1b67696fd2f3274e972ed24..ad1908d82c222436f7e549646d77b309153fb3cf 100644 --- a/src/main/webapp/WEB-INF/jsp/accession/termresult.jspf +++ b/src/main/webapp/WEB-INF/jsp/accession/termresult.jspf @@ -4,7 +4,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - +
diff --git a/src/main/webapp/html/css/custom.css b/src/main/webapp/html/css/custom.css index 5406b091b5b343ff337baff7dfd74b309343e961..11a87bc2de8ae8676ea75b925a4f662e958c10ed 100755 --- a/src/main/webapp/html/css/custom.css +++ b/src/main/webapp/html/css/custom.css @@ -1174,6 +1174,24 @@ html[dir="rtl"] #stats .stat-lists ol li img { margin: 2px 5px; } +#allfilters.disabled .filter-block { + padding:2px 5px; +} + +#allfilters.disabled .filter-block .filtval { + background-image:none; + padding:2px 5px; +} + +#allfilters .edit-fil { + padding: 7px 0px; +} + +#allfilters.disabled .edit-fil { + cursor: default; + padding:4px 5px; +} + .filtval:hover { background-color:#ccc7af; text-decoration:none; @@ -1984,3 +2002,7 @@ html[dir="rtl"] .text-left { .row-section { margin-bottom: 2em; } + +table.terms-table td { + padding: 4px 10px; +} \ No newline at end of file