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

ItEr41S11CUConfiguracionMaquinasItEr40S15: No criterions at configuration unit means no workers matched

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-28 12:34:40 +01:00
parent fe21738931
commit ebbf074fa3
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -368,6 +368,9 @@ public class Task extends TaskElement {
@Override
public Collection<Worker> findWorkersMatching(
Collection<? extends Criterion> requiredCriterions) {
if (requiredCriterions.isEmpty()) {
return new ArrayList<Worker>();
}
Collection<Worker> result = new ArrayList<Worker>();
for (Worker each : allWorkers) {
if (each.satisfiesCriterions(requiredCriterions)) {

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -234,10 +234,15 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
public Collection<Worker> findWorkersMatching(
Collection<? extends Criterion> requiredCriterions) {
reassociateResourcesWithSession();
List<Resource> findAllSatisfyingCriterions = resourceDAO
.findAllSatisfyingCriterions(requiredCriterions);
List<Resource> allSatisfyingCriterions;
if (!requiredCriterions.isEmpty()) {
allSatisfyingCriterions = resourceDAO
.findAllSatisfyingCriterions(requiredCriterions);
} else {
allSatisfyingCriterions = new ArrayList<Resource>();
}
return Resource.workers(reloadResources(Resource
.workers(findAllSatisfyingCriterions)));
.workers(allSatisfyingCriterions)));
}
};
}