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

[Bug #1015] Fix bug at hours worked by resource report

Browse source 
Include in the query descendant criteria.

FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-04-25 19:22:53 +02:00
parent 9bc2b40cfd
commit c3208fa78c
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
View file

@ -231,7 +231,8 @@ public class ResourceDAO extends IntegrationEntityDAO<Resource> implements
query.setParameterList("labels", labels);
}
if (criterions != null && !criterions.isEmpty()) {
query.setParameterList("criterions", criterions);
query.setParameterList("criterions",
Criterion.withAllDescendants(criterions));
}
// Get result

13
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourcesSearcher.java
View file

@ -29,7 +29,6 @@ import static org.hibernate.criterion.Restrictions.or;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@ -144,17 +143,7 @@ public class ResourcesSearcher implements IResourcesSearcher {
return;
}
criteria.createCriteria("criterionSatisfactions").add(
in("criterion", withAllDescendants(this.criteria)));
}
private Set<Criterion> withAllDescendants(
Collection<? extends Criterion> originalCriteria) {
Set<Criterion> result = new HashSet<Criterion>();
for (Criterion each : originalCriteria) {
result.add(each);
result.addAll(withAllDescendants(each.getChildren()));
}
return result;
in("criterion", Criterion.withAllDescendants(this.criteria)));
}
private boolean criteriaSpecified() {

10
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java
View file

@ -70,6 +70,16 @@ public class Criterion extends IntegrationEntity implements ICriterion {
}
public static Set<Criterion> withAllDescendants(
Collection<? extends Criterion> originalCriteria) {
Set<Criterion> result = new HashSet<Criterion>();
for (Criterion each : originalCriteria) {
result.add(each);
result.addAll(withAllDescendants(each.getChildren()));
}
return result;
}
public static final Comparator<Criterion> byName = new Comparator<Criterion>() {
@Override