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

[Bug #740] Pop-up window asking for applying a Sigmoid function was being shown twice

Browse source 
FEA: ItEr64S03BugFixing
This commit is contained in:
Diego Pino Garcia 2010-11-30 17:33:47 +01:00
parent 70163786af
commit fc3cef1d64
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
View file

@ -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;

20
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
View file

@ -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 = {