From 816139f0cc6fb90bdaf098b0c3878c1700e2a2da Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Mon, 28 Dec 2009 13:13:39 +0100 Subject: [PATCH] ItEr41S12CUInformeListaAvancesTrabajoItEr40S17: Fix bug showing task name --- .../reports/dtos/WorkingProgressPerTaskDTO.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingProgressPerTaskDTO.java b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingProgressPerTaskDTO.java index b8800b9a1..b451c4d79 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingProgressPerTaskDTO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/reports/dtos/WorkingProgressPerTaskDTO.java @@ -72,11 +72,7 @@ public class WorkingProgressPerTaskDTO { public WorkingProgressPerTaskDTO(Task task, LocalDate date) { this(); - String taskName = task.getName(); - if (taskName == null || taskName.isEmpty()) { - taskName = task.getOrderElement().getName(); - } - this.taskName = taskName; + this.taskName = getTaskName(task); this.estimatedHours = task.getHoursSpecifiedAtOrder(); this.totalPlannedHours = calculatePlannedHours(task, null); @@ -95,6 +91,14 @@ public class WorkingProgressPerTaskDTO { this.ratioPlanningDifference = calculateRatioPlanningDifference(averageProgress, plannedProgress); } + public String getTaskName(Task task) { + String result = task.getName(); + if (result == null || result.isEmpty()) { + result = task.getOrderElement().getName(); + } + return result; + } + public Integer calculatePlannedHours(Task task, LocalDate date) { Integer result = new Integer(0);