diff --git a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java index a84a4fe5a..5533d46f4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java @@ -76,10 +76,17 @@ public class ProjectStatusReportDTO { this.name = name; } - public ProjectStatusReportDTO(OrderElement orderElement) { + public ProjectStatusReportDTO(OrderElement orderElement, + boolean appendProjectInName) { code = orderElement.getCode(); - name = Util.getPrefixSpacesDependingOnDepth(orderElement) - + orderElement.getName(); + + if (appendProjectInName) { + name = orderElement.getName() + " (" + + orderElement.getOrder().getName() + ")"; + } else { + name = Util.getPrefixSpacesDependingOnDepth(orderElement) + + orderElement.getName(); + } Integer estimatedHours = orderElement.getWorkHours(); this.estimatedHours = estimatedHours != null ? EffortDuration diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java index 17e1bca71..b323ad51c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java @@ -112,7 +112,7 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel { List dtos = new ArrayList(); for (OrderElement child : orderElements) { - dtos.add(calculateDTO(child)); + dtos.add(calculateDTO(child, order == null)); } calculateTotalDTO(order, dtos); @@ -120,8 +120,8 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel { return dtos; } - private ProjectStatusReportDTO calculateDTO(OrderElement orderElement) { - ProjectStatusReportDTO dto = new ProjectStatusReportDTO(orderElement); + private ProjectStatusReportDTO calculateDTO(OrderElement orderElement, boolean appendProjectInName) { + ProjectStatusReportDTO dto = new ProjectStatusReportDTO(orderElement, appendProjectInName); dto.setHoursCost(moneyCostCalculator.getHoursMoneyCost(orderElement)); dto.setExpensesCost(moneyCostCalculator .getExpensesMoneyCost(orderElement)); @@ -144,7 +144,7 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel { if (isCriterionSelected(criterionRequirement.getCriterion() .getCode())) { if (!criterionRequirement.isValid()) { - dtosToDiscount.add(calculateDTO(child)); + dtosToDiscount.add(calculateDTO(child, false)); } } } @@ -203,7 +203,7 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel { private void calculateTotalDTO(Order order, List dtos) { if (isNotFiltering()) { - totalDTO = calculateDTO(order); + totalDTO = calculateDTO(order, false); } else { EffortDuration estimatedHours = EffortDuration.zero(); EffortDuration plannedHours = EffortDuration.zero();