From 3b8de7d089385c92cf6b29082862ce957ba448b4 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 31 May 2012 11:07:44 +0200 Subject: [PATCH] Prevent NPE in monthly timesheets are if WorkReport was not created yet FEA: ItEr76S28UserDashboard --- .../MonthlyTimesheetsAreaController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetsAreaController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetsAreaController.java index ca4203ed7..8fa5a5edf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetsAreaController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetsAreaController.java @@ -59,12 +59,15 @@ public class MonthlyTimesheetsAreaController extends GenericForwardComposer { .toFormattedString()); WorkReport workReport = monthlyTimesheet.getWorkReport(); - Util.appendLabel(row, workReport.getTotalEffortDuration() - .toFormattedString()); - Util.appendLabel( - row, - monthlyTimesheetsAreaModel - .getNumberOfOrderElementsWithTrackedTime(workReport) + ""); + EffortDuration hours = EffortDuration.zero(); + int tasksNumber = 0; + if (workReport != null) { + hours = workReport.getTotalEffortDuration(); + tasksNumber = monthlyTimesheetsAreaModel + .getNumberOfOrderElementsWithTrackedTime(workReport); + } + Util.appendLabel(row, hours.toFormattedString()); + Util.appendLabel(row, tasksNumber + ""); Util.appendOperationsAndOnClickEvent(row, new EventListener() {