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

[Bug #610] The bandboxMultipleSearch component does not allow to select the dotted line.

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Susana Montes Pedreira 2010-09-02 10:52:39 +02:00
parent a3cded16db
commit 8e4226204f
10 changed files with 64 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java
View file

@ -73,6 +73,7 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder {
getListMatching().add(new FilterPair(
criterionFilterEnum, criterion.getName(), criterion));
}
addNoneFilter();
return getListMatching();
}
@ -98,9 +99,4 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder {
}
}
private void addNoneFilter() {
getListMatching().add(
new FilterPair(OrderElementFilterEnum.None,
OrderElementFilterEnum.None.toString(), null));
}
}

49
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java Normal file
View file

@ -0,0 +1,49 @@
/*
* This file is part of NavalPlan
*
* Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
package org.navalplanner.web.common.components.finders;
import org.navalplanner.business.i18n.I18nHelper;
public enum FilterEnumNone implements IFilterEnum {
None("...");
/**
* Forces to mark the string as needing translation
*/
private static String _(String string) {
return string;
}
private String description;
private FilterEnumNone(String description) {
this.description = description;
}
public String toString() {
return I18nHelper._(this.description);
}
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java
View file

@ -65,6 +65,12 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder {
return filterPairRenderer;
}
protected void addNoneFilter() {
getListMatching().add(
new FilterPair(FilterEnumNone.None, FilterEnumNone.None
.toString(), null));
}
public String objectToString(Object obj) {
FilterPair filterPair = (FilterPair) obj;
String text = filterPair.getType() + "(" + filterPair.getPattern()
@ -89,7 +95,7 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder {
public boolean isValidNewFilter(Object obj) {
FilterPair filter = (FilterPair) obj;
if (filter.getType().equals(OrderFilterEnum.None)) {
if (filter.getType().equals(FilterEnumNone.None)) {
return false;
}
return true;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java
View file

@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
*/
public enum OrderElementFilterEnum implements IFilterEnum {
None("..."), Criterion(_("Criterion")), Label(_("Label"));
Criterion(_("Criterion")), Label(_("Label"));
/**
* Forces to mark the string as needing translation

10
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
View file

@ -110,9 +110,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
getListMatching().clear();
fillWithFirstTenFiltersLabels();
fillWithFirstTenFiltersCriterions();
getListMatching().add(
new FilterPair(OrderElementFilterEnum.None,
OrderElementFilterEnum.None.toString(), null));
addNoneFilter();
return getListMatching();
}
@ -244,10 +242,4 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
new FilterPair(OrderElementFilterEnum.Label, pattern, label));
}
private void addNoneFilter() {
getListMatching().add(
new FilterPair(OrderElementFilterEnum.None,
OrderElementFilterEnum.None.toString(), null));
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java
View file

@ -27,7 +27,7 @@ import org.navalplanner.business.i18n.I18nHelper;
public enum OrderFilterEnum implements IFilterEnum {
None("..."), Criterion(_("Criterion")), Label(_("Label")), ExternalCompany(
Criterion(_("Criterion")), Label(_("Label")), ExternalCompany(
_("Customer")), State(_("State")), Code(_("Code")), CustomerReference(
_("Customer Reference"));

10
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java
View file

@ -159,9 +159,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
fillWithFirstTenFiltersState();
fillWihtFirstTenFiltersCodes();
fillWihtFirstTenFiltersCustomerReferences();
getListMatching().add(
new FilterPair(OrderFilterEnum.None,
OrderFilterEnum.None.toString(), null));
addNoneFilter();
return getListMatching();
}
@ -417,10 +415,4 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
reference, reference));
}
private void addNoneFilter() {
getListMatching().add(
new FilterPair(OrderFilterEnum.None,
OrderFilterEnum.None.toString(), null));
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java
View file

@ -25,7 +25,7 @@ package org.navalplanner.web.common.components.finders;
public enum ResourceFilterEnum implements IFilterEnum {
None("..."), Criterion(_("Criterion")), CostCategory(_("Cost category"));
Criterion(_("Criterion")), CostCategory(_("Cost category"));
/**
* Forces to mark the string as needing translation

10
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java
View file

@ -99,9 +99,7 @@ public class ResourcesMultipleFiltersFinder extends MultipleFiltersFinder {
getListMatching().clear();
fillWithFirstTenFiltersCriterions();
fillWithFirstTenFiltersCostCategories();
getListMatching().add(
new FilterPair(OrderFilterEnum.None,
OrderFilterEnum.None.toString(), null));
addNoneFilter();
return getListMatching();
}
@ -203,10 +201,4 @@ public class ResourcesMultipleFiltersFinder extends MultipleFiltersFinder {
pattern, costCategory));
}
private void addNoneFilter() {
getListMatching().add(
new FilterPair(ResourceFilterEnum.None,
ResourceFilterEnum.None.toString(), null));
}
}

6
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java
View file

@ -73,6 +73,7 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
getListMatching().add(new FilterPair(
workerFilterEnum, worker.getShortDescription(), worker));
}
addNoneFilter();
return getListMatching();
}
@ -99,9 +100,4 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
}
}
private void addNoneFilter() {
getListMatching().add(
new FilterPair(OrderElementFilterEnum.None,
OrderElementFilterEnum.None.toString(), null));
}
}