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

ItEr50S04ValidacionEProbasFuncionaisItEr49S04: [Bug #383] Fixing bug.

Browse source 
When limiting overassignability wrong argument was returned. It caused
to always return the hours that could be worked that day without
overtime. That's the cause that always appeared 1 resource per day
This commit is contained in:
Óscar González Fernández 2010-03-12 15:47:17 +01:00
parent 728dae4b50
commit 32f3aadf49
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -820,14 +820,14 @@ public class BaseCalendar extends BaseEntity implements IWorkHours {
.asHoursGivenResourceWorkingDayOf(workableHours), workableHours);
}
private Integer limitOverAssignability(LocalDate day, int workableHours,
int hoursInitiallyCalculated) {
private Integer limitOverAssignability(LocalDate day,
int hoursInitiallyCalculated, int workableHoursAtDay) {
boolean overAssignable = isOverAssignable(day);
if (overAssignable) {
return hoursInitiallyCalculated;
} else {
return Math.min(hoursInitiallyCalculated,
multiplyByCapacity(workableHours));
multiplyByCapacity(workableHoursAtDay));
}
}