Author: bleny Date: 2012-03-02 12:25:41 +0100 (Fri, 02 Mar 2012) New Revision: 1545 Url: http://forge.codelutin.com/repositories/revision/wao/1545 Log: Evolution #670 Ajouter le programme dans les filtres des contacts : en s?\195?\169lection simple pour l'instant Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2012-03-02 10:21:23 UTC (rev 1544) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2012-03-02 11:25:41 UTC (rev 1545) @@ -54,7 +54,7 @@ getSampleRows() != null || StringUtils.isNotEmpty(getSectorName()) || StringUtils.isNotEmpty(getFacadeName()) || - StringUtils.isNotEmpty(getProgramName()) || + CollectionUtils.isNotEmpty(getProgramNames()) || StringUtils.isNotEmpty(getCodeDCF5()) || getPeriod() != null || getSampleRows() != null || @@ -102,6 +102,29 @@ } @Override + public void setProgramName(String programName) { + if (programName == null) { + setProgramNames(null); + } else { + List<String> programNames = new ArrayList<String>(); + programNames.add(programName); + setProgramNames(programNames); + } + } + + @Override + public String getProgramName() { + String programName = null; + if (CollectionUtils.isNotEmpty(getProgramNames())) { + programName = getProgramNames().get(0); + if (getProgramNames().size() > 1) { + log.warn("other program names will be ignored"); + } + } + return programName; + } + + @Override public String toString() { String toString = ToStringBuilder.reflectionToString(this); return toString; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-02 10:21:23 UTC (rev 1544) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-02 11:25:41 UTC (rev 1545) @@ -39,6 +39,10 @@ } + if (CollectionUtils.isNotEmpty(filter.getProgramNames())) { + query.addEquals(SampleRow.PROPERTY_PROGRAM_NAME, filter.getProgramNames().toArray()); + } + boolean filterOnFaceName = StringUtils.isNotEmpty(filter.getFacadeName()); boolean filterOnSectorName = StringUtils.isNotEmpty(filter.getSectorName()); boolean filterOnFishingZone = filterOnFaceName || filterOnSectorName; @@ -87,10 +91,6 @@ } - if (filter.getProgramName() != null) { - query.addEquals(SampleRow.PROPERTY_PROGRAM_NAME, filter.getProgramName()); - } - // Period filter on sampleRow dates if (filter.getPeriod() != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 10:21:23 UTC (rev 1544) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2012-03-02 11:25:41 UTC (rev 1545) @@ -143,7 +143,10 @@ 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"