From a6f8aae62637b9830c334347612054aa0220c855 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 1 Jun 2012 13:26:35 +0200 Subject: [PATCH] Add info about resource in monthly timesheets in work reports list FEA: ItEr76S28UserDashboard --- .../java/org/libreplan/web/workreports/WorkReportDTO.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 206b53910..91f3589b3 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 @@ -25,6 +25,7 @@ import java.util.Date; import org.libreplan.business.workreports.entities.WorkReport; import org.libreplan.business.workreports.entities.WorkReportLine; +import org.libreplan.business.workreports.entities.WorkReportType; /** * DTO used to show the list of {@link WorkReport WorkReports}. @@ -37,7 +38,12 @@ public class WorkReportDTO { this.workReport = workReport; this.dateStart = this.getDateStartWorkReport(workReport); this.dateFinish = this.getDateFinishWorkReport(workReport); - this.type = workReport.getWorkReportType().getName(); + + WorkReportType workReportType = workReport.getWorkReportType(); + this.type = workReportType.getName(); + if (workReportType.isMonthlyTimesheetsType()) { + this.type += " - " + workReport.getResource().getShortDescription(); + } } private WorkReport workReport;