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

ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06: doAllocation returns a result grouping two result items

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-06 18:01:49 +02:00
parent 0ada1d347d
commit abd2d81f02
3 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
View file

@ -162,7 +162,8 @@ class FormBinder {
}
private void doApply() {
aggregate = resourceAllocationsBeingEdited.doAllocation();
aggregate = resourceAllocationsBeingEdited.doAllocation()
.getAggregate();
reloadValues();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -119,8 +119,8 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private void doTheAllocation() {
ResourceAllocationsBeingEdited allocator = resourceAllocationsBeingEdited
.taskModifying();
allocator.doAllocation();
Integer newDaysDuration = allocator.getDaysDuration();
AllocationResult allocationResult = allocator.doAllocation();
Integer newDaysDuration = allocationResult.getDaysDuration();
if (task.getDaysDuration() != newDaysDuration) {
task.setDaysDuration(newDaysDuration);
ganttTask.setEndDate(task.getEndDate());

30
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java
View file

@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.joda.time.Days;
import org.joda.time.LocalDate;
import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations;
@ -185,7 +186,7 @@ public class ResourceAllocationsBeingEdited {
&& getGenericAllocation().isEmptyResourcesPerDay();
}
public AggregateOfResourceAllocations doAllocation() {
public AllocationResult doAllocation() {
checkInvalidValues();
List<ResourceAllocationWithDesiredResourcesPerDay> allocations = asResourceAllocations();
switch (calculatedValue) {
@ -203,7 +204,8 @@ public class ResourceAllocationsBeingEdited {
default:
throw new RuntimeException("cant handle: " + calculatedValue);
}
return new AggregateOfResourceAllocations(stripResourcesPerDay(allocations));
return new AllocationResult(new AggregateOfResourceAllocations(
stripResourcesPerDay(allocations)), daysDuration);
}
private Integer from(Date startDate, LocalDate end) {
@ -301,3 +303,27 @@ public class ResourceAllocationsBeingEdited {
}
}
class AllocationResult {
private final AggregateOfResourceAllocations aggregate;
private final Integer daysDuration;
AllocationResult(AggregateOfResourceAllocations aggregate,
Integer daysDuration) {
Validate.notNull(daysDuration);
Validate.notNull(daysDuration);
this.aggregate = aggregate;
this.daysDuration = daysDuration;
}
public AggregateOfResourceAllocations getAggregate() {
return aggregate;
}
public Integer getDaysDuration() {
return daysDuration;
}
}