Author: bleny Date: 2010-11-05 16:04:40 +0000 (Fri, 05 Nov 2010) New Revision: 745 Log: better filter on multiple codes in sampling plan ; still not working :-( Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/webapp/SamplingPlan.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 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-11-05 16:04:40 UTC (rev 745) @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; /** * SamplingFilterImpl @@ -77,7 +77,7 @@ if (sampleRow == null) { setSampleRows(null); } else { - Collection<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); + List<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); tempSampleRows.add(sampleRow); setSampleRows(tempSampleRows); } @@ -93,7 +93,7 @@ public SampleRow getSampleRow() { SampleRow sampleRow = null; if (CollectionUtils.isNotEmpty(getSampleRows())) { - sampleRow = getSampleRows(0); + sampleRow = getSampleRows().get(0); if (getSampleRows().size() > 1) { log.warn("other sample rows in the filter will be ignored"); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-05 16:04:40 UTC (rev 745) @@ -36,7 +36,6 @@ import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; -import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Persist; @@ -277,11 +276,19 @@ public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException { if (sampleRowSelectModel == null) { // WARN : no use of sampleRow filter + + /* SampleRow rowFiltered = getFilter().getSampleRow(); getFilter().setSampleRow(null); List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); getFilter().setSampleRow(rowFiltered); - + */ + + //List<SampleRow> rowsFiltered = getFilter().getSampleRows(); + //getFilter().setSampleRows(null); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); + //getFilter().setSampleRows(rowsFiltered); + sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "topiaId", propertyAccess); } @@ -367,8 +374,8 @@ log.debug("REFRESH FILTERS DATA"); log.debug("observerSelect : " + observerSelect); } - SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); - getFilter().setSampleRow(row); + //SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); + // getFilter().setSampleRow(row); if (user.isAdmin()) { Company company = getCompanySelectModel().findObject(companyId); getFilter().setCompany(company); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 16:04:40 UTC (rev 745) @@ -244,7 +244,7 @@ private boolean refreshSampleRowCodeZone; @Property - private String sampleRowCodeIndex; + private int sampleRowCodeIndex; @Persist @Property @@ -260,28 +260,33 @@ } public Object onActionFromAddSampleRowCode() { - refreshSampleRowCodeZone = true; - if (logger.isDebugEnabled()) { - logger.debug("added filter on code " + selectedSampleRow.getCode()); - } if (getFilter().getSampleRows() == null) { getFilter().setSampleRows(new ArrayList<SampleRow>()); } - getFilter().addSampleRows(selectedSampleRow); + getFilter().getSampleRows().add(selectedSampleRow); + if (logger.isDebugEnabled()) { + logger.debug("added filter on code " + selectedSampleRow.getCode()); + } + selectedSampleRow = null; - + refreshSampleRowCodeZone = true; return sampleRowZone; } - public Object onActionFromRemoveSampleRowCode(String sampleRowCodeIndex) { - refreshSampleRowCodeZone = true; + public Object onActionFromRemoveSampleRowCode(int sampleRowCodeIndex) { - logger.debug("should remove" + sampleRowCodeIndex); + logger.debug("should remove " + sampleRowCodeIndex); - getFilter().getSampleRows().remove(selectedSampleRow); + SampleRow sampleRowToRemove = getFilter().getSampleRows().get(sampleRowCodeIndex); + logger.debug("will remove " + sampleRowToRemove.getCode()); + + boolean result = getFilter().getSampleRows().remove(sampleRowToRemove); + logger.debug("removed " + result); + + refreshSampleRowCodeZone = true; return sampleRowZone; } @@ -294,7 +299,7 @@ /** * ACTION:: Used to change the display mode of the samplingPlan table. * This change affect the loading of the css style over the main table. - * + * * @see #getMainClass() */ void onActionFromToggleDisplayMode() { Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 16:04:40 UTC (rev 745) @@ -30,6 +30,6 @@ codeDCF5-label: M\u00e9tier code DCF5 facadeName-label: Fa\u00e7ade sectorName-label: Zone -sampleRow-label: Code ligne +selectedSampleRow-label: Code ligne -sampleRow-delete-confirmMessage: Etes-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? +sampleRow-delete-confirmMessage: \u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 16:04:40 UTC (rev 745) @@ -140,14 +140,14 @@ <a t:type="actionlink" t:id="addSampleRowCode" title="Ajouter un code de ligne" t:zone="so-sampling-sampleRowZone"> <img src="${asset:context:img/add-16px.png}" /> </a> - <!--ul> - <li t:type="loop" t:source="filter.sampleRows" t:value="row" t:index="sampleRowCodeIndex"> + <ul> + <li t:type="loop" t:source="filter.sampleRows" t:value="row" t:index="sampleRowCodeIndex" t:volatile="true"> ${row.code} <a t:type="actionlink" t:id="removeSampleRowCode" t:context="sampleRowCodeIndex" title="Supprimer ce code de ligne" t:zone="so-sampling-sampleRowZone"> <img src="${asset:context:img/remove-22px.png}" /> </a> </li> - </ul--> + </ul> </t:nuiton.subForm> </t:zone>