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

Imported configured or previously used criterion into resourcesLoad filtering

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-01-31 23:04:35 +01:00
parent 41661c3afc
commit ed69a6e7bc
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java
View file

@ -466,6 +466,10 @@ public class Criterion extends IntegrationEntity implements ICriterion,
return String.format("%s :: %s", type, name);
}
public String getFinderPattern() {
return String.format("%s ( %s )", name, type.getName());
}
@Override
public int compareTo(Criterion o) {
return toString().compareToIgnoreCase(o.toString());

30
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
View file

@ -53,6 +53,7 @@ import org.libreplan.business.users.daos.IUserDAO;
import org.libreplan.business.users.entities.User;
import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
import org.libreplan.web.common.components.finders.FilterPair;
import org.libreplan.web.common.components.finders.ResourceFilterEnum;
import org.libreplan.web.planner.chart.Chart;
import org.libreplan.web.planner.chart.StandardLoadChartFiller;
import org.libreplan.web.planner.company.CompanyPlanningModel;
@ -284,6 +285,10 @@ public class ResourceLoadController implements Composer {
"resourceLoadStartDate");
LocalDate endDate = (LocalDate) Sessions.getCurrent().getAttribute(
"resourceLoadEndDate");
List<FilterPair> bandboxFilterPairs = (List<FilterPair>) Sessions
.getCurrent()
.getAttribute(
"resourceLoadFilterWorkerOrCriterion");
try {
user = this.userDAO.findByLoginName(SecurityUtils
.getSessionUserLoginName());
@ -312,6 +317,18 @@ public class ResourceLoadController implements Composer {
result.add(new ByDatesFilter(onChange, filterBy, startDate, endDate));
WorkersOrCriteriaBandbox bandbox = new WorkersOrCriteriaBandbox(
onChange, filterBy, filterTypeChanger, resourcesSearcher);
if (bandboxFilterPairs != null && !bandboxFilterPairs.isEmpty()) {
for (FilterPair filterPair : bandboxFilterPairs) {
bandbox.getBandBox().addSelectedElement(filterPair);
}
} else if ((user != null)
&& (user.getResourcesLoadFilterCriterion() != null)) {
bandboxFilterPairs = new ArrayList<FilterPair>();
bandboxFilterPairs.add(new FilterPair(ResourceFilterEnum.Criterion,
user.getResourcesLoadFilterCriterion().getFinderPattern(),
user.getResourcesLoadFilterCriterion()));
}
result.add(bandbox);
result.add(new ByNamePaginator(onChange, filterBy, filterTypeChanger,
bandbox));
@ -559,6 +576,10 @@ public class ResourceLoadController implements Composer {
private Label label = new Label();
public BandboxMultipleSearch getBandBox() {
return bandBox;
}
private WorkersOrCriteriaBandbox(Runnable onChange,
PlanningState filterBy, FilterTypeChanger filterType,
IResourcesSearcher resourcesSearcher) {
@ -585,6 +606,9 @@ public class ResourceLoadController implements Composer {
@Override
public void onEvent(Event event) throws Exception {
entitiesSelected = getSelected();
Sessions.getCurrent().setAttribute(
"resourceLoadFilterWorkerOrCriterion",
bandBox.getSelectedElements());
notifyChange();
}
});
@ -675,6 +699,12 @@ public class ResourceLoadController implements Composer {
return result;
}
public void addSelectedElementsToBandbox(List<FilterPair> criterion) {
for (FilterPair object : criterion) {
bandBox.addSelectedElement(object);
}
}
}
private static class ByNamePaginator extends DependingOnFiltering