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

[Bug #1165] Fix bug

Browse source 
Force load advance assignments.

FEA: ItEr75S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-08-25 19:29:07 +02:00
parent 218dac5219
commit 4d46a7d10b
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import org.hibernate.validator.Valid;
import org.joda.time.LocalDate;
import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes;
import org.navalplanner.business.advance.entities.AdvanceAssignment;
import org.navalplanner.business.advance.entities.AdvanceMeasurement;
import org.navalplanner.business.advance.entities.AdvanceType;
import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment;
@ -58,6 +59,7 @@ import org.navalplanner.business.orders.entities.TaskSource.TaskSourceSynchroniz
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskPositionConstraint;
import org.navalplanner.business.planner.entities.consolidations.CalculatedConsolidation;
import org.navalplanner.business.qualityforms.entities.QualityForm;
import org.navalplanner.business.qualityforms.entities.TaskQualityForm;
import org.navalplanner.business.requirements.entities.CriterionRequirement;
@ -454,6 +456,27 @@ public abstract class OrderElement extends IntegrationEntity implements
public abstract List<OrderElement> getChildren();
public void loadAdvanceAssignments() {
for (DirectAdvanceAssignment each : getDirectAdvanceAssignments()) {
each.getAdvanceType().getUnitName();
for (AdvanceMeasurement eachMeasurement : each
.getAdvanceMeasurements()) {
eachMeasurement.getExtraInformation();
}
}
for (IndirectAdvanceAssignment each : getIndirectAdvanceAssignments()) {
each.getAdvanceType().getUnitName();
Set<CalculatedConsolidation> calculatedConsolidation = each
.getCalculatedConsolidation();
for (CalculatedConsolidation eachConsolidation : calculatedConsolidation) {
eachConsolidation.getConsolidatedValues().size();
}
}
for (OrderElement each : getChildren()) {
each.loadAdvanceAssignments();
}
}
private static Date copy(Date date) {
return date != null ? new Date(date.getTime()) : date;
}

1
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
View file

@ -148,6 +148,7 @@ public class PlanningStateCreator {
private PlanningState createInitialPlanning(Order orderReloaded) {
Scenario currentScenario = scenarioManager.getCurrent();
orderReloaded.loadAdvanceAssignments();
if (!orderReloaded.isSomeTaskElementScheduled()) {
return new EmptyPlannigState(currentScenario, orderReloaded);
}