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

Unify the calculations done for calculating the end keeping the length of the task

Browse source 
Now for both tasks with resource allocations and tasks not allocated
the end is calculated considering the workable days.

FEA: ItEr63OTS03PlanificacionHaciaAtras
This commit is contained in:
Óscar González Fernández 2010-11-16 20:30:11 +01:00
parent 41fc2745c8
commit dca3ed6c48
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -465,7 +465,7 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
}
if (calculatedValue != CalculatedValue.END_DATE
|| getSatisfiedResourceAllocations().isEmpty()) {
setIntraDayEndDate(calculateNewEndGiven(newStartDate));
setIntraDayEndDate(calculateEndKeepingLength(newStartDate));
}
setIntraDayStartDate(newStartDate);
doReassignment();
@ -475,16 +475,6 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
reassign(scenario, new WithTheSameHoursAndResourcesPerDay());
}
private IntraDayDate calculateNewEndGiven(
IntraDayDate newStartDate) {
if (workableDays != null) {
return IntraDayDate
.startOfDay(calculateEndGivenWorkableDays(
newStartDate.getDate(), workableDays));
}
return calculateEndKeepingLength(newStartDate);
}
@Override
public void resizeTo(IntraDayDate endDate) {
if (!canBeResized() || getIntraDayEndDate().equals(endDate)) {
@ -525,25 +515,35 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
}
private IntraDayDate calculateEndKeepingLength(IntraDayDate newStartDate) {
ICalendar calendar = getCalendar() != null ? getCalendar()
: SameWorkHoursEveryDay.getDefaultWorkingDay();
DurationBetweenDates durationBetweenDates = new DurationBetweenDates(
calendar, getIntraDayStartDate(), getIntraDayEndDate());
DurationBetweenDates durationBetweenDates = getDurationBetweenDates();
return durationBetweenDates.from(newStartDate);
}
private static class DurationBetweenDates {
private DurationBetweenDates getDurationBetweenDates() {
if (workableDays != null) {
return new DurationBetweenDates(workableDays);
} else {
Integer calculatedWorkableDays = getWorkableDaysUntil(getEndAsLocalDate());
return new DurationBetweenDates(calculatedWorkableDays);
}
}
private final int numberOfDays;
private class DurationBetweenDates {
private final int numberOfWorkableDays;
private final EffortDuration remainderDuration;
private final ICalendar calendar;
public DurationBetweenDates(ICalendar calendar, IntraDayDate start,
IntraDayDate end) {
this.calendar = calendar;
this.numberOfDays = start.numberOfDaysUntil(end);
public DurationBetweenDates(int numberOfWorkableDays) {
this.calendar = getCalendar() != null ? getCalendar()
: SameWorkHoursEveryDay.getDefaultWorkingDay();
this.numberOfWorkableDays = numberOfWorkableDays;
IntraDayDate start = getIntraDayStartDate();
IntraDayDate end = getIntraDayEndDate();
if (start.getEffortDuration().compareTo(end.getEffortDuration()) <= 0) {
this.remainderDuration = end.getEffortDuration().minus(
start.getEffortDuration());
@ -559,7 +559,8 @@ public class Task extends TaskElement implements ITaskLeafConstraint {
public IntraDayDate from(IntraDayDate newStartDate) {
EffortDuration resultDuration = remainderDuration.plus(newStartDate
.getEffortDuration());
LocalDate resultDay = newStartDate.getDate().plusDays(numberOfDays);
LocalDate resultDay = calculateEndGivenWorkableDays(
newStartDate.getDate(), numberOfWorkableDays);
EffortDuration capacity = calendar.getCapacityOn(PartialDay
.wholeDay(resultDay));
while (resultDuration.compareTo(capacity) > 0) {