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

ItEr49S10CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr48S10: Adding thereAreHoursOn method to IWorkHours.

Browse source
This commit is contained in:
Óscar González Fernández 2010-02-28 17:00:34 +01:00
parent aeef6f470b
commit 81278e4b4b
5 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -836,23 +836,30 @@ public class BaseCalendar extends BaseEntity implements IWorkHours {
@Override
public boolean thereAreAvailableHoursFrom(LocalDate start,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
AvailabilityTimeLine availability = getAvailabilityFrom(start);
return thereAreHoursOn(availability, resourcesPerDay, hoursToAllocate);
}
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
if (hoursToAllocate == 0) {
return true;
}
if (resourcesPerDay.isZero()) {
return false;
}
AvailabilityTimeLine availability = getAvailabilityFrom(start);
addInvaliditiesDerivedFromCalendar(availability);
List<Interval> validPeriods = availability.getValidPeriods();
if (validPeriods.isEmpty()) {
return false;
}
Interval last = getLast(validPeriods);
Interval first = validPeriods.get(0);
assert !first.getStart().equals(StartOfTime.create()) : "the start cannot be start of time,"
+ " since a start is provided";
final boolean isOpenEnded = last.getEnd().equals(EndOfTime.create())
|| first.getStart().equals(StartOfTime.create());
boolean isOpenEnded = last.getEnd().equals(EndOfTime.create());
return isOpenEnded
|| thereAreHoursOn(hoursToAllocate, resourcesPerDay,
validPeriods);

12
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CombinedWorkHours.java
View file

@ -84,6 +84,18 @@ public abstract class CombinedWorkHours implements IWorkHours {
}
return true;
}
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
for (IWorkHours each : workHours) {
if (!each.thereAreHoursOn(availability, resourcesPerDay,
hoursToAllocate)) {
return false;
}
}
return true;
}
}
class Min extends CombinedWorkHours {

3
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/IWorkHours.java
View file

@ -43,6 +43,9 @@ public interface IWorkHours {
*/
public Integer getCapacityAt(LocalDate date);
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate);
public boolean thereAreAvailableHoursFrom(LocalDate date,
ResourcesPerDay resourcesPerDay, int hours);

5
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/SameWorkHoursEveryDay.java
View file

@ -56,4 +56,9 @@ public class SameWorkHoursEveryDay implements IWorkHours {
return true;
}
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
return true;
}
}

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

@ -35,6 +35,7 @@ import java.util.Map.Entry;
import org.apache.commons.lang.Validate;
import org.hibernate.validator.NotNull;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.IWorkHours;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
@ -560,6 +561,16 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
return getTaskCalendar().thereAreAvailableHoursFrom(date,
resourcesPerDay, hours);
}
@Override
public boolean thereAreHoursOn(AvailabilityTimeLine availability,
ResourcesPerDay resourcesPerDay, int hoursToAllocate) {
if (getTaskCalendar() == null) {
return true;
}
return getTaskCalendar().thereAreHoursOn(availability,
resourcesPerDay, hoursToAllocate);
}
};
}