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

Remove deprecated uses. Use roundToHours methods

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Óscar González Fernández 2010-09-13 12:44:46 +02:00
parent f53eaa0188
commit fcbf40bea1
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
View file

@ -29,13 +29,13 @@ import java.util.Set;
import org.apache.commons.lang.Validate;
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.ResourceCalendar;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.DatePoint;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.EndOfTime;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.FixedPoint;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.Interval;
import org.navalplanner.business.calendars.entities.AvailabilityTimeLine.StartOfTime;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.ResourceCalendar;
import org.navalplanner.business.planner.entities.AvailabilityCalculator;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
@ -127,10 +127,12 @@ public class Gap implements Comparable<Gap> {
final ResourceCalendar calendar = resource.getCalendar();
int capacityRounded = calendar.getCapacityDurationAt(startDate)
.roundToHours();
if (startDate.equals(endDate)) {
return calendar.getCapacityAt(startDate) - Math.max(startHour, endHour);
return capacityRounded - Math.max(startHour, endHour);
} else {
int hoursAtStart = calendar.getCapacityAt(startDate) - startHour;
int hoursAtStart = capacityRounded - startHour;
int hoursInBetween = calendar.getWorkableHours(startDate
.plusDays(1), endDate.minusDays(1));
return hoursAtStart + hoursInBetween + endHour;
@ -174,7 +176,7 @@ public class Gap implements Comparable<Gap> {
private int getHoursAtDay(LocalDate day, BaseCalendar calendar,
DateAndHour realStart, boolean isFirst, final boolean isLast) {
final int capacity = calendar.getCapacityAt(day);
final int capacity = calendar.getCapacityDurationAt(day).roundToHours();
if (isLast && isFirst) {
return Math.min(endTime.getHour() - realStart.getHour(),
capacity);

12
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
View file

@ -335,8 +335,9 @@ public class QueueComponent extends XulElement implements
LimitingResourceQueueElement queueElement) {
int workableHours = queueElement.getLimitingResourceQueue()
.getResource().getCalendar().getCapacityAt(
queueElement.getEndDate());
.getResource().getCalendar()
.getCapacityDurationAt(queueElement.getEndDate())
.roundToHours();
int shadeWidth = new Long((24 - workableHours)
* DatesMapperOnInterval.MILISECONDS_PER_HOUR
@ -365,8 +366,9 @@ public class QueueComponent extends XulElement implements
LimitingResourceQueueElement queueElement) {
int workableHours = queueElement.getLimitingResourceQueue()
.getResource().getCalendar().getCapacityAt(
queueElement.getEndDate());
.getResource().getCalendar()
.getCapacityDurationAt(queueElement.getEndDate())
.roundToHours();
int shadeWidth = new Long((24 - workableHours)
* DatesMapperOnInterval.MILISECONDS_PER_HOUR
@ -376,7 +378,7 @@ public class QueueComponent extends XulElement implements
* DatesMapperOnInterval.MILISECONDS_PER_HOUR
/ datesMapper.getMilisecondsPerPixel()).intValue()
+ shadeWidth;
;
Div notWorkableHoursShade = new Div();
notWorkableHoursShade.setContext("");
notWorkableHoursShade.setSclass("limiting-completion");