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

ItEr39S16CUConfiguracionMaquinasItEr35S09: Exposing DerivedAllocations via AllocationRow.

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-20 21:31:45 +01:00
parent 5be393228e
commit ffc6ab87fc
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
View file

@ -23,10 +23,12 @@ package org.navalplanner.web.planner.allocation;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang.Validate;
import org.navalplanner.business.planner.entities.CalculatedValue;
import org.navalplanner.business.planner.entities.DerivedAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.ResourcesPerDay;
import org.navalplanner.business.planner.entities.Task;
@ -216,6 +218,22 @@ public abstract class AllocationRow {
loadHours();
}
public boolean hasDerivedAllocations() {
return ! getDerivedAllocations().isEmpty();
}
public List<DerivedAllocation> getDerivedAllocations() {
if (temporal != null) {
return new ArrayList<DerivedAllocation>(temporal
.getDerivedAllocations());
} else if (origin != null) {
return new ArrayList<DerivedAllocation>(origin
.getDerivedAllocations());
} else {
return Collections.emptyList();
}
}
public String getName() {
return name;
}
@ -313,7 +331,8 @@ public abstract class AllocationRow {
public void loadDataFromLast() {
hoursInput.setValue(temporal.getAssignedHours());
resourcesPerDayInput.setValue(temporal.getResourcesPerDay().getAmount());
resourcesPerDayInput
.setValue(temporal.getResourcesPerDay().getAmount());
}
public void addListenerForHoursInputChange(EventListener listener) {

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

@ -216,6 +216,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
reattachHoursGroup(this.task.getHoursGroup());
reattachCriterions(this.task.getHoursGroup().getValidCriterions());
loadResources(this.task.getResourceAllocations());
loadDerivedAllocations(this.task.getResourceAllocations());
List<AllocationRow> initialRows = AllocationRow.toRows(this.task
.getResourceAllocations());
allocationRowsHandler = AllocationRowsHandler.create(task, initialRows,
@ -267,6 +268,13 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
}
}
private void loadDerivedAllocations(
Set<ResourceAllocation<?>> resourceAllocations) {
for (ResourceAllocation<?> each : resourceAllocations) {
each.getDerivedAllocations().size();
}
}
private void reattachTaskSource() {
TaskSource taskSource = task.getTaskSource();
taskSourceDAO.reattach(taskSource);