Ergänzungen für ZeS-Testserver

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

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java

@@ -69,7 +69,7 @@ public abstract class CompoundContentItemPanel
     /**
      * PageSize for the a paginator
      */
-    private long m_pageSize = 3;
+    private long m_pageSize = 30;
 
     public CompoundContentItemPanel() {
         super();

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPanel.java

@@ -224,7 +224,7 @@ public class SciDepartmentPanel extends SciOrganizationBasePanel {
             members = new LinkedList<MemberListItem>();
             GenericOrganizationalUnitPersonCollection departmentMembers;
             departmentMembers = department.getPersons();
-            for(String filter : filters) {
+            for (String filter : filters) {
                 departmentMembers.addFilter(filter);
             }
 
@@ -268,7 +268,7 @@ public class SciDepartmentPanel extends SciOrganizationBasePanel {
         } else {
             GenericOrganizationalUnitPersonCollection departmentMembers;
             departmentMembers = department.getPersons();
-            for(String filter : filters) {
+            for (String filter : filters) {
                 departmentMembers.addFilter(filter);
             }
 
@@ -439,13 +439,13 @@ public class SciDepartmentPanel extends SciOrganizationBasePanel {
         if (config.getOrganizationProjectsAllInOne()) {
             if (hasProjects(department, new LinkedList<String>())) {
                 availableData.newChildElement("projects");
-            } else {
+            }
-                if (hasProjects(department, getFiltersForOngoingProjects())) {
+        } else {
-                    availableData.newChildElement("projectsOngoing");
+            if (hasProjects(department, getFiltersForOngoingProjects())) {
-                }
+                availableData.newChildElement("projectsOngoing");
-                if (hasProjects(department, getFiltersForFinishedProjects())) {
+            }
-                    availableData.newChildElement("projectsFinished");
+            if (hasProjects(department, getFiltersForFinishedProjects())) {
-                }
+                availableData.newChildElement("projectsFinished");
             }
         }
 
@@ -460,19 +460,26 @@ public class SciDepartmentPanel extends SciOrganizationBasePanel {
         } else if (SHOW_CONTACTS.equals(show)) {
             generateContactsXML(department, content, state);
         } else if (SHOW_MEMBERS.equals(show)) {
-            generateMembersXML(department, content, state, new LinkedList<String>());
+            generateMembersXML(department, content, state,
+                               new LinkedList<String>());
         } else if (SHOW_MEMBERS_ACTIVE.equals(show)) {
-            generateMembersXML(department, content, state, getFiltersForActiveMembers());
+            generateMembersXML(department, content, state,
+                               getFiltersForActiveMembers());
         } else if (SHOW_MEMBERS_ASSOCIATED.equals(show)) {
-            generateMembersXML(department, content, state, getFiltersForAssociatedMembers());
+            generateMembersXML(department, content, state,
+                               getFiltersForAssociatedMembers());
         } else if (SHOW_MEMBERS_FORMER.equals(show)) {
-            generateMembersXML(department, content, state, getFiltersForFormerMembers());
+            generateMembersXML(department, content, state,
+                               getFiltersForFormerMembers());
         } else if (SHOW_PROJECTS.equals(show)) {
-            generateProjectsXML(department, content, state, new LinkedList<String>());
+            generateProjectsXML(department, content, state,
-        } else if (SHOW_PROJECTS_ONGOING.equals(show)) {            
+                                new LinkedList<String>());
-            generateProjectsXML(department, content, state, getFiltersForOngoingProjects());
+        } else if (SHOW_PROJECTS_ONGOING.equals(show)) {
+            generateProjectsXML(department, content, state,
+                                getFiltersForOngoingProjects());
         } else if (SHOW_PROJECTS_FINISHED.equals(show)) {
-            generateProjectsXML(department, content, state, getFiltersForFinishedProjects());
+            generateProjectsXML(department, content, state,
-        }                
+                                getFiltersForFinishedProjects());
+        }
     }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java

@@ -147,10 +147,25 @@ public abstract class SciOrganizationBasePanel
         public int compare(SciProject project1, SciProject project2) {
             int result = 0;
 
-            result = project1.getBegin().compareTo(project2.getBegin());
+            if (project1.getBegin() == null) {
+                return -1;
+            } else if (project2.getBegin() == null) {
+                return 1;
+            } else {
+                result = project1.getBegin().compareTo(project2.getBegin());
+            }
 
             if (result == 0) {
-                result = project1.getEnd().compareTo(project2.getEnd());
+                if (project1.getEnd() == null) {
+                    return -1;
+                } else if (project2.getEnd() == null) {
+                    return 1;
+                } else if ((project1.getEnd() == null) && (project2.getEnd()
+                                                               == null)) {
+                    return 0;
+                } else {
+                    result = project1.getEnd().compareTo(project2.getEnd());
+                }
             }
 
             return result;
@@ -190,11 +205,12 @@ public abstract class SciOrganizationBasePanel
 
         filters = new LinkedList<String>();
         today = new GregorianCalendar();
-        filters.add(String.format("projectend > '%d-%02d-%02d'",
+        filters.add(String.format(
-                                  today.get(java.util.Calendar.YEAR),
+                "(projectbegin IS NOT null) AND (projectend > '%d-%02d-%02d' OR projectend IS null)",
-                                  today.get(java.util.Calendar.MONTH)
+                today.get(java.util.Calendar.YEAR),
-                                  + 1,
+                today.get(java.util.Calendar.MONTH)
-                                  today.get(java.util.Calendar.DAY_OF_MONTH)));
+                + 1,
+                today.get(java.util.Calendar.DAY_OF_MONTH)));
         return filters;
     }
 

ccm-zes-aplaws/web/packages/navigation/templates/SciDepartment-index.jsp

@@ -0,0 +1,67 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+       xmlns:define="/WEB-INF/bebop-define.tld" 
+         xmlns:show="/WEB-INF/bebop-show.tld"
+	    version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30);
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+