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

ItEr57S04ValidacionEProbasFuncionaisItEr56S04: [Bug #489] Fix error at resource load chart.

Browse source 
Take into account the day assignments for the current scenario, not
all.
This commit is contained in:
Óscar González Fernández 2010-06-09 21:43:11 +02:00
parent 185b2c0737
commit b263ea5baf
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/DayAssignmentDAO.java
View file

@ -150,12 +150,16 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
}
@Override
public List<DayAssignment> findByResources(List<Resource> resources) {
public List<DayAssignment> findByResources(Scenario scenario, List<Resource> resources) {
if (resources.isEmpty()) {
return Collections.emptyList();
}
return getSession().createCriteria(DayAssignment.class).add(
Restrictions.in("resource", resources)).list();
Criteria criteria = getSession().createCriteria(DayAssignment.class)
.add(Restrictions.in("resource", resources));
List<DayAssignment> list = criteria.list();
// TODO incorporate scenario filtering to the query instead of doing it
// in memory
return DayAssignment.withScenario(scenario, list);
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/IDayAssignmentDAO.java
View file

@ -48,6 +48,6 @@ public interface IDayAssignmentDAO extends IGenericDAO<DayAssignment, Long> {
List<DayAssignment> listFilteredByDate(LocalDate init, LocalDate end);
public List<DayAssignment> findByResources(List<Resource> resources);
public List<DayAssignment> findByResources(Scenario scenario, List<Resource> resources);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -23,7 +23,6 @@ package org.navalplanner.web.resourceload;
import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
@ -760,7 +759,8 @@ public class ResourceLoadModel implements IResourceLoadModel {
@Transactional(readOnly = true)
public List<DayAssignment> getDayAssignments() {
return dayAssignmentDAO.findByResources(getResources());
return dayAssignmentDAO.findByResources(scenarioManager.getCurrent(),
getResources());
}
@Override