From 80d9f11c9298dc13427a83ac6cbfe4c9ab4cd2ca Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 26 Jun 2012 11:03:44 +0200
Subject: [PATCH] Fix columns in template assignment log tab

FEA: ItEr76S30PermissionsEnhancements
---
 .../OrderElementHistoricAssignmentDTO.java                  | 6 ++++++
 .../src/main/webapp/templates/_historicalAssignment.zul     | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java
index 47712927b..cde1b3ee3 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricAssignmentDTO.java
@@ -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;
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul b/libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul
index f5706cd8d..a5bc752a4 100644
--- a/libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul
+++ b/libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul
@@ -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')}"