Verbesserung des Filter-Handlings für Projekt- und Publikationstab bei Abteilungen und Instituten

git-svn-id: https://svn.libreccm.org/ccm/trunk@1309 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/pdl/com/arsdigita/content-types/GenericOrganizationalUnit.pdl

@@ -1,6 +1,5 @@
 //
-// Copyright (C) 2010 Jens Pelzetter, for the Center of Social Politics (ZeS) of
+// Copyright (C) 2010 Jens Pelzetter
-// the University of Bremen
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public License

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/panels/SelectFilter.java

@@ -107,6 +107,7 @@ public class SelectFilter implements Filter {
 
         filter = parent.newChildElement("filter");
         filter.addAttribute("type", "select");
+        filter.addAttribute("label", label);
 
         if(options.isEmpty()) {
             return;
@@ -124,7 +125,6 @@ public class SelectFilter implements Filter {
             selected = value;
         }
         
-        filter.addAttribute("label", label);
         filter.addAttribute("selected", selected);
 
         if (emptyDefaultOption) {

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMembersTab.java

@@ -14,7 +14,6 @@ import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java

@@ -109,6 +109,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
 
             depProjectsElem.newChildElement("greeting");
 
+            projects.addOrder("projectEnd desc");
             projects.addOrder("projectBegin desc");
             projects.addOrder("title");
 
@@ -124,11 +125,18 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
 
             statusFilter.generateXml(filtersElem);
 
+            if (projects.isEmpty()) {
+                titleFilter.generateXml(filtersElem);
+
+                depProjectsElem.newChildElement("noProjects");
+            } else {
                 final Paginator paginator = new Paginator(request,
                                                           (int) projects.size(),
                                                           config.getPageSize());
 
-            if (paginator.getPageCount() > config.getEnableSearchLimit()) {
+                if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                    || ((request.getParameter(TITLE_PARAM) != null)
+                        || !(request.getParameter(TITLE_PARAM).trim().isEmpty()))) {
                     titleFilter.generateXml(filtersElem);
                 }
 
@@ -141,6 +149,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
                                    depProjectsElem,
                                    state);
             }
+        }
 
         logger.debug(String.format("Generated projects list of department '%s' "
                                    + "in %d ms.",

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsTab.java

@@ -181,22 +181,41 @@ public class SciDepartmentPublicationsTab implements GenericOrgaUnitTab {
                 publications.addOrder("title");
             }
 
-            yearFilter.setDataQuery(getData(orgaunit), "year");            
+            final DataQuery yearQuery = getData(orgaunit);
+            yearFilter.setDataQuery(yearQuery, "year");            
             
             applyYearFilter(publications, request);
             applyTitleFilter(publications, request);
             applyAuthorFilter(publications, request);
             
+            applyTitleFilter(yearQuery, request);
+            applyAuthorFilter(yearQuery, request);
+            
+            if (publications.isEmpty()) {
+                yearFilter.generateXml(filtersElem);
+                titleFilter.generateXml(filtersElem);
+                authorFilter.generateXml(filtersElem);
+                
+                depPublicationsElem.newChildElement("noPublications");
+                
+                return;
+                
+            }
+
             final Paginator paginator = new Paginator(request,
                                                       (int) publications.size(),
                                                       config.getPageSize());
 
-            if ((paginator.getPageCount() > config.getEnableSearchLimit())
-                || (yearValue != null) || !(yearValue.trim().isEmpty())
-                || (titleValue != null) || !(titleValue.trim().isEmpty())
-                || (authorValue != null) || !(authorValue.trim().isEmpty())) {
             yearFilter.generateXml(filtersElem);            
+            if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                || ((request.getParameter(TITLE_PARAM) != null)
+                    && !(request.getParameter(TITLE_PARAM).trim().isEmpty()))) {
                 titleFilter.generateXml(filtersElem);
+            }
+
+            if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                || ((request.getParameter(AUTHOR_PARAM) != null)
+                    && !(request.getParameter(AUTHOR_PARAM).trim().isEmpty()))) {
                 authorFilter.generateXml(filtersElem);
             }
 

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java

@@ -101,16 +101,15 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
                 "filters");
 
         if (((request.getParameter(STATUS_PARAM) == null)
-             || (request.getParameter(STATUS_PARAM).trim().isEmpty())
+             || (request.getParameter(STATUS_PARAM).trim().isEmpty()))
-           )
             && ((request.getParameter(TITLE_PARAM) == null)
-                || request.getParameter(TITLE_PARAM).trim().isEmpty()
+                || request.getParameter(TITLE_PARAM).trim().isEmpty())) {
-                )) {
 
             statusFilter.generateXml(filtersElem);
 
             depProjectsElem.newChildElement("greeting");
 
+            projects.addOrder("projectEnd desc");
             projects.addOrder("projectBegin desc");
             projects.addOrder("title");
 
@@ -121,17 +120,23 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
         } else {
             projects.addOrder("title");
 
-
             applyStatusFilter(projects, request);
             applyTitleFilter(projects, request);
 
             statusFilter.generateXml(filtersElem);
 
+            if (projects.isEmpty()) {
+                titleFilter.generateXml(filtersElem);
+                
+                depProjectsElem.newChildElement("noProjects");
+            } else {
                 final Paginator paginator = new Paginator(request,
                                                           (int) projects.size(),
                                                           config.getPageSize());
 
-            if (paginator.getPageCount() > config.getEnableSearchLimit()) {
+                if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                    || ((request.getParameter(TITLE_PARAM) != null)
+                        || !(request.getParameter(TITLE_PARAM).trim().isEmpty()))) {
                     titleFilter.generateXml(filtersElem);
                 }
 
@@ -144,6 +149,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab {
                                    depProjectsElem,
                                    state);
             }
+        }
 
         logger.debug(String.format("Generated projects list of department '%s' "
                                    + "in %d ms.",

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePublicationsTab.java

@@ -207,19 +207,40 @@ public class SciInstitutePublicationsTab implements GenericOrgaUnitTab {
                 publications.addOrder("title");
             }
 
-            yearFilter.setDataQuery(getData(orgaunit), "year");
+            final DataQuery yearQuery = getData(orgaunit);
+            yearFilter.setDataQuery(yearQuery, "year");
 
             applyYearFilter(publications, request);
             applyTitleFilter(publications, request);
             applyAuthorFilter(publications, request);
             
+            applyTitleFilter(yearQuery, request);
+            applyAuthorFilter(yearQuery, request);
+
+            if (publications.isEmpty()) {
+                yearFilter.generateXml(filtersElem);
+                titleFilter.generateXml(filtersElem);
+                authorFilter.generateXml(filtersElem);
+
+                publicationsElem.newChildElement("noPublications");
+
+                return;
+            }
+
             final Paginator paginator = new Paginator(request,
                                                       (int) publications.size(),
                                                       config.getPageSize());
 
             yearFilter.generateXml(filtersElem);
-            if (paginator.getPageCount() > config.getEnableSearchLimit()) {                
+            if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                || ((request.getParameter(TITLE_PARAM) != null)
+                    && !(request.getParameter(TITLE_PARAM).trim().isEmpty()))) {
                 titleFilter.generateXml(filtersElem);
+            }
+
+            if ((paginator.getPageCount() > config.getEnableSearchLimit())
+                || ((request.getParameter(AUTHOR_PARAM) != null)
+                    && !(request.getParameter(AUTHOR_PARAM).trim().isEmpty()))) {
                 authorFilter.generateXml(filtersElem);
             }
 

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java

@@ -190,7 +190,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
                                                              institute.
                 getSubordinateOrgaUnits();
         departments.addFilter(
-                String.format("%s = '%s",
+                String.format("%s = '%s'",
                               GenericOrganizationalUnitSubordinateCollection.LINK_ASSOCTYPE,
                               SciInstituteDepartmentsStep.ASSOC_TYPE));