# HG changeset patch # User Zoe Hong # Date 1447949646 -3600 # Node ID 89a5ca7d44f71663b9b0e95c3717c0a7bef90c4f # Parent 2e1662afc81c42fecae12195b413cc765956c74e new: rename branch to task, add fields in task table, add scroll bar diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/branch/SortBranchByAdminType.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/branch/SortBranchByAdminType.java Thu Nov 19 17:14:06 2015 +0100 @@ -0,0 +1,18 @@ +package de.mpiwg.web.branch; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.bo.LGBranch; +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBranchByAdminType implements Comparator{ + + public int compare(LGBranch o1, LGBranch o2) { + if(o1 == null || o2 == null){ + return o1.getId().compareTo(o2.getId()); + } + return o1.getBook().getAdmin_type().compareTo(o2.getBook().getAdmin_type()); + } + +} \ No newline at end of file diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/branch/SortBranchByDynasty.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/branch/SortBranchByDynasty.java Thu Nov 19 17:14:06 2015 +0100 @@ -0,0 +1,18 @@ +package de.mpiwg.web.branch; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.bo.LGBranch; +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBranchByDynasty implements Comparator{ + + public int compare(LGBranch o1, LGBranch o2) { + if(o1 == null || o2 == null){ + return o1.getId().compareTo(o2.getId()); + } + return o1.getBook().getDynasty().compareTo(o2.getBook().getDynasty()); + } + +} \ No newline at end of file diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/branch/SortBranchByLevel1.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/branch/SortBranchByLevel1.java Thu Nov 19 17:14:06 2015 +0100 @@ -0,0 +1,18 @@ +package de.mpiwg.web.branch; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.bo.LGBranch; +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBranchByLevel1 implements Comparator{ + + public int compare(LGBranch o1, LGBranch o2) { + if(o1 == null || o2 == null){ + return o1.getId().compareTo(o2.getId()); + } + return o1.getBook().getLevel1().compareTo(o2.getBook().getLevel1()); + } + +} \ No newline at end of file diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/branch/SortBranchByLevel2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/branch/SortBranchByLevel2.java Thu Nov 19 17:14:06 2015 +0100 @@ -0,0 +1,18 @@ +package de.mpiwg.web.branch; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.bo.LGBranch; +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBranchByLevel2 implements Comparator{ + + public int compare(LGBranch o1, LGBranch o2) { + if(o1 == null || o2 == null){ + return o1.getId().compareTo(o2.getId()); + } + return o1.getBook().getLevel2().compareTo(o2.getBook().getLevel2()); + } + +} \ No newline at end of file diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/branch/SortBranchBySectionStartPage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/web/branch/SortBranchBySectionStartPage.java Thu Nov 19 17:14:06 2015 +0100 @@ -0,0 +1,18 @@ +package de.mpiwg.web.branch; + +import java.util.Comparator; + +import de.mpiwg.gazetteer.bo.LGBranch; +import de.mpiwg.gazetteer.db.DBBook; + + +public class SortBranchBySectionStartPage implements Comparator{ + + public int compare(LGBranch o1, LGBranch o2) { + if(o1 == null || o2 == null){ + return o1.getId().compareTo(o2.getId()); + } + return o1.getSection().getStart_page().compareTo(o2.getSection().getStart_page()); + } + +} \ No newline at end of file diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/jsp/HomePage.java --- a/src/main/java/de/mpiwg/web/jsp/HomePage.java Mon Nov 02 16:05:21 2015 +0100 +++ b/src/main/java/de/mpiwg/web/jsp/HomePage.java Thu Nov 19 17:14:06 2015 +0100 @@ -30,18 +30,28 @@ + + + + + import de.mpiwg.gazetteer.bo.LGBranch; import de.mpiwg.gazetteer.db.DBBook; import de.mpiwg.gazetteer.utils.DBService; import de.mpiwg.gazetteer.utils.DataProvider; import de.mpiwg.web.books.SortBooksByBookId; +import de.mpiwg.web.branch.SortBranchByAdminType; import de.mpiwg.web.branch.SortBranchByBookName; import de.mpiwg.web.branch.SortBranchByBranchId; +import de.mpiwg.web.branch.SortBranchByDynasty; import de.mpiwg.web.branch.SortBranchByLabel; import de.mpiwg.web.branch.SortBranchByLastModified; +import de.mpiwg.web.branch.SortBranchByLevel1; +import de.mpiwg.web.branch.SortBranchByLevel2; import de.mpiwg.web.branch.SortBranchByPeriod; import de.mpiwg.web.branch.SortBranchByPublishedInDataverse; import de.mpiwg.web.branch.SortBranchBySectionName; +import de.mpiwg.web.branch.SortBranchBySectionStartPage; public class HomePage extends AbstractJSPPage{ @@ -59,11 +69,15 @@ private List displayBranchList; private String bookNameFilter = new String(); + private String level1Filter = new String(); + private String level2Filter = new String(); + private String dynastyFilter = new String(); + private String adminTypeFilter = new String(); private String bookIdFilter = new String(); private String periodFilter = new String(); private String sectionNameFilter = new String(); private String labelFilter = new String(); - + private int branchNumber; @@ -80,10 +94,13 @@ this.branchId = getLongParameter("branchId"); this.bookIdFilter = getParameter("bookIdFilter"); this.bookNameFilter = getParameter("bookNameFilter"); + this.level1Filter = getParameter("level1Filter"); + this.level2Filter = getParameter("level2Filter"); this.periodFilter = getParameter("periodFilter"); this.sectionNameFilter = getParameter("sectionNameFilter"); this.labelFilter = getParameter("labelFilter"); - + this.dynastyFilter = getParameter("dynastyFilter"); + this.adminTypeFilter = getParameter("adminTypeFilter"); } @@ -234,6 +251,10 @@ for (LGBranch branch : this.completeBranchList) { if(!this.filteredBranchList.contains(branch)){ if( (StringUtils.isEmpty(bookNameFilter) || StringUtils.startsWith(branch.getBook().getName(), bookNameFilter)) && + (StringUtils.isEmpty(level1Filter) || StringUtils.startsWith(branch.getBook().getLevel1(), level1Filter)) && + (StringUtils.isEmpty(level2Filter) || StringUtils.startsWith(branch.getBook().getLevel2(), level2Filter)) && + (StringUtils.isEmpty(dynastyFilter) || StringUtils.startsWith(branch.getBook().getDynasty(), dynastyFilter)) && + (StringUtils.isEmpty(adminTypeFilter) || StringUtils.startsWith(branch.getBook().getAdmin_type(), adminTypeFilter)) && (StringUtils.isEmpty(bookIdFilter) || StringUtils.startsWith(branch.getBook().getId(), bookIdFilter)) && (StringUtils.isEmpty(periodFilter) || StringUtils.startsWith(branch.getBook().getPeriod(), periodFilter)) && (StringUtils.isEmpty(sectionNameFilter) || StringUtils.startsWith(branch.getSection().getName(), sectionNameFilter)) && @@ -280,6 +301,56 @@ Collections.reverse(this.completeBranchList); filter(); } + + public void sortByLevel1Up() { + Collections.sort(this.completeBranchList, new SortBranchByLevel1()); + filter(); + } + + public void sortByLevel1Down() { + Collections.sort(this.completeBranchList, new SortBranchByLevel1()); + Collections.reverse(this.completeBranchList); + filter(); + } + public void sortByLevel2Up() { + Collections.sort(this.completeBranchList, new SortBranchByLevel2()); + filter(); + } + + public void sortByLevel2Down() { + Collections.sort(this.completeBranchList, new SortBranchByLevel2()); + Collections.reverse(this.completeBranchList); + filter(); + } + public void sortByDynastyUp() { + Collections.sort(this.completeBranchList, new SortBranchByDynasty()); + filter(); + } + public void sortByDynastyDown() { + Collections.sort(this.completeBranchList, new SortBranchByDynasty()); + Collections.reverse(this.completeBranchList); + filter(); + } + public void sortByAdminTypeUp() { + Collections.sort(this.completeBranchList, new SortBranchByAdminType()); + filter(); + } + public void sortByAdminTypeDown() { + Collections.sort(this.completeBranchList, new SortBranchByAdminType()); + Collections.reverse(this.completeBranchList); + filter(); + } + public void sortBySectionStartPageUp() { + Collections.sort(this.completeBranchList, new SortBranchBySectionStartPage()); + filter(); + } + public void sortBySectionStartPageDown() { + Collections.sort(this.completeBranchList, new SortBranchBySectionStartPage()); + Collections.reverse(this.completeBranchList); + filter(); + } + + public void sortByPeriodUp() { Collections.sort(this.completeBranchList, new SortBranchByPeriod()); filter(); @@ -371,6 +442,46 @@ } + public String getLevel1Filter() { + return level1Filter; + } + + + public void setLevel1Filter(String level1Filter) { + this.level1Filter = level1Filter; + } + + + public String getLevel2Filter() { + return level2Filter; + } + + + public void setLevel2Filter(String level2Filter) { + this.level2Filter = level2Filter; + } + + + public String getDynastyFilter() { + return dynastyFilter; + } + + + public void setDynastyFilter(String dynastyFilter) { + this.dynastyFilter = dynastyFilter; + } + + + public String getAdminTypeFilter() { + return adminTypeFilter; + } + + + public void setAdminTypeFilter(String adminTypeFilter) { + this.adminTypeFilter = adminTypeFilter; + } + + diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/java/de/mpiwg/web/jsp/JSPProxy.java --- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Mon Nov 02 16:05:21 2015 +0100 +++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java Thu Nov 19 17:14:06 2015 +0100 @@ -84,6 +84,30 @@ getSessionBean().getHomePage().sortByBookNameUp(); } else if(StringUtils.equals(action, "sortByBookNameDown")) { getSessionBean().getHomePage().sortByBookNameDown(); + + } else if(StringUtils.equals(action, "sortByLevel1Up")) { + getSessionBean().getHomePage().sortByLevel1Up(); + } else if(StringUtils.equals(action, "sortByLevel1Down")) { + getSessionBean().getHomePage().sortByLevel1Down(); + } else if(StringUtils.equals(action, "sortByLevel2Up")) { + getSessionBean().getHomePage().sortByLevel2Up(); + } else if(StringUtils.equals(action, "sortByLevel2Down")) { + getSessionBean().getHomePage().sortByLevel2Down(); + + } else if(StringUtils.equals(action, "sortByAdminTypeUp")) { + getSessionBean().getHomePage().sortByAdminTypeUp(); + } else if(StringUtils.equals(action, "sortByAdminTypeDown")) { + getSessionBean().getHomePage().sortByAdminTypeDown(); + } else if(StringUtils.equals(action, "sortByDynastyUp")) { + getSessionBean().getHomePage().sortByDynastyUp(); + } else if(StringUtils.equals(action, "sortByDynastyDown")) { + getSessionBean().getHomePage().sortByDynastyDown(); + } else if(StringUtils.equals(action, "sortBySectionStartPageUp")) { + getSessionBean().getHomePage().sortBySectionStartPageUp(); + } else if(StringUtils.equals(action, "sortBySectionStartPageDown")) { + getSessionBean().getHomePage().sortBySectionStartPageDown(); + + } else if(StringUtils.equals(action, "sortByPeriodUp")) { getSessionBean().getHomePage().sortByPeriodUp(); } else if(StringUtils.equals(action, "sortByPeriodDown")) { diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/resources/config.properties --- a/src/main/resources/config.properties Mon Nov 02 16:05:21 2015 +0100 +++ b/src/main/resources/config.properties Thu Nov 19 17:14:06 2015 +0100 @@ -2,15 +2,15 @@ files_root=/gazetteer-server/data #Local -db_gazetter_username=root -db_gazetter_password=root -dvn_server=http://localhost:8082 -dvn_apitoken=9dd1f749-8c42-49ab-a2ba-fbb963c2ff90 -dv_id=2 -root_server=http://localhost:8080/LGServices -toc_interface=http://localhost:1080/localgazetteers-dev/LGToc -extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface -localgazetteers_dvId=185 +#db_gazetter_username=root +#db_gazetter_password=root +#dvn_server=http://localhost:8082 +#dvn_apitoken=9dd1f749-8c42-49ab-a2ba-fbb963c2ff90 +#dv_id=2 +#root_server=http://localhost:8080/LGServices +#toc_interface=http://localhost:1080/localgazetteers-dev/LGToc +#extraction_interface=http://localhost:1080/localgazetteers-dev/extraction-interface +#localgazetteers_dvId=185 # Production one: #localgazetteers-dev -> localgazetteers @@ -25,12 +25,12 @@ # Development one: #localgazetteers -> localgazetteers-test -#db_gazetter_username=root -#db_gazetter_password=admin -#dvn_server=http://dvn.localgazetteers-test.mpiwg-berlin.mpg.de -#dvn_apitoken=6acf9525-faba-4ea6-bfff-f83b44386c62 -#dv_id=1 -#root_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGServices -#toc_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGToc -#extraction_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/extraction-interface -#localgazetteers_dvId=2 +db_gazetter_username=root +db_gazetter_password=admin +dvn_server=http://dvn.localgazetteers-test.mpiwg-berlin.mpg.de +dvn_apitoken=6acf9525-faba-4ea6-bfff-f83b44386c62 +dv_id=1 +root_server=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGServices +toc_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/LGToc +extraction_interface=http://localgazetteers-test.mpiwg-berlin.mpg.de/extraction-interface +localgazetteers_dvId=2 diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/webapp/componentes/headContent.jsp --- a/src/main/webapp/componentes/headContent.jsp Mon Nov 02 16:05:21 2015 +0100 +++ b/src/main/webapp/componentes/headContent.jsp Thu Nov 19 17:14:06 2015 +0100 @@ -3,12 +3,20 @@ LGServices - + + + + + + diff -r 2e1662afc81c -r 89a5ca7d44f7 src/main/webapp/componentes/template.jsp --- a/src/main/webapp/componentes/template.jsp Mon Nov 02 16:05:21 2015 +0100 +++ b/src/main/webapp/componentes/template.jsp Thu Nov 19 17:14:06 2015 +0100 @@ -62,7 +62,7 @@