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

Fix columns in template assignment log tab

Browse source 
FEA: ItEr76S30PermissionsEnhancements
This commit is contained in:
Manuel Rego Casasnovas 2012-06-26 11:03:44 +02:00
parent 33f6ce22f3
commit 80d9f11c92
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ public class OrderElementHistoricAssignmentDTO {
public final String orderCode;
public final String orderElementCode;
private final String name;
public final String orderElementName;
public final String estimatedHours;
public final String workedHours;
public final OrderElement orderElement;
@ -47,6 +48,7 @@ public class OrderElementHistoricAssignmentDTO {
this.orderCode = order.getCode();
this.orderElementCode = orderElement.getCode();
this.name = order.getName();
this.orderElementName = orderElement.getName();
this.estimatedHours = estimatedHours;
this.workedHours = workedHours;
}
@ -79,4 +81,8 @@ public class OrderElementHistoricAssignmentDTO {
return name;
}
public String getOrderElementName() {
return orderElementName;
}
}

6
libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul
View file

@ -34,9 +34,10 @@
<columns>
<column label="${i18n:_('Project code')}" sort="orderCode" sortDirection="descending"/>
<column label="${i18n:_('Project Name')}" width="250px" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Project element code')}" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Task code')}" sort="auto(orderElementCode)" />
<column label="${i18n:_('Task name')}" sort="auto(orderElementName)" />
<column label="${i18n:_('Estimated hours')}" />
<column label="${i18n:_('worked hours')}" />
<column label="${i18n:_('Worked hours')}" />
<column label="${i18n:_('Operations')}" align="center" width="100px" />
</columns>
<rows>
@ -44,6 +45,7 @@
<label value="@{orderElementDTO.orderCode}"/>
<label value="@{orderElementDTO.name}"/>
<label value="@{orderElementDTO.orderElementCode}"/>
<label value="@{orderElementDTO.orderElementName}"/>
<label value="@{orderElementDTO.estimatedHours}"/>
<label value="@{orderElementDTO.workedHours}"/>
<button label="${i18n:_('View')}"