diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java index 35db0a8fe..f00dc42e0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java @@ -59,6 +59,7 @@ public class OrderTemplate extends OrderLineGroupTemplate { order.useSchedulingDataFor(currentScenario); order.setInitDate(today()); order.setCalendar(calendar); + order.initializeTemplate(this); return setupGroupParts(setupSchedulingStateType(order)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java index 4e2e5b498..f6e26214e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java @@ -32,6 +32,7 @@ public class OrderElementHistoricAssignmentDTO { public final String orderCode; public final String orderElementCode; + private final String name; public final String estimatedHours; public final String workedHours; public final OrderElement orderElement; @@ -44,6 +45,7 @@ public class OrderElementHistoricAssignmentDTO { this.order = order; this.orderCode = order.getCode(); this.orderElementCode = orderElement.getCode(); + this.name = orderElement.getName(); this.estimatedHours = estimatedHours; this.workedHours = workedHours; } @@ -72,4 +74,8 @@ public class OrderElementHistoricAssignmentDTO { return order; } + public String getName() { + return name; + } + } diff --git a/navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul b/navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul index 799caaa00..3a6e846e2 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul @@ -33,14 +33,16 @@ + - +