diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/OrderCostsPerResourceDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/OrderCostsPerResourceDTO.java index 08a297271..cea576c12 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/OrderCostsPerResourceDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/OrderCostsPerResourceDTO.java @@ -44,6 +44,8 @@ public class OrderCostsPerResourceDTO implements private Integer numHours; + private String orderElementName; + private String orderElementCode; private String descriptionValues; @@ -81,6 +83,7 @@ public class OrderCostsPerResourceDTO implements this.hoursTypeCode = workReportLine.getTypeOfWorkHours().getCode(); this.orderElement = workReportLine.getOrderElement(); this.orderElementCode = workReportLine.getOrderElement().getCode(); + this.orderElementName = workReportLine.getOrderElement().getName(); this.worker = worker; } @@ -226,4 +229,12 @@ public class OrderCostsPerResourceDTO implements return hoursTypeCode; } + public void setOrderElementName(String orderElementName) { + this.orderElementName = orderElementName; + } + + public String getOrderElementName() { + return orderElementName; + } + } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml index 159dab1a1..44d281cff 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml @@ -19,6 +19,7 @@ + @@ -52,7 +53,7 @@ - + @@ -94,17 +95,24 @@ - + - + - + + + + + + + +