From ec4745a100db20a842b77fa009518380bc9c07c0 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 24 May 2012 18:29:56 +0200 Subject: [PATCH] Fix NPE in my tasks area when SumCharegedEffort is still null FEA: ItEr76S28UserDashboard --- .../web/users/dashboard/MyTasksAreaController.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java index bb82e64f8..23809732c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java @@ -27,7 +27,9 @@ import java.util.List; import org.libreplan.business.advance.entities.AdvanceMeasurement; import org.libreplan.business.advance.entities.DirectAdvanceAssignment; import org.libreplan.business.orders.entities.OrderElement; +import org.libreplan.business.orders.entities.SumChargedEffort; import org.libreplan.business.planner.entities.Task; +import org.libreplan.business.workingday.EffortDuration; import org.libreplan.web.common.Util; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.util.GenericForwardComposer; @@ -62,10 +64,14 @@ public class MyTasksAreaController extends GenericForwardComposer { Util.appendLabel(row, getProgress(orderElement)); - Util.appendLabel( - row, - _("{0} h", orderElement.getSumChargedEffort() - .getTotalChargedEffort().toFormattedString())); + Util.appendLabel(row, getEffort(orderElement)); + } + + private String getEffort(OrderElement orderElement) { + SumChargedEffort sumChargedEffort = orderElement.getSumChargedEffort(); + EffortDuration effort = sumChargedEffort != null ? sumChargedEffort + .getTotalChargedEffort() : EffortDuration.zero(); + return _("{0} h", effort.toFormattedString()); } private String getProgress(OrderElement orderElement) {