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

ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06: Now calculates the resources per day correctly for generic allocations

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-09 11:19:08 +02:00
parent 2ac95fa1c2
commit 859bac1a01
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -380,8 +380,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
int sumWorkableHours = 0;
for (Entry<LocalDate, List<DayAssignment>> entry : byDay.entrySet()) {
sumWorkableHours += getWorkHoursPerDay().getWorkableHours(
entry.getKey())
* entry.getValue().size();
entry.getKey());
sumTotalHours += getAssignedHours(entry.getValue());
}
if (sumWorkableHours == 0) {

22
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java
View file

@ -398,4 +398,26 @@ public class GenericResourceAllocationTest {
assertThat(genericResourceAllocation.getAssignedHours(), equalTo(0));
}
@Test
public void afterAllocatingMoreHoursOnIntervalTheResourcesPerDayAreIncreased() {
final int workableHoursDay = 8;
givenBaseCalendarWithoutExceptions(workableHoursDay);
LocalDate start = new LocalDate(2006, 10, 5);
final int days = 4;
givenTaskWithStartAndEnd(toInterval(start, Period.days(days)));
givenGenericResourceAllocationForTask(task);
givenWorkersWithLoads(8, 8, 8);
genericResourceAllocation.forResources(workers).allocate(
ResourcesPerDay.amount(3));
ResourcesPerDay original = genericResourceAllocation
.getResourcesPerDay();
genericResourceAllocation.forResources(workers).onInterval(start,
start.plusDays(2)).allocateHours(60);
ResourcesPerDay current = genericResourceAllocation
.getResourcesPerDay();
assertTrue(current.getAmount()
.compareTo(original.getAmount()) > 0);
}
}