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

ItEr57S04ValidacionEProbasFuncionaisItEr56S04: [Bug #489] Remove spurious containers.

Browse source 
This fixes the bug for the planning view. It removes the containers
for the current scenario at all SchedulingDataForVersions but the new
current one so their day assignments don't interfere when calculating
the external load.

The newly created SchedulingDataForVersion has also spurious
containers resulting from the deep copy. These are removed too.

Now the data is stored correctly so when you get back after saving the
load is shown correctly. But while the planning is being edited the
chart shows wrong data.
This commit is contained in:
Óscar González Fernández 2010-06-09 16:30:17 +02:00
parent 8b50f60f51
commit 0af1279839
10 changed files with 165 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -171,9 +171,9 @@ public class Order extends OrderLineGroup {
deepCopyWithNeededReplaces(newOrderVersion),
newOrderVersion);
useSchedulingDataFor(currentScenario);
removeSpuriousDayAssignments(currentScenario);
}
private DeepCopy deepCopyWithNeededReplaces(
OrderVersion newOrderVersion) {
DeepCopy result = new DeepCopy();
@ -511,5 +511,4 @@ public class Order extends OrderLineGroup {
public void setOrderVersion(Scenario scenario, OrderVersion newOrderVersion) {
scenarios.put(scenario, newOrderVersion);
}
}

47
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -31,6 +31,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.apache.commons.lang.Validate;
import org.hibernate.validator.AssertTrue;
@ -63,6 +64,7 @@ import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
import org.navalplanner.business.scenarios.entities.OrderVersion;
import org.navalplanner.business.scenarios.entities.Scenario;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
import org.navalplanner.business.trees.ITreeNode;
import org.navalplanner.business.util.deepcopy.DeepCopy;
@ -216,6 +218,32 @@ public abstract class OrderElement extends IntegrationEntity implements
writeSchedulingDataChanges();
}
protected void removeSpuriousDayAssignments(Scenario scenario) {
removeAtNotCurrent(scenario);
removeAtCurrent(scenario);
for (OrderElement each : getChildren()) {
each.removeSpuriousDayAssignments(scenario);
}
}
private void removeAtNotCurrent(Scenario scenario) {
SchedulingDataForVersion currentDataForVersion = getCurrentSchedulingDataForVersion();
for (Entry<OrderVersion, SchedulingDataForVersion> each : schedulingDatasForVersion
.entrySet()) {
SchedulingDataForVersion dataForVersion = each.getValue();
if (!currentDataForVersion.equals(dataForVersion)) {
dataForVersion.removeSpuriousDayAssignments(scenario);
}
}
}
private void removeAtCurrent(Scenario scenario) {
TaskElement associatedTaskElement = getAssociatedTaskElement();
if (associatedTaskElement != null) {
associatedTaskElement.removePredecessorsDayAssignmentsFor(scenario);
}
}
public List<TaskSourceSynchronization> calculateSynchronizationsNeeded() {
SchedulingDataForVersion schedulingDataForVersion = getCurrentSchedulingData()
.getVersion();
@ -771,6 +799,12 @@ public abstract class OrderElement extends IntegrationEntity implements
return result;
}
public List<TaskSource> getAllScenariosTaskSourcesFromBottomToTop() {
List<TaskSource> result = new ArrayList<TaskSource>();
allScenariosTaskSourcesFromBottomToTop(result);
return result;
}
public List<SchedulingDataForVersion> getSchedulingDatasForVersionFromBottomToTop() {
List<SchedulingDataForVersion> result = new ArrayList<SchedulingDataForVersion>();
schedulingDataForVersionFromBottomToTop(result);
@ -794,6 +828,19 @@ public abstract class OrderElement extends IntegrationEntity implements
}
}
private void allScenariosTaskSourcesFromBottomToTop(List<TaskSource> result) {
for (OrderElement each : getChildren()) {
each.allScenariosTaskSourcesFromBottomToTop(result);
}
for (Entry<OrderVersion, SchedulingDataForVersion> each : schedulingDatasForVersion
.entrySet()) {
TaskSource taskSource = each.getValue().getTaskSource();
if (taskSource != null) {
result.add(taskSource);
}
}
}
@Valid
public Set<MaterialAssignment> getMaterialAssignments() {
return Collections.unmodifiableSet(materialAssignments);

10
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingDataForVersion.java
View file

@ -25,7 +25,9 @@ import org.hibernate.validator.Valid;
import org.navalplanner.business.common.BaseEntity;
import org.navalplanner.business.orders.entities.SchedulingState.ITypeChangedListener;
import org.navalplanner.business.orders.entities.SchedulingState.Type;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.scenarios.entities.OrderVersion;
import org.navalplanner.business.scenarios.entities.Scenario;
import org.navalplanner.business.util.deepcopy.DeepCopy;
/**
@ -179,4 +181,12 @@ public class SchedulingDataForVersion extends BaseEntity {
return Data.from(this, orderVersion);
}
void removeSpuriousDayAssignments(Scenario scenario) {
TaskSource taskSource = getTaskSource();
if (taskSource != null) {
TaskElement task = taskSource.getTask();
task.removeDayAssignmentsFor(scenario);
}
}
}

17
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedAllocation.java
View file

@ -362,4 +362,21 @@ public class DerivedAllocation extends BaseEntity {
toContainer.resetAssignmentsTo(fromContainer.getDayAssignments());
}
public void removePredecessorContainersFor(Scenario scenario) {
Map<Scenario, DerivedDayAssignmentsContainer> byScenario = byScenario();
for (Scenario each : scenario.getPredecessors()) {
DerivedDayAssignmentsContainer container = byScenario.get(each);
if (container != null) {
derivedDayAssignmentsContainers.remove(container);
}
}
}
public void removeContainersFor(Scenario scenario) {
DerivedDayAssignmentsContainer container = byScenario().get(scenario);
if (container != null) {
derivedDayAssignmentsContainers.remove(container);
}
}
}

20
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
View file

@ -512,4 +512,24 @@ public class GenericResourceAllocation extends
toContainer.resetTo(fromContainer.getDayAssignments());
}
@Override
protected void removePredecessorContainersFor(Scenario scenario) {
Map<Scenario, GenericDayAssignmentsContainer> byScenario = containersByScenario();
for (Scenario each : scenario.getPredecessors()) {
GenericDayAssignmentsContainer container = byScenario.get(each);
if (container != null) {
genericDayAssignmentsContainers.remove(container);
}
}
}
@Override
protected void removeContainersFor(Scenario scenario) {
GenericDayAssignmentsContainer container = containersByScenario().get(
scenario);
if (container != null) {
genericDayAssignmentsContainers.remove(container);
}
}
}

18
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -1088,4 +1088,22 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
public abstract void makeAssignmentsContainersDontPoseAsTransientAnyMore();
public void removePredecessorsDayAssignmentsFor(Scenario scenario) {
for (DerivedAllocation each : getDerivedAllocations()) {
each.removePredecessorContainersFor(scenario);
}
removePredecessorContainersFor(scenario);
}
protected abstract void removePredecessorContainersFor(Scenario scenario);
public void removeDayAssigmentsFor(Scenario scenario) {
for (DerivedAllocation each : getDerivedAllocations()) {
each.removeContainersFor(scenario);
}
removeContainersFor(scenario);
}
protected abstract void removeContainersFor(Scenario scenario);
}

20
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
View file

@ -405,4 +405,24 @@ public class SpecificResourceAllocation extends
toContainer.resetTo(fromContainer.getDayAssignments());
}
@Override
protected void removePredecessorContainersFor(Scenario scenario) {
Map<Scenario, SpecificDayAssignmentsContainer> byScenario = containersByScenario();
for (Scenario each : scenario.getPredecessors()) {
SpecificDayAssignmentsContainer container = byScenario.get(each);
if (container != null) {
specificDayAssignmentsContainers.remove(container);
}
}
}
@Override
protected void removeContainersFor(Scenario scenario) {
SpecificDayAssignmentsContainer container = containersByScenario().get(
scenario);
if (container != null) {
specificDayAssignmentsContainers.remove(container);
}
}
}

12
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
View file

@ -503,4 +503,16 @@ public abstract class TaskElement extends BaseEntity {
return getEndDate().getTime() - getStartDate().getTime();
}
public void removePredecessorsDayAssignmentsFor(Scenario scenario) {
for (ResourceAllocation<?> each : getAllResourceAllocations()) {
each.removePredecessorsDayAssignmentsFor(scenario);
}
}
public void removeDayAssignmentsFor(Scenario scenario) {
for (ResourceAllocation<?> each : getAllResourceAllocations()) {
each.removeDayAssigmentsFor(scenario);
}
}
}

10
navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java
View file

@ -120,6 +120,16 @@ public class Scenario extends BaseEntity {
return predecessor;
}
public List<Scenario> getPredecessors() {
List<Scenario> result = new ArrayList<Scenario>();
Scenario current = getPredecessor();
while (current != null) {
result.add(current);
current = current.getPredecessor();
}
return result;
}
@AssertTrue(message = "name is already used")
public boolean checkConstraintUniqueName() {
if (StringUtils.isBlank(name)) {

10
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -490,6 +490,7 @@ public class OrderModel implements IOrderModel {
if (newOrderVersionNeeded) {
OrderVersion newVersion = OrderVersion
.createInitialVersion(currentScenario);
reattachAllTaskSources();
order.writeSchedulingDataChangesTo(currentScenario, newVersion);
createAndSaveNewOrderVersion(scenarioManager.getCurrent(),
newVersion);
@ -556,6 +557,15 @@ public class OrderModel implements IOrderModel {
}
}
private void reattachAllTaskSources() {
// avoid LazyInitializationException for when doing
// removePredecessorsDayAssignmentsFor
for (TaskSource each : order
.getAllScenariosTaskSourcesFromBottomToTop()) {
taskSourceDAO.reattach(each);
}
}
private void reattachTasksForTasksSources() {
for (TaskSource each : order.getTaskSourcesFromBottomToTop()) {
each.reloadTask(taskElementDAO);