Author: bleny Date: 2012-03-02 15:22:27 +0100 (Fri, 02 Mar 2012) New Revision: 1546 Url: http://forge.codelutin.com/repositories/revision/wao/1546 Log: Evolution #670 Ajouter le programme dans les filtres des contacts ; passage en s?\195?\169lection multiple Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-03-02 14:22:27 UTC (rev 1546) @@ -31,9 +31,11 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.util.AbstractSelectModel; +import org.chenillekit.tapestry.core.encoders.MultipleValueEncoder; import org.slf4j.Logger; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -75,6 +77,25 @@ @Parameter(required = false) private SimpleSelectorModel model; + private MultipleValueEncoder<String> encoder; + + public MultipleValueEncoder<String> getEncoder() { + if (encoder == null) { + encoder = new MultipleValueEncoder<String>() { + @Override + public String toClient(String value) { + return value; + } + + @Override + public List<String> toValue(String[] clientValue) { + return Arrays.asList(clientValue); + } + }; + } + return encoder; + } + public SimpleSelectorModel getModel() { if (model == null) { model = new SimpleSelectorModel(); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 14:22:27 UTC (rev 1546) @@ -41,6 +41,16 @@ t:selectedValues="filter.samplingFilter.sampleRows" size="6"/> </div> + <t:unless test="user.obsDeb"> + <div style="float: left; margin-right: 15px;"> + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label><br /> + <t:simpleSelector t:id="programName" + t:values="possibleValuesForFilter.samplingFilterValues.programsAsList" + t:selectedValues="filter.samplingFilter.programNames" + t:multiple="true" + t:size="6" /> + </div> + </t:unless> <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> <input t:type="datefield" @@ -143,10 +153,6 @@ t:values="possibleValuesForFilter.obsDebCodesAsList" t:selectedValue="filter.obsDebCode"/> <p:else> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <t:simpleSelector t:id="programName" - t:values="possibleValuesForFilter.samplingFilterValues.programsAsList" - t:selectedValue="filter.samplingFilter.programName"/> <label t:for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <t:simpleSelector t:id="facadeName" t:values="possibleValuesForFilter.samplingFilterValues.facadeNamesAsList" Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2012-03-02 11:25:41 UTC (rev 1545) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2012-03-02 14:22:27 UTC (rev 1546) @@ -30,7 +30,8 @@ t:model="model" t:value="selectedValues" t:disabled="disabled" - size="${size}"/> + t:encoder="encoder" + size="${size}" /> <p:else> <input t:type="select" t:id="select"