RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to use decimal numbers to set effort in monthly timesheet

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-13 13:45:33 +02:00
parent 22b4084045
commit 75f27d6715
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
View file

@ -22,6 +22,8 @@ package org.libreplan.web.users.dashboard;
import static org.libreplan.web.I18nHelper._;
import static org.libreplan.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -46,6 +48,7 @@ import org.libreplan.web.common.entrypoints.MatrixParameters;
import org.libreplan.web.security.SecurityUtils;
import org.libreplan.web.users.services.CustomTargetUrlResolver;
import org.springframework.util.Assert;
import org.zkoss.util.Locales;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;
@ -758,6 +761,20 @@ public class MonthlyTimesheetController extends GenericForwardComposer
return EffortDuration.zero();
}
String decimalSeparator = ((DecimalFormat) DecimalFormat
.getInstance(Locales.getCurrent()))
.getDecimalFormatSymbols().getDecimalSeparator() + "";
if (effort.contains(decimalSeparator) || effort.contains(".")) {
try {
effort = effort.replace(decimalSeparator, ".");
double hours = Double.parseDouble(effort);
return EffortDuration.fromHoursAsBigDecimal(new BigDecimal(
hours));
} catch (NumberFormatException e) {
return null;
}
}
return EffortDuration.parseFromFormattedString(effort);
}