From d02f09ffbd29917ea2cbe42777257670de38ad4a Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 4 Oct 2011 17:49:56 +0200 Subject: [PATCH] Added flat function always as first option in resource allocation pop-up FEA: ItEr75S23FixAllocationModel --- .../web/planner/allocation/AllocationRow.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 20166da33..6f6608454 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -356,17 +356,23 @@ public abstract class AllocationRow { } private void updateAssignmentFunctionListbox() { + initializeAndAppendFlatFunction(assignmentFunctionListbox); + AssignmentFunction function = getAssignmentFunction(); - Listitem listitemFunctionName; - if (function == null) { - listitemFunctionName = new Listitem( - _(AssignmentFunctionName.FLAT.toString())); - } else { - listitemFunctionName = new Listitem(_(function.getName())); + if (function != null) { + Listitem listitem = new Listitem(_(function.getName())); + assignmentFunctionListbox.appendChild(listitem); + assignmentFunctionListbox.setSelectedItem(listitem); } + } + + private void initializeAndAppendFlatFunction( + Listbox assignmentFunctionListbox2) { + Listitem listitem = new Listitem( + _(AssignmentFunctionName.FLAT.toString())); assignmentFunctionListbox.getChildren().clear(); - assignmentFunctionListbox.appendChild(listitemFunctionName); - assignmentFunctionListbox.setSelectedItem(listitemFunctionName); + assignmentFunctionListbox.appendChild(listitem); + assignmentFunctionListbox.setSelectedItem(listitem); } public abstract ResourcesPerDayModification toResourcesPerDayModification(