diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java index c5cd1128d..98fc1307d 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java @@ -100,20 +100,16 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab { final Element filtersElem = depProjectsElem.newChildElement( "filters"); - statusFilter.generateXml(filtersElem); - if (((request.getParameter(STATUS_PARAM) == null) - || (request.getParameter(STATUS_PARAM).trim().isEmpty()) - || (statusFilter.getFilter() == null) - || (statusFilter.getFilter().trim().isEmpty())) + || (request.getParameter(STATUS_PARAM).trim().isEmpty())) && ((request.getParameter(TITLE_PARAM) == null) - || request.getParameter(TITLE_PARAM).trim().isEmpty()) - || (titleFilter.getFilter() == null) - || !(titleFilter.getFilter().trim().isEmpty())) { + || request.getParameter(TITLE_PARAM).trim().isEmpty())) { + + statusFilter.generateXml(filtersElem); depProjectsElem.newChildElement("greeting"); - projects.addOrder("projectBegin"); + projects.addOrder("projectBegin desc"); projects.addOrder("title"); projects.setRange(1, config.getGreetingSize() + 1); @@ -123,10 +119,11 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab { } else { projects.addOrder("title"); - applyStatusFilter(projects, request); applyTitleFilter(projects, request); + statusFilter.generateXml(filtersElem); + final Paginator paginator = new Paginator(request, (int) projects.size(), config.getPageSize()); @@ -138,7 +135,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab { paginator.applyLimits(projects); paginator.generateXml(depProjectsElem); } - + while (projects.next()) { generateProjectXml((BigDecimal) projects.get("projectId"), depProjectsElem, @@ -251,7 +248,7 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab { final XmlGenerator generator = new XmlGenerator(project); generator.setItemElemName("project", ""); generator.setUseExtraXml(false); - generator.generateXML(state, parent, ""); + generator.generateXML(state, parent, ""); logger.debug(String.format("Generated XML for project '%s' in %d ms.", project.getName(), System.currentTimeMillis() - start)); diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java index 3ba565e4a..3c402db11 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsTab.java @@ -99,21 +99,19 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab { "instituteProjects"); final Element filtersElem = depProjectsElem.newChildElement( "filters"); - - statusFilter.generateXml(filtersElem); - + if (((request.getParameter(STATUS_PARAM) == null) || (request.getParameter(STATUS_PARAM).trim().isEmpty()) - || (statusFilter.getFilter() == null) - || (statusFilter.getFilter().trim().isEmpty())) + ) && ((request.getParameter(TITLE_PARAM) == null) - || request.getParameter(TITLE_PARAM).trim().isEmpty()) - || (titleFilter.getFilter() == null) - || !(titleFilter.getFilter().trim().isEmpty())) { + || request.getParameter(TITLE_PARAM).trim().isEmpty() + )) { + statusFilter.generateXml(filtersElem); + depProjectsElem.newChildElement("greeting"); - projects.addOrder("projectBegin"); + projects.addOrder("projectBegin desc"); projects.addOrder("title"); projects.setRange(1, config.getGreetingSize() + 1); @@ -127,6 +125,8 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab { applyStatusFilter(projects, request); applyTitleFilter(projects, request); + statusFilter.generateXml(filtersElem); + final Paginator paginator = new Paginator(request, (int) projects.size(), config.getPageSize()); @@ -188,7 +188,7 @@ public class SciInstituteProjectsTab implements GenericOrgaUnitTab { } } else { /*projectsFilter.append(String.format("orgaunitId = %s", - orgaunit.getID().toString()));*/ + orgaunit.getID().toString()));*/ orgaunitIds.add(orgaunit.getID().toString()); } diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java index 91e224d36..04c96fd29 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java @@ -54,6 +54,8 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab { if (config.isShowingHead()) { generateHeadOfInstituteXml(institute, instituteSummaryElem, state); } + + generateDepartmentsXml(institute, instituteSummaryElem, state); logger.debug(String.format("Generated XML for summary tab of institute " + "'%s' in %d ms.",