diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java index fa1c32240..20ecb8017 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java @@ -48,6 +48,8 @@ public class SigmoidFunction extends AssignmentFunction { private void apply(ResourceAllocation resourceAllocation, LocalDate start, LocalDate end, int totalHours) { + System.out.println("### SigmoidFunction.apply: " + start + "; " + end + "; " + totalHours); + final int daysDuration = Days.daysBetween(start, end).getDays(); EffortDuration capacity; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 1b579ca0f..69c488df4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -1399,11 +1399,8 @@ class Row { @Override public void applyDefaultFunction( ResourceAllocation resourceAllocation) { - if (isChangeConfirmed()) { - resourceAllocation.setAssignmentFunction(SigmoidFunction - .create()); - reloadHours(); - } + resourceAllocation.setAssignmentFunction(SigmoidFunction.create()); + reloadHours(); } private void reloadHours() { @@ -1412,19 +1409,6 @@ class Row { fireCellChanged(); } - private boolean isChangeConfirmed() { - try { - int status = Messagebox - .show(_("You are going to change the assignment function. Are you sure?"), - _("Confirm change"), Messagebox.YES - | Messagebox.NO, Messagebox.QUESTION); - return Messagebox.YES == status; - } catch (InterruptedException e) { - - } - return false; - } - }; private IAssignmentFunctionConfiguration[] functions = {