Mercurial > hg > LGServices
changeset 71:92ede90bc611
complete filters in the missing books table on topicPage
| author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
|---|---|
| date | Mon, 15 Aug 2016 11:09:20 +0200 |
| parents | 315a6360ea1b |
| children | 8fd847fbbe8f |
| files | src/main/java/de/mpiwg/web/jsp/TopicPage.java src/main/webapp/pages/topicPage.jsp |
| diffstat | 2 files changed, 178 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/TopicPage.java Wed Aug 10 17:28:09 2016 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/TopicPage.java Mon Aug 15 11:09:20 2016 +0200 @@ -67,6 +67,12 @@ private String dynastyFilterMissingBooks = new String(); + private String level1FilterMissingBooks = new String(); + private String level2FilterMissingBooks = new String(); + private String periodFilterMissingBooks = new String(); + private String adminTypeFilterMissingBooks = new String(); + private String bookNameFilterMissingBooks = new String(); + private DataPaginator paginator = new DataPaginator(); private String filteringMessage; @@ -80,6 +86,7 @@ private List<DBBook> filteredSectionListMissingBooks; + public void loadParameters(HttpServletRequest request, HttpServletResponse response){ this.request = request; @@ -98,6 +105,14 @@ this.dynastyFilterMissingBooks = getParameter("dynastyFilterMissingBooks"); + this.level1FilterMissingBooks = getParameter("level1FilterMissingBooks"); + this.level2FilterMissingBooks = getParameter("level2FilterMissingBooks"); + this.periodFilterMissingBooks = getParameter("periodFilterMissingBooks"); + this.adminTypeFilterMissingBooks = getParameter("adminTypeFilterMissingBooks"); + this.bookNameFilterMissingBooks = getParameter("bookNameFilterMissingBooks"); + + + } @@ -302,16 +317,21 @@ } - // filter on pendingBookList TODO complete filters for each field in Missing Books table + // filter on pendingBookList + // complete filters for each field in Missing Books table if (this.pendingBookList != null) { - this.filteredSectionListMissingBooks = new ArrayList<DBBook>(); for(DBBook book : this.pendingBookList){ if(!this.filteredSectionListMissingBooks.contains(book)){ - if( (StringUtils.isEmpty(dynastyFilterMissingBooks) || StringUtils.startsWith(book.getDynasty(), dynastyFilterMissingBooks)) - + if( (StringUtils.isEmpty(bookNameFilterMissingBooks) || StringUtils.startsWith(book.getName(), bookNameFilterMissingBooks)) && + (StringUtils.isEmpty(dynastyFilterMissingBooks) || StringUtils.startsWith(book.getDynasty(), dynastyFilterMissingBooks)) && + (StringUtils.isEmpty(level1FilterMissingBooks) || StringUtils.startsWith(book.getLevel1(), level1FilterMissingBooks)) && + (StringUtils.isEmpty(level2FilterMissingBooks) || StringUtils.startsWith(book.getLevel2(), level2FilterMissingBooks)) && + (StringUtils.isEmpty(periodFilterMissingBooks) || StringUtils.startsWith(book.getPeriod(), periodFilterMissingBooks)) && + (StringUtils.isEmpty(adminTypeFilterMissingBooks) || StringUtils.startsWith(book.getAdmin_type(), adminTypeFilterMissingBooks)) + ){ this.filteredSectionListMissingBooks.add(book); @@ -674,6 +694,67 @@ + public String getBookNameFilterMissingBooks() { + return bookNameFilterMissingBooks; + } + + + + public void setBookNameFilterMissingBooks(String bookNameFilterMissingBooks) { + this.bookNameFilterMissingBooks = bookNameFilterMissingBooks; + } + + + + public String getLevel1FilterMissingBooks() { + return level1FilterMissingBooks; + } + + + + public void setLevel1FilterMissingBooks(String level1FilterMissingBooks) { + this.level1FilterMissingBooks = level1FilterMissingBooks; + } + + + + public String getLevel2FilterMissingBooks() { + return level2FilterMissingBooks; + } + + + + public void setLevel2FilterMissingBooks(String level2FilterMissingBooks) { + this.level2FilterMissingBooks = level2FilterMissingBooks; + } + + + + public String getPeriodFilterMissingBooks() { + return periodFilterMissingBooks; + } + + + + public void setPeriodFilterMissingBooks(String periodFilterMissingBooks) { + this.periodFilterMissingBooks = periodFilterMissingBooks; + } + + + + public String getAdminTypeFilterMissingBooks() { + return adminTypeFilterMissingBooks; + } + + + + public void setAdminTypeFilterMissingBooks(String adminTypeFilterMissingBooks) { + this.adminTypeFilterMissingBooks = adminTypeFilterMissingBooks; + } + + + + public List<DBBook> getFilteredSectionListMissingBooks() { return filteredSectionListMissingBooks; }
--- a/src/main/webapp/pages/topicPage.jsp Wed Aug 10 17:28:09 2016 +0200 +++ b/src/main/webapp/pages/topicPage.jsp Mon Aug 15 11:09:20 2016 +0200 @@ -209,9 +209,61 @@ <table class="pageTable"> <tr> <th><label class="tableTitle">Book Id</label></th> - <th><label class="tableTitle">Book Name</label></th> - <th><label class="tableTitle">Level 1</label></th> - <th><label class="tableTitle">Level 2</label></th> + <th> + <table class="sortTable"> + <tr> + <td><label class="tableTitle">Book Name</label></td> + </tr> + <tr> + <td> + <input type="text" class="filterInput" name="bookNameFilterMissingBooks" id="bookNameFilterMissingBooks" value="<%= sessionBean.getTopicPage().getBookNameFilterMissingBooks() %>"/> + </td> + <td> + <input type="image" + onclick="setAction('filter', 'topicSectionRelationForm');" + src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> + </td> + </tr> + </table> + </th> + <th> + <table class="sortTable"> + <tr> + <td><label class="tableTitle">Level 1</label></td> + + </tr> + <tr> + <td> + <input type="text" class="filterInput" name="level1FilterMissingBooks" id="level1FilterMissingBooks" value="<%= sessionBean.getTopicPage().getLevel1FilterMissingBooks() %>"/> + </td> + <td> + <input type="image" + onclick="setAction('filter', 'topicSectionRelationForm');" + src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> + </td> + </tr> + </table> + + </th> + <th> + <table class="sortTable"> + <tr> + <td><label class="tableTitle">Level 2</label></td> + + </tr> + <tr> + <td> + <input type="text" class="filterInput" name="level2FilterMissingBooks" id="level2FilterMissingBooks" value="<%= sessionBean.getTopicPage().getLevel2FilterMissingBooks() %>"/> + </td> + <td> + <input type="image" + onclick="setAction('filter', 'topicSectionRelationForm');" + src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> + </td> + </tr> + </table> + + </th> <th> <table class="sortTable"> <tr> @@ -228,15 +280,47 @@ src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> </td> </tr> - </table> + </table> + + </th> - - + <th> + <table class="sortTable"> + <tr> + <td><label class="tableTitle">Period</label></td> + + </tr> + <tr> + <td> + <input type="text" class="filterInput" name="periodFilterMissingBooks" id="periodFilterMissingBooks" value="<%= sessionBean.getTopicPage().getPeriodFilterMissingBooks() %>"/> + </td> + <td> + <input type="image" + onclick="setAction('filter', 'topicSectionRelationForm');" + src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> + </td> + </tr> + </table> </th> - - <th><label class="tableTitle">Period</label></th> - <th><label class="tableTitle">Admin Type</label></th> + <th> + <table class="sortTable"> + <tr> + <td><label class="tableTitle">Admin Type</label></td> + </tr> + <tr> + <td> + <input type="text" class="filterInput" name="adminTypeFilterMissingBooks" id="adminTypeFilterMissingBooks" value="<%= sessionBean.getTopicPage().getAdminTypeFilterMissingBooks() %>"/> + </td> + <td> + <input type="image" + onclick="setAction('filter', 'topicSectionRelationForm');" + src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/> + </td> + </tr> + </table> + + </th> <th><label class="tableTitle">Section Name</label></th> <th><label class="tableTitle">Section Pages</label></th> <th><label class="tableTitle">Load Text (Plain)</label></th>