Author: bleny Date: 2011-03-30 16:34:24 +0000 (Wed, 30 Mar 2011) New Revision: 1119 Log: enable sampling plan for coordinator Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -389,6 +389,10 @@ .addEquals(sampleRowProperty.terrestrialLocation(), filter.getTerrestrialDistrict()); } + if (filter.getObservationUnit() != null) { + query.addEquals(sampleRowProperty.observationUnit(), filter.getObservationUnit()); + } + if (logger.isDebugEnabled()) { logger.debug("sampling filter query " + query); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -28,6 +28,7 @@ import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TargetSpeciesDCF; +import fr.ifremer.wao.entity.TerrestrialDivision; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.WaoUser; @@ -278,6 +279,19 @@ } @Override + public void addObservationUnits(TerrestrialDivision toAdd) { + if (toAdd == null) { + return; + } + if (getObservationUnits() == null) { + setObservationUnits(new ArrayList<TerrestrialDivision>()); + } + if (!containsObservationUnits(toAdd)) { + super.addObservationUnits(toAdd); + } + } + + @Override public void addSampleRows(SampleRow toAdd) { if (toAdd == null) { return; @@ -352,6 +366,11 @@ return getAsList(getObservers()); } + @Override + public List<TerrestrialDivision> getObservationUnitsAsList() { + return getAsList(getObservationUnits()); + } + protected <E> List<E> getAsList(Collection<E> collection) { if (collection == null) { return new ArrayList<E>(); @@ -362,20 +381,28 @@ @Override public void fill(List<SampleRow> sampleRows) { for (SampleRow sampleRow : sampleRows) { - addCompanies(sampleRow.getCompany()); - addFacadeNames(sampleRow.getFacade()); - addPrograms(sampleRow.getProgramName()); - addSectorsNames(sampleRow.getSectors()); - Collection<DCF5Code> dcf5Codes = sampleRow.getDCF5Code(); - if (dcf5Codes != null) { - for (DCF5Code dcf5Code : dcf5Codes) { - addFishingGearDCFCodes(dcf5Code.getFishingGearDCF()); - addTargetSpeciesDCFCodes(dcf5Code.getTargetSpeciesDCF()); + ObsProgram obsProgram = sampleRow.getObsProgram(); + if (ObsProgram.OBSDEB.equals(obsProgram)) { + addAllObservers(sampleRow.getObservers()); + addObservationUnits(sampleRow.getObservationUnit()); + } else { + // for both ObsMer and ObsVente + addFacadeNames(sampleRow.getFacade()); + addSectorsNames(sampleRow.getSectors()); + addPrograms(sampleRow.getProgramName()); + Collection<DCF5Code> dcf5Codes = sampleRow.getDCF5Code(); + if (dcf5Codes != null) { + for (DCF5Code dcf5Code : dcf5Codes) { + addFishingGearDCFCodes(dcf5Code.getFishingGearDCF()); + addTargetSpeciesDCFCodes(dcf5Code.getTargetSpeciesDCF()); + addCompanies(sampleRow.getCompany()); + } } + if (ObsProgram.OBSVENTE.equals(obsProgram)) { + addTerrestrialDistricts(sampleRow.getTerrestrialLocation()); + } } - addTerrestrialDistricts(sampleRow.getTerrestrialLocation()); - addAllObservers(sampleRow.getObservers()); } addAllSampleRows(sampleRows); } -} //SamplingFilterValuesImpl +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -75,14 +75,14 @@ * correspond to the SampleMonth to get. * @param date a Date * @return the SampleMonth if it exists in the SampleMonth list or null - * otherwise + * otherwise. null if date is null. */ @Override public SampleMonth getSampleMonth(Date date) { // will be returned SampleMonth sampleMonth = null; - if (getSampleMonth() != null) { + if (date != null && getSampleMonth() != null) { if (sampleMonthMap == null) { for (SampleMonth curr : getSampleMonth()) { PeriodDates periodDates = new PeriodDates(curr.getPeriodDate(), curr.getPeriodDate()); @@ -105,8 +105,8 @@ } } - if (log.isDebugEnabled()) { - log.debug("sampleMonth for date " + date + " is " + + if (log.isTraceEnabled()) { + log.trace("sampleMonth for date " + date + " is " + (sampleMonth == null ? "null" : monthFormat.format(sampleMonth.getPeriodDate()))); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -31,15 +31,20 @@ } @Override - public String toString() { - String toString; + public String getDescription() { + String description; if (isObservationUnit()) { - toString = getRegionIfremerCode() + "-" + getObservationUnitCode() + description = getRegionIfremerCode() + "-" + getObservationUnitCode() + " " + getObservationUnitName(); } else { - toString = getPort().getPortName(); + description = getPort().getPortName(); } - return toString; + return description; } + @Override + public String toString() { + return getDescription(); + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -669,16 +669,20 @@ // } if (result != null) { - result.sizeElligibleBoat(); - result.sizeSampleMonth(); - result.sizeFishingZone(); - result.sizeDCF5Code(); result.sizeSampleRowLog(); - if (ObsProgram.OBSVENTE.equals(result.getObsProgram())) { - result.getTerrestrialLocation(); - } else if (ObsProgram.OBSDEB.equals(result.getObsProgram())) { + if (ObsProgram.OBSDEB.equals(result.getObsProgram())) { result.sizeObservers(); + result.getObservationUnit(); + } else { + result.sizeElligibleBoat(); + result.sizeSampleMonth(); + result.sizeFishingZone(); + result.sizeDCF5Code(); + + if (ObsProgram.OBSVENTE.equals(result.getObsProgram())) { + result.getTerrestrialLocation(); + } } } @@ -1366,9 +1370,11 @@ @Override public SamplingFilterValues executeGetPossibleValuesForFilter(TopiaContext transaction, SamplingFilter filter) throws Exception { + + // extract data List<SampleRow> sampleRows = executeGetSampleRowsByFilter(transaction, filter); - // Fill datas + // collect values SamplingFilterValues result = new SamplingFilterValuesImpl(); result.fill(sampleRows); @@ -1381,18 +1387,21 @@ // in the firsts months of a new year go from now to 6 months before // in the rest of the year, just start at the beginning of the current year + Date fromDate = context.getCurrentDate(); Date toDate = context.getCurrentDate(); - Date fromDate = context.getCurrentDate(); if (DateUtil.getMonth(fromDate) < 3) { fromDate = DateUtils.addMonths(fromDate, -6); + toDate = DateUtils.addMonths(toDate, 6); } else { fromDate = DateUtil.setFirstDayOfYear(fromDate); + toDate = DateUtil.setLastDayOfYear(toDate); } fromDate = DateUtil.setMinTimeOfDay(fromDate); - toDate = DateUtil.setMinTimeOfDay(toDate); + toDate = DateUtil.setMaxTimeOfDay(toDate); samplingFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); + samplingFilter.setPeriod(new PeriodDates(fromDate, toDate)); samplingFilter.setEstimatedTides(true); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -44,6 +44,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.Calendar; +import java.util.Date; import java.util.GregorianCalendar; import java.util.Properties; @@ -146,4 +147,7 @@ return context.getServiceFactory().getServiceChart(); } + public void setCurrentDate(Date date) { + context.setCurrentDate(date); + } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -28,6 +28,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.UserProfile; @@ -131,7 +132,18 @@ // as an administrator, i can get the sampling plan ServiceSampling serviceSampling = manager.getServiceSampling(); + // Since a new filter may be initialized for a period of time, + // we set the current date to be deterministic, at this date + // filter returned must be quite large to make 2 sample rows + // non filtered + manager.setCurrentDate(DateUtil.createDate(25, 1, 2010)); + SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); + + if (log.isDebugEnabled()) { + log.debug("a new empty sampling filter is " + samplingFilter.toString()); + } + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(samplingFilter); if (log.isDebugEnabled()) { @@ -158,8 +170,16 @@ ServiceSampling serviceSampling = manager.getServiceSampling(); - // i can filter the sampling plan + // i can filter the sampling plan by getting a filter SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); + + // and the possible values (here we only check that this + // doesn't raise any error + SamplingFilterValues samplingFilterValues = serviceSampling.getPossibleValuesForFilter(samplingFilter); + samplingFilterValues.getSampleRows(); + samplingFilterValues.getObservationUnits(); + samplingFilterValues.getObservers(); + samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); samplingFilter.setPeriod(new PeriodDates(DateUtil.createDate(20, 2, 2010), DateUtil.createDate(27, 2, 2010))); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -31,12 +31,14 @@ import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.ui.base.SamplingFilterManager; import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.data.SampleRowDataSource; import fr.ifremer.wao.ui.services.SampleRowModelFactory; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; @@ -69,10 +71,14 @@ /********* FILTERS ********/ - public SamplingFilter getSamplingFilter() { - SamplingFilter samplingFilter = new SamplingFilterImpl(); - samplingFilter.setObsProgram(ObsProgram.OBSDEB); - return samplingFilter; + @Persist + private SamplingFilterManager filterManager; + + public SamplingFilterManager getFilterManager() { + if (filterManager == null) { + filterManager = new SamplingFilterManager(connectedUser, serviceSampling); + } + return filterManager; } /********* GRID ********/ @@ -84,7 +90,7 @@ public GridDataSource getSampleRows() { if (sampleRows == null) { - sampleRows = new SampleRowDataSource(getSamplingFilter(), serviceSampling); + sampleRows = new SampleRowDataSource(getFilterManager().getFilter(), serviceSampling); } return sampleRows; } @@ -107,7 +113,7 @@ public InputStream getStream() throws IOException { InputStream csv = null; try { - csv = serviceSampling.exportSamplingPlanCsv(connectedUser, getSamplingFilter()); + csv = serviceSampling.exportSamplingPlanCsv(connectedUser, getFilterManager().getFilter()); } catch (WaoException eee) { throw new IOException(eee); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-03-30 16:34:24 UTC (rev 1119) @@ -27,12 +27,18 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.WaoUser; +import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.PropertyConduit; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.services.BeanModelSource; +import org.nuiton.util.StringUtil; import java.lang.annotation.Annotation; +import java.util.LinkedList; +import java.util.List; +import java.util.Observer; /** * Used to generate a bean model for the grid used in sampling plan showed @@ -84,6 +90,24 @@ }); add(SampleRow.PROPERTY_OBSERVATION_UNIT); add(SampleRow.PROPERTY_COMMENT); + if (connectedUser.isCoordinator()) { + add(SampleRow.PROPERTY_OBSERVERS, new SampleRowReaderPropertyConduit() { + + /** Observers full names separated by comma */ + @Override + public String getValue(SampleRow sampleRow) { + String value = ""; + if (sampleRow.getObservers() != null) { + List<String> observersLogins = new LinkedList<String>(); + for (WaoUser observer : sampleRow.getObservers()) { + observersLogins.add(observer.getFullName()); + } + value = StringUtil.join(observersLogins, ", ", false); + } + return value; + } + }); + } add("actions", null); } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-30 16:34:24 UTC (rev 1119) @@ -47,62 +47,76 @@ <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:format="MM/yyyy" t:validate="required"/>  </div> - <div> - <t:if t:test="filterManager.user.admin"> - <label for="company">${message:wao.ui.entity.Company} :</label> - <t:topiaEntitySelector t:id="company" - t:clazzName="Company" - t:labelPropertyName="name" - t:values="possibleValuesForFilter.companiesAsList" - t:selectedValue="filter.company"/>  - </t:if> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <t:simpleSelector t:id="programName" - t:values="possibleValuesForFilter.programsAsList" - t:selectedValue="filter.programName"/> -   - </div> - <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <t:simpleSelector t:id="facadeName" - t:values="possibleValuesForFilter.facadeNamesAsList" - t:selectedValue="filter.facadeName"/>  - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <t:simpleSelector t:id="sectorName" - t:values="possibleValuesForFilter.sectorsNamesAsList" - t:selectedValue="filter.sectorName"/>  - <t:if test="filterManager.user.obsVente"> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <t:topiaEntitySelector t:id="terrestrialDistrict" - t:clazzName="TerrestrialLocation" + <t:if test="filterManager.user.obsDeb"> + <!-- filter fields only for obsdeb--> + <div> + <label for="observationUnit">${message:wao.ui.entity.SampleRow.observationUnit}</label> + <t:topiaEntitySelector t:id="observationUnit" + t:clazzName="TerrestrialDivision" t:labelPropertyName="description" - t:values="possibleValuesForFilter.terrestrialDistrictsAsList" - t:selectedValue="filter.terrestrialDistrict"/> - </t:if> - </div> - <div> - <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <t:topiaEntitySelector t:id="fishingGearDCF" - t:clazzName="FishingGearDCF" - t:labelPropertyName="fullDescription" - t:values="possibleValuesForFilter.fishingGearDCFCodesAsList" - t:selectedValue="filter.fishingGearDCF"/>  - <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <t:topiaEntitySelector t:id="targetSpeciesDCF" - t:clazzName="TargetSpeciesDCF" - t:labelPropertyName="fullDescription" - t:values="possibleValuesForFilter.targetSpeciesDCFCodesAsList" - t:selectedValue="filter.targetSpeciesDCF"/>  - <t:if test="filterManager.user.obsVente"> - <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> - <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> - </t:if> - </div> - <t:if test="showEstimatedTides"> - <div class="filterRow"> - <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" /> - <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> + t:values="possibleValuesForFilter.observationUnitsAsList" + t:selectedValue="filter.observationUnit" /> </div> + <p:else> + <!-- filter field for ObsMer and ObsVente --> + <div> + <t:if t:test="filterManager.user.admin"> + <label for="company">${message:wao.ui.entity.Company} :</label> + <t:topiaEntitySelector t:id="company" + t:clazzName="Company" + t:labelPropertyName="name" + t:values="possibleValuesForFilter.companiesAsList" + t:selectedValue="filter.company"/>  + </t:if> + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> + <t:simpleSelector t:id="programName" + t:values="possibleValuesForFilter.programsAsList" + t:selectedValue="filter.programName"/> +   + </div> + <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> + <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> + <t:simpleSelector t:id="facadeName" + t:values="possibleValuesForFilter.facadeNamesAsList" + t:selectedValue="filter.facadeName"/>  + <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> + <t:simpleSelector t:id="sectorName" + t:values="possibleValuesForFilter.sectorsNamesAsList" + t:selectedValue="filter.sectorName"/>  + <t:if test="filterManager.user.obsVente"> + <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> + <t:topiaEntitySelector t:id="terrestrialDistrict" + t:clazzName="TerrestrialLocation" + t:labelPropertyName="description" + t:values="possibleValuesForFilter.terrestrialDistrictsAsList" + t:selectedValue="filter.terrestrialDistrict"/> + </t:if> + </div> + <div> + <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> + <t:topiaEntitySelector t:id="fishingGearDCF" + t:clazzName="FishingGearDCF" + t:labelPropertyName="fullDescription" + t:values="possibleValuesForFilter.fishingGearDCFCodesAsList" + t:selectedValue="filter.fishingGearDCF"/>  + <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> + <t:topiaEntitySelector t:id="targetSpeciesDCF" + t:clazzName="TargetSpeciesDCF" + t:labelPropertyName="fullDescription" + t:values="possibleValuesForFilter.targetSpeciesDCFCodesAsList" + t:selectedValue="filter.targetSpeciesDCF"/>  + <t:if test="filterManager.user.obsVente"> + <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> + <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> + </t:if> + </div> + <t:if test="showEstimatedTides"> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" /> + <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> + </div> + </t:if> + </p:else> </t:if> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico22px refresh" t:id="refresh" Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-03-30 16:34:24 UTC (rev 1119) @@ -64,7 +64,8 @@ wao.ui.entity.Contact=Contact wao.ui.entity.FishingZone=Fishing zones wao.ui.entity.SampleRow=Sample row -wao.ui.entity.TerrestrialLocation= +wao.ui.entity.SampleRow.observationUnit=Observation unit +wao.ui.entity.TerrestrialLocation=Place wao.ui.entity.fishingGearDCF=Gear DCF code wao.ui.entity.targetSpeciesDCF=Target species DCF code wao.ui.field.Boat.boatLength=Length Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-30 16:34:24 UTC (rev 1119) @@ -64,6 +64,7 @@ wao.ui.entity.Contact=Contact wao.ui.entity.FishingZone=Zones de p\u00EAche wao.ui.entity.SampleRow=Ligne du plan d'\u00E9chantillonnage +wao.ui.entity.SampleRow.observationUnit=Unit\u00E9 d'observation wao.ui.entity.TerrestrialLocation=Lieu wao.ui.entity.fishingGearDCF=Engin code DCF wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00E8ces-cible code DCF Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-03-30 14:54:13 UTC (rev 1118) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-03-30 16:34:24 UTC (rev 1119) @@ -33,6 +33,13 @@ </span> </div> + <div style="clear: both;" /> + + <t:samplingFilterComponent t:id="samplingFilter" + t:visibleOnStartup="true" + t:filterManager="filterManager" + t:legendMsg="${message:wao.ui.misc.advancedSearch}"/> + <div t:type="grid" t:source="sampleRows" t:row="sampleRow" t:model="obsdebSamplingPlanModel" t:rowsPerPage="50"> <!-- code --> <p:codeHeader>