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

ItEr36S19CUCalculoValorGanado: Added method "getReportGlobalAdvanceAssignment" to Order.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-26 21:29:05 +01:00 • committed by Javier Moran Rua
parent 23161818d1
commit bf8be2a9f4
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -322,6 +322,8 @@ public abstract class OrderElement extends BaseEntity {
return code;
}
public abstract DirectAdvanceAssignment getReportGlobalAdvanceAssignment();
public Set<DirectAdvanceAssignment> getDirectAdvanceAssignments() {
return Collections.unmodifiableSet(directAdvanceAssignments);
}

11
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
View file

@ -453,4 +453,15 @@ public class OrderLine extends OrderElement {
criterionRequirementHandler.copyRequirementToOrderElement(this,
container);
}
@Override
public DirectAdvanceAssignment getReportGlobalAdvanceAssignment() {
for (DirectAdvanceAssignment directAdvanceAssignment : getDirectAdvanceAssignments()) {
if (directAdvanceAssignment.getReportGlobalAdvance()) {
return directAdvanceAssignment;
}
}
return null;
}
}

17
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -676,4 +676,21 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
protected void copyRequirementToOrderElement(OrderLine leaf) {
criterionRequirementHandler.copyRequirementToOrderElement(this, leaf);
}
@Override
public DirectAdvanceAssignment getReportGlobalAdvanceAssignment() {
for (DirectAdvanceAssignment directAdvanceAssignment : getDirectAdvanceAssignments()) {
if (directAdvanceAssignment.getReportGlobalAdvance()) {
return directAdvanceAssignment;
}
}
for (IndirectAdvanceAssignment indirectAdvanceAssignment : getIndirectAdvanceAssignments()) {
if (indirectAdvanceAssignment.getReportGlobalAdvance()) {
return calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
}
}
return null;
}
}