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

Now can allocate some hours from end of the task to some date

Browse source
This commit is contained in:
Óscar González Fernández 2010-10-29 13:42:35 +02:00
parent 9d0bc64dd9
commit 8596aeef8a
4 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/IAllocatable.java
View file

@ -34,4 +34,6 @@ public interface IAllocatable extends IAllocateResourcesPerDay {
public IAllocateHoursOnInterval fromStartUntil(LocalDate endExclusive);
public IAllocateHoursOnInterval fromEndUntil(LocalDate start);
}

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

@ -592,10 +592,28 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
};
}
@Override
public IAllocateHoursOnInterval fromEndUntil(final LocalDate start) {
return new IAllocateHoursOnInterval() {
@Override
public void allocateHours(int hours) {
allocate(IntraDayDate.startOfDay(start),
task.getIntraDayEndDate(), hours(hours));
}
};
}
private void allocate(LocalDate end, EffortDuration durationToAssign) {
IntraDayDate startInclusive = getStartAfterConsolidated();
IntraDayDate endExclusive = IntraDayDate.startOfDay(end);
allocate(startInclusive, endExclusive, durationToAssign);
}
private void allocate(IntraDayDate startInclusive,
IntraDayDate endExclusive, EffortDuration durationToAssign) {
List<T> assignmentsCreated = createAssignments(startInclusive,
IntraDayDate.startOfDay(end), durationToAssign);
endExclusive, durationToAssign);
resetAssignmentsTo(assignmentsCreated);
updateResourcesPerDay();
}

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
View file

@ -170,6 +170,11 @@ public class SpecificResourceAllocation extends
return new SpecificAssignmentsAllocation().fromStartUntil(endExclusive);
}
@Override
public IAllocateHoursOnInterval fromEndUntil(LocalDate start) {
return new SpecificAssignmentsAllocation().fromEndUntil(start);
}
private final class SpecificAssignmentsAllocation extends
AssignmentsAllocation {

11
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
View file

@ -305,6 +305,17 @@ public class SpecificResourceAllocationTest {
equalTo(ResourcesPerDay.amount(1)));
}
@Test
public void canAssignFromEndUntilStart() {
LocalDate start = new LocalDate(2000, 2, 4);
givenSpecificResourceAllocation(start, 4);
specificResourceAllocation.fromEndUntil(start).allocateHours(32);
assertThat(specificResourceAllocation.getAssignments(),
haveHours(8, 8, 8, 8));
assertThat(specificResourceAllocation.getResourcesPerDay(),
equalTo(ResourcesPerDay.amount(1)));
}
@Test
public void canBeNotifiedWhenADayAssignmentIsRemoved() {
LocalDate start = new LocalDate(2000, 2, 4);