From 954a45b1d6a07628b7d45e97dae02b9d8bbb468f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 2 Jan 2012 11:11:49 +0100
Subject: [PATCH] Revert "[Bug #1319] Change division method of EffortDuration"

This reverts commit 395d6a2f5e0c98f37779117c7c7dc24406d6b316.
---
 .../libreplan/web/planner/TaskElementAdapter.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
index f36a2c79d..b22323a67 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
@@ -522,10 +522,9 @@ public class TaskElementAdapter {
                             return getBeginDate();
                         }
                     }
-                    BigDecimal percentage = new BigDecimal(assignedEffort
-                            .divivedBy(effort).doubleValue()).setScale(2,
-                            RoundingMode.HALF_UP);
-
+                    BigDecimal percentage = assignedEffort
+                            .toHoursAsDecimalWithScale(2).divide(
+                                    new BigDecimal(hours), RoundingMode.DOWN);
                     result = calculateLimitDateByPercentage(percentage);
 
                 }
@@ -544,6 +543,8 @@ public class TaskElementAdapter {
                         .getSumChargedEffort() != null ? orderElement
                         .getSumChargedEffort().getTotalChargedEffort()
                         : EffortDuration.zero();
+                BigDecimal assignedHours = totalChargedEffort
+                        .toHoursAsDecimalWithScale(2);
 
                 BigDecimal estimatedHours = new BigDecimal(
                         taskElement.getSumOfHoursAllocated()).setScale(2);
@@ -555,9 +556,7 @@ public class TaskElementAdapter {
                         return BigDecimal.ZERO;
                     }
                 }
-                return new BigDecimal(totalChargedEffort.divivedBy(
-                        estimatedEffort).doubleValue()).setScale(2,
-                        RoundingMode.HALF_UP);
+                return assignedHours.divide(estimatedHours, RoundingMode.DOWN);
             }
 
             @Override