diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index 97be5b68f..6292c9b12 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -53,7 +53,7 @@ public class Task extends TaskElement { return Collections.unmodifiableSet(this.hoursGroup.getCriterions()); } - public Integer getHours() { + public Integer getHoursSpecifiedAtOrder() { return hoursGroup.getWorkingHours(); } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java index ca6c4d1cc..380e1fca1 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java @@ -31,8 +31,8 @@ public class TaskTest { } @Test - public void taskHasNumberOfHours() { - assertThat(task.getHours(), equalTo(hoursGroup.getWorkingHours())); + public void taskHasHoursSpecifiedAtOrderComingFromItsHoursGroup() { + assertThat(task.getHoursSpecifiedAtOrder(), equalTo(hoursGroup.getWorkingHours())); } @Test 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 30efa5a6d..d59596562 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 @@ -201,13 +201,9 @@ public class ResourceAllocationController extends GenericForwardComposer { return StringUtils.join(criterionNames, ","); } - /** - * Returns hours of {@link Task} - * @return - */ - public String getTaskHours() { + public String getOrderHours() { Task task = resourceAllocationModel.getTask(); - return (task != null && task.getHours() != null) ? task.getHours() + return (task != null && task.getHoursSpecifiedAtOrder() != null) ? task.getHoursSpecifiedAtOrder() .toString() : ""; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index 5e64cefa4..ef348fb71 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -133,7 +133,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel { } else { LocalDate end = ResourceAllocation.allocating(resourceAllocations) .withResources(getResourcesMatchingCriterions()) - .untilAllocating(task.getHours()); + .untilAllocating(task.getHoursSpecifiedAtOrder()); ganttTask.setEndDate(end.toDateTimeAtStartOfDay().toDate()); } } diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index 8facd0315..708ce81b6 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -90,9 +90,9 @@ value="@{allocationController.taskCriterions}" /> -