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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #539]

Browse source 
This bug was fixed with the following patch :
ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : It fixes the template screen.

This patch adds to the aplications list of a template the name of the order element.
Also, assigns correctly the template to the order when the order is created
from a template.
This commit is contained in:
Susana Montes Pedreira 2010-06-22 16:20:47 +02:00 • committed by Javier Moran Rua
parent ef5e7f69fd
commit 6637da457c
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
View file

@ -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));
}

6
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java
View file

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

4
navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul
View file

@ -33,14 +33,16 @@
<columns>
<column label="${i18n:_('Order code')}" sort="orderCode" sortDirection="descending"/>
<column label="${i18n:_('Order element code')}" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Name')}" width="250px" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Estimated hours')}" />
<column label="${i18n:_('worked hours')}" />
<column label="${i18n:_('Operations')}" />
<column label="${i18n:_('Operations')}" align="center" width="100px" />
</columns>
<rows>
<row self="@{each='orderElementDTO'}" value="@{orderElementDTO}">
<label value="@{orderElementDTO.orderCode}"/>
<label value="@{orderElementDTO.orderElementCode}"/>
<label value="@{orderElementDTO.name}"/>
<label value="@{orderElementDTO.estimatedHours}"/>
<label value="@{orderElementDTO.workedHours}"/>
<button label="${i18n:_('View')}"