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

ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Letting remove all allocations

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-25 18:33:24 +01:00
parent ae33db67ac
commit 5cc8cdf090
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -236,6 +236,9 @@ public class Task extends TaskElement {
List<ResourceAllocation<?>> newAllocations,
List<ModifiedAllocation> modifications,
Collection<? extends ResourceAllocation<?>> toRemove) {
if (aggregate.isEmpty()) {
return;
}
final LocalDate start = aggregate.getStart();
final LocalDate end = aggregate.getEnd();
mergeAllocation(start, end, calculatedValue, newAllocations,

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

@ -183,36 +183,27 @@ public class ResourceAllocationsBeingEdited {
&& formBinder.getAssignedHours() <= 0) {
formBinder.markAssignedHoursMustBePositive();
}
if (!thereIsLeastOneNoEmptyAllocation()) {
formBinder.markThereMustBeAtLeastOneNoEmptyAllocation();
}
}
private boolean thereIsLeastOneNoEmptyAllocation() {
for (AllocationDTO allocationDTO : currentAllocations) {
if (!allocationDTO.isEmptyResourcesPerDay()) {
return true;
}
}
return false;
}
public AllocationResult doAllocation() {
checkInvalidValues();
Map<AllocationBeingModified, ResourceAllocation<?>> fromDetachedToAttached = getAllocationsWithRelationshipsToOriginal();
List<AllocationBeingModified> allocations = asList(fromDetachedToAttached);
switch (calculatedValue) {
case NUMBER_OF_HOURS:
ResourceAllocation.allocating(allocations).allocateOnTaskLength();
daysDuration = task.getDaysDuration();
break;
case END_DATE:
LocalDate end = ResourceAllocation.allocating(allocations)
.untilAllocating(formBinder.getAssignedHours());
daysDuration = from(task.getStartDate(), end);
break;
default:
throw new RuntimeException("cant handle: " + calculatedValue);
if (!allocations.isEmpty()) {
switch (calculatedValue) {
case NUMBER_OF_HOURS:
ResourceAllocation.allocating(allocations)
.allocateOnTaskLength();
daysDuration = task.getDaysDuration();
break;
case END_DATE:
LocalDate end = ResourceAllocation.allocating(allocations)
.untilAllocating(formBinder.getAssignedHours());
daysDuration = from(task.getStartDate(), end);
break;
default:
throw new RuntimeException("cant handle: " + calculatedValue);
}
}
return new AllocationResult(task, calculatedValue,
new AggregateOfResourceAllocations(