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

[Bug #901] Fixed showing limiting resources queues ordered alphabetically

Browse source 
FEA: ItEr72S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2011-03-09 15:09:43 +01:00
parent 99417b9cfd
commit 000f701dc6
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
View file

@ -406,7 +406,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
@Override
public List<LimitingResourceQueue> getLimitingResourceQueues() {
return queuesState.getQueues();
return queuesState.getQueuesOrderedByResourceName();
}
@Override
@ -414,6 +414,7 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
return queuesState.getUnassigned();
}
@Override
public ZoomLevel calculateInitialZoomLevel() {
Interval interval = getViewInterval();
return ZoomLevel.getDefaultZoomByDates(new LocalDate(interval

28
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueuesState.java
View file

@ -23,6 +23,7 @@ package org.navalplanner.web.limitingresources;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -51,8 +52,6 @@ import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueue
import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency.QueueDependencyType;
import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionCompounder;
import org.navalplanner.business.resources.entities.ICriterion;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.ResourceEnum;
@ -163,6 +162,31 @@ public class QueuesState {
return Collections.unmodifiableList(queues);
}
public ArrayList<LimitingResourceQueue> getQueuesOrderedByResourceName() {
ArrayList<LimitingResourceQueue> result = new ArrayList<LimitingResourceQueue>(
queues);
Collections.sort(result, new Comparator<LimitingResourceQueue>() {
@Override
public int compare(LimitingResourceQueue arg0,
LimitingResourceQueue arg1) {
if ((arg0 == null) || (arg0.getResource().getName() == null)) {
return -1;
}
if ((arg1 == null) || (arg1.getResource().getName() == null)) {
return 1;
}
return (arg0.getResource().getName().toLowerCase()
.compareTo(arg1.getResource().getName().toLowerCase()));
}
});
return result;
}
public List<LimitingResourceQueueElement> getUnassigned() {
return Collections.unmodifiableList(unassignedElements);
}