From 4fd26c7a0cc20653be3d2ffa6416d8398d2e91fd Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 1 Jun 2012 13:32:00 +0200
Subject: [PATCH] Add total work column in work reports list

FEA: ItEr76S28UserDashboard
---
 .../org/libreplan/web/workreports/WorkReportDTO.java     | 9 +++++++++
 .../src/main/webapp/workreports/workReport.zul           | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportDTO.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportDTO.java
index 91f3589b3..db012187f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportDTO.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportDTO.java
@@ -23,6 +23,7 @@ package org.libreplan.web.workreports;
 
 import java.util.Date;
 
+import org.libreplan.business.workingday.EffortDuration;
 import org.libreplan.business.workreports.entities.WorkReport;
 import org.libreplan.business.workreports.entities.WorkReportLine;
 import org.libreplan.business.workreports.entities.WorkReportType;
@@ -44,6 +45,8 @@ public class WorkReportDTO {
         if (workReportType.isMonthlyTimesheetsType()) {
             this.type += " - " + workReport.getResource().getShortDescription();
         }
+
+        this.hours = workReport.getTotalEffortDuration();
     }
 
     private WorkReport workReport;
@@ -54,6 +57,8 @@ public class WorkReportDTO {
 
     private String type;
 
+    private EffortDuration hours;
+
     public WorkReport getWorkReport() {
         return workReport;
     }
@@ -122,4 +127,8 @@ public class WorkReportDTO {
         return workReport.getCode();
     }
 
+    public EffortDuration getHours() {
+        return hours;
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/workreports/workReport.zul b/libreplan-webapp/src/main/webapp/workreports/workReport.zul
index c47113261..4b4a4a7d5 100644
--- a/libreplan-webapp/src/main/webapp/workreports/workReport.zul
+++ b/libreplan-webapp/src/main/webapp/workreports/workReport.zul
@@ -63,6 +63,7 @@
                     <column id="columnDateStart" label="${i18n:_('Date Start')}" sort="auto(dateStart, dateFinish)" sortDirection="ascending"/>
                     <column id="columnDateFinish" label="${i18n:_('Date Finish')}" sort="auto(dateFinish, dateStart)" sortDirection="ascending"/>
                     <column label="${i18n:_('Type')}" sort="auto(type)"/>
+                    <column label="${i18n:_('Total work')}" sort="auto(hours)" />
                     <column label="${i18n:_('Code')}" />
                     <column label="${i18n:_('Actions')}" />
                 </columns>
@@ -71,6 +72,7 @@
                         <label value="@{workReportDTO.dateStart, converter='org.libreplan.web.common.typeconverters.DateConverter'}" />
                         <label value="@{workReportDTO.dateFinish, converter='org.libreplan.web.common.typeconverters.DateConverter'}"/>
                         <label value="@{workReportDTO.type}" />
+                        <label value="@{workReportDTO.hours.toFormattedString}" />
                         <label value="@{workReportDTO.code}" />
 
                         <hbox>