RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add project name in tasks when no project is selected in status report

Browse source 
FEA: ItEr77S09WBSReport
This commit is contained in:
Manuel Rego Casasnovas 2012-10-23 13:56:45 +02:00
parent 1f4a6e98f8
commit ac99c98a82
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libreplan-business/src/main/java/org/libreplan/business/reports/dtos/ProjectStatusReportDTO.java
View file

@ -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

10
libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java
View file

@ -112,7 +112,7 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel {
List<ProjectStatusReportDTO> dtos = new ArrayList<ProjectStatusReportDTO>();
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<ProjectStatusReportDTO> dtos) {
if (isNotFiltering()) {
totalDTO = calculateDTO(order);
totalDTO = calculateDTO(order, false);
} else {
EffortDuration estimatedHours = EffortDuration.zero();
EffortDuration plannedHours = EffortDuration.zero();