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

ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #482] Fix bug.

Browse source 
For elements with generic allocations the resource can't be
retrieved. Returning it from GapOnQueue.
This commit is contained in:
Óscar González Fernández 2010-06-07 17:20:18 +02:00
parent 37c7df04d6
commit ca2a233ec1
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/GapRequirements.java
View file

@ -26,6 +26,9 @@ import java.util.ListIterator;
import org.apache.commons.lang.Validate;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.ResourceCalendar;
import org.navalplanner.business.planner.limiting.entities.Gap.GapOnQueue;
import org.navalplanner.business.resources.entities.Resource;
/**
@ -80,14 +83,16 @@ public class GapRequirements {
.isAfter(gapEnd));
}
public AllocationOnGap guessValidity(Gap gap) {
public AllocationOnGap guessValidity(GapOnQueue gapOnQueue) {
Gap gap = gapOnQueue.getGap();
if (!isPotentiallyValid(gap)) {
return AllocationOnGap.invalidOn(gap);
}
DateAndHour realStart = DateAndHour.Max(earliestPossibleStart, gap
.getStartTime());
Resource resource = gapOnQueue.getOriginQueue().getResource();
List<Integer> hours = gap.getHoursInGapUntilAllocatingAndGoingToTheEnd(
element.getResource().getCalendar(), realStart,
resource.getCalendar(), realStart,
earliestPossibleEnd, element.getIntentedTotalHours());
int total = sum(hours);
if (total < element.getIntentedTotalHours()) {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -413,7 +413,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
for (GapOnQueue eachSubGap : getSubGaps(each, requirements
.getElement(), generic)) {
AllocationOnGap allocation = requirements
.guessValidity(eachSubGap.getGap());
.guessValidity(eachSubGap);
if (allocation.isValid()) {
doAllocation(requirements, allocation, eachSubGap.getOriginQueue());
return true;