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 @@ + @@ -71,6 +72,7 @@