Push down workableDays to Task from TaskElement
FEA: ItEr61OTS04PlanificacionHaciaAtras
This commit is contained in:
parent
c0a53675e7
commit
356508f203
2 changed files with 11 additions and 10 deletions
|
|
@ -23,6 +23,7 @@ package org.navalplanner.business.planner.entities;
|
|||
import static org.navalplanner.business.workingday.EffortDuration.min;
|
||||
import static org.navalplanner.business.workingday.EffortDuration.zero;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
|
@ -116,6 +117,8 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
|
|||
|
||||
private Consolidation consolidation;
|
||||
|
||||
private BigDecimal workableDays;
|
||||
|
||||
/**
|
||||
* Constructor for hibernate. Do not use!
|
||||
*/
|
||||
|
|
@ -688,4 +691,12 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
|
|||
return getIntraDayStartDate();
|
||||
}
|
||||
|
||||
public void setWorkableDays(BigDecimal workableDays) {
|
||||
this.workableDays = workableDays;
|
||||
}
|
||||
|
||||
public BigDecimal getWorkableDays() {
|
||||
return workableDays;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,8 +118,6 @@ public abstract class TaskElement extends BaseEntity {
|
|||
|
||||
private IntraDayDate endDate;
|
||||
|
||||
private BigDecimal workableDays;
|
||||
|
||||
private LocalDate deadline;
|
||||
|
||||
private String name;
|
||||
|
|
@ -604,12 +602,4 @@ public abstract class TaskElement extends BaseEntity {
|
|||
return sumOfHoursAllocated;
|
||||
}
|
||||
|
||||
public void setWorkableDays(BigDecimal workableDays) {
|
||||
this.workableDays = workableDays;
|
||||
}
|
||||
|
||||
public BigDecimal getWorkableDays() {
|
||||
return workableDays;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue