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

Refactor method getSpreadIndirectAdvanceAssignmentWithSameType to be used in more places

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-12-27 09:12:15 +01:00
parent 02993b55ea
commit f6a21e9942
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java
View file

@ -736,17 +736,9 @@ public class ManageOrderElementAdvancesModel implements
AdvanceMeasurement advanceMeasurement) {
AdvanceAssignment advance = advanceMeasurement.getAdvanceAssignment();
if ((orderElement != null) && (orderElement.getParent() != null) && (advance instanceof DirectAdvanceAssignment)) {
List<String> types = new ArrayList<String>();
types.add(advance.getAdvanceType().getUnitName());
if (advance.getReportGlobalAdvance()) {
types.add(PredefinedAdvancedTypes.CHILDREN.getTypeName());
}
orderElementDAO.reattach(orderElement);
Set<IndirectAdvanceAssignment> indirects = getSpreadIndirectAdvanceAssignmentWithSameType(
orderElement, types);
orderElement, advance);
for (IndirectAdvanceAssignment indirect : indirects) {
if (findConsolidatedAdvance(indirect
@ -759,8 +751,20 @@ public class ManageOrderElementAdvancesModel implements
}
private Set<IndirectAdvanceAssignment> getSpreadIndirectAdvanceAssignmentWithSameType(
OrderElement orderElement, List<String> types) {
OrderElement orderElement, AdvanceAssignment advance) {
List<String> types = new ArrayList<String>();
types.add(advance.getAdvanceType().getUnitName());
if (advance.getReportGlobalAdvance()) {
types.add(PredefinedAdvancedTypes.CHILDREN.getTypeName());
}
return getSpreadIndirectAdvanceAssignmentWithSameType(orderElement,
types);
}
private Set<IndirectAdvanceAssignment> getSpreadIndirectAdvanceAssignmentWithSameType(
OrderElement orderElement, List<String> types) {
Set<IndirectAdvanceAssignment> result = new HashSet<IndirectAdvanceAssignment>();
for (IndirectAdvanceAssignment indirect : orderElement