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

ItEr30S17ValidacionEProbasFuncionais: Using 8 hours per day if resource has not calendar assigned.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-10-14 11:48:51 +02:00 • committed by Javier Moran Rua
parent f949e11351
commit a623f0280e
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
View file

@ -406,6 +406,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
ResourceCalendar calendar = resource.getCalendar();
if (calendar != null) {
hours += calendar.getWorkableHours(date);
} else {
hours += 8;
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
View file

@ -496,6 +496,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
.getCalendar();
if (calendar != null) {
hours = calendar.getWorkableHours(dayAssignment.getDay());
} else {
hours = 8;
}
} else {
hours = dayAssignment.getHours();