diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 44df7b1cf..3f095e64e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -75,6 +75,8 @@ class FormBinder { private Map resourcesPerDayInputsByAllocationDTO = new HashMap(); + private Map hoursIntboxesByAllocationDTO = new HashMap(); + private EventListener onChangeEnableApply = new EventListener() { @Override @@ -245,6 +247,10 @@ class FormBinder { onChangeEnableApply(decimalbox); } + public void setHoursIntboxFor(AllocationDTO data, Intbox hours) { + hoursIntboxesByAllocationDTO.put(data, hours); + } + public int getAssignedHours() { Integer result = assignedHoursComponent.getValue(); if (result == null) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java index a37f3dd6a..53f42e189 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java @@ -481,7 +481,7 @@ public class ResourceAllocationController extends GenericForwardComposer { // Label fields are fixed, can only be viewed appendLabel(item, data.getName()); - + bindHours(appendIntbox(item), data); bindResourcesPerDay(appendDecimalbox(item), data); // On click delete button Button deleteButton = appendDeleteButton(item); @@ -550,6 +550,14 @@ public class ResourceAllocationController extends GenericForwardComposer { return decimalbox; } + private Intbox appendIntbox(Listitem item) { + Intbox result = new Intbox(); + Listcell listcell = new Listcell(); + listcell.appendChild(result); + item.appendChild(listcell); + return result; + } + private void bindResourcesPerDay(final Decimalbox decimalbox, final AllocationDTO data) { decimalbox.setConstraint(new SimpleConstraint( @@ -572,6 +580,12 @@ public class ResourceAllocationController extends GenericForwardComposer { } }); } + + private void bindHours(Intbox hoursIntbox, AllocationDTO data) { + hoursIntbox.setDisabled(true); + formBinder.setHoursIntboxFor(data, hoursIntbox); + } + } public ViewSwitcher getSwitcher() { diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index b26a9724b..27dd1aee9 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -154,6 +154,8 @@ style="margin-bottom: 5px" fixedLayout="true" rows="4"> +