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

Make consufing method private

Browse source 
FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios
This commit is contained in:
Óscar González Fernández 2011-01-19 13:10:01 +01:00
parent 59dae6bb43
commit 781f6f83c2
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,7 +266,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar {
return date.limitDuration(getWorkableTimeAt(date.getDate()));
}
public EffortDuration getWorkableTimeAt(LocalDate date) {
private EffortDuration getWorkableTimeAt(LocalDate date) {
if (!isActive(date)) {
return EffortDuration.zero();
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
View file

@ -49,6 +49,7 @@ import org.navalplanner.business.common.entities.EntityNameEnum;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.workingday.EffortDuration;
import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
import org.navalplanner.web.common.IntegrationEntityModel;
import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
import org.springframework.beans.factory.annotation.Autowired;
@ -258,7 +259,8 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
if (getBaseCalendar() == null) {
return null;
}
return getBaseCalendar().getWorkableTimeAt(selectedDate);
return getBaseCalendar().getCapacityOn(
PartialDay.wholeDay(selectedDate));
}
@Override

4
navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloTask.java
View file

@ -28,6 +28,7 @@ import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.workingday.EffortDuration;
import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
/**
*
@ -59,7 +60,8 @@ public class MonteCarloTask {
double duration = daysDuration.doubleValue();
for (int i = 0; i < duration;) {
EffortDuration workableTime = calendar.getWorkableTimeAt(day);
EffortDuration workableTime = calendar.getCapacityOn(PartialDay
.wholeDay(day));
if (!EffortDuration.zero().equals(workableTime)) {
i++;
}