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

Moved method to generate label name and type pattern for finders to Label class

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-01-31 19:48:21 +01:00
parent 0fe7ace58c
commit 82d78afec4
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
View file

@ -132,4 +132,8 @@ public class Label extends IntegrationEntity implements Comparable<Label> {
return getTypeAndName().compareToIgnoreCase(o.getTypeAndName());
}
public String getFinderPattern() {
return String.format("%s ( %s )", name, type.getName());
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
View file

@ -193,9 +193,9 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addLabel(LabelType type, Label label) {
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderElementFilterEnum.Label, pattern, label));
new FilterPair(OrderElementFilterEnum.Label, label
.getFinderPattern(), label));
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
View file

@ -302,9 +302,9 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addLabel(LabelType type, Label label) {
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderFilterEnum.Label, pattern, label));
new FilterPair(OrderFilterEnum.Label, label.getFinderPattern(),
label));
}
private void addExternalCompany(ExternalCompany externalCompany) {

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
View file

@ -196,9 +196,9 @@ public class TaskElementsMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addLabel(LabelType type, Label label) {
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(TaskElementFilterEnum.Label, pattern, label));
new FilterPair(TaskElementFilterEnum.Label, label
.getFinderPattern(), label));
}
private List<FilterPair> fillWithFirstTenFiltersResources() {

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
View file

@ -307,9 +307,9 @@ public class TaskGroupsMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addLabel(LabelType type, Label label) {
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(TaskGroupFilterEnum.Label, pattern, label));
new FilterPair(TaskGroupFilterEnum.Label, label
.getFinderPattern(), label));
}
private void addExternalCompany(ExternalCompany externalCompany) {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
View file

@ -168,7 +168,7 @@ public class CompanyPlanningController implements Composer {
if ((user != null) && (user.getProjectsFilterLabel() != null)) {
bdFilters.addSelectedElement(new FilterPair(
TaskGroupFilterEnum.Label, user.getProjectsFilterLabel()
.getCompleteName(), user
.getFinderPattern(), user
.getProjectsFilterLabel()));
}
}