diff --git a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml index 1bf8ffe92..23d2c5a67 100644 --- a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml +++ b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml @@ -18,6 +18,7 @@ + @@ -72,6 +73,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties index b4522a390..fc59b01ff 100644 --- a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties +++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus.properties @@ -1,6 +1,7 @@ # Locale for projectStatusReport.jrxml title = Project status report project = Project: +filter = Filter: project_estimated_hours = Estimated hours: project_planned_hours = Planned hours: project_imputed_hours = Imputed hours: @@ -16,4 +17,4 @@ project_total_cost = Total cost: budget = Budget hours_cost = Hours cost expenses_cost = Expenses cost -total_cost = Total cost \ No newline at end of file +total_cost = Total cost diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java index 66a712c72..1cfdf5365 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java @@ -21,6 +21,7 @@ package org.libreplan.web.reports; import static org.libreplan.web.I18nHelper._; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -29,6 +30,7 @@ import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JREmptyDataSource; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import org.codehaus.plexus.util.StringUtils; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.reports.dtos.ProjectStatusReportDTO; @@ -124,6 +126,8 @@ public class ProjectStatusReportController extends LibrePlanReportController { if (order != null) { result.put("project", order.getName() + " (" + order.getCode() + ")"); + } else { + result.put("filter", getFilterSummary()); } ProjectStatusReportDTO totalDTO = projectStatusReportModel @@ -142,6 +146,35 @@ public class ProjectStatusReportController extends LibrePlanReportController { return result; } + private String getFilterSummary() { + String filter = ""; + + Set