Author: bleny Date: 2014-03-25 18:42:12 +0100 (Tue, 25 Mar 2014) New Revision: 1751 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1751 Log: refs #4483 introduce SampleRowsFilterValues filter in plain old struts jsp Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/SampleRowsFilter-conversion.properties Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/SampleRowsFilter-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/SampleRowsFilter-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/SampleRowsFilter-conversion.properties 2014-03-25 17:42:12 UTC (rev 1751) @@ -0,0 +1,2 @@ +periodFrom=fr.ifremer.wao.web.action.MonthConverter +periodTo=fr.ifremer.wao.web.action.MonthConverter Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-25 17:22:15 UTC (rev 1750) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-25 17:42:12 UTC (rev 1751) @@ -59,7 +59,7 @@ wao.ui.action.refresh=Refresh wao.ui.action.refuseContact=Refuse contact wao.ui.action.remove=Remove -wao.ui.action.reset=Remettre à zéro +wao.ui.action.reset=Reset wao.ui.action.resetFields=Reset form wao.ui.action.revert=Revert wao.ui.action.runExport=Run export Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-25 17:22:15 UTC (rev 1750) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-25 17:42:12 UTC (rev 1751) @@ -59,7 +59,7 @@ wao.ui.action.refresh=Rafraîchir wao.ui.action.refuseContact=Refuser le contact wao.ui.action.remove=Retirer -wao.ui.action.reset=Reset +wao.ui.action.reset=Remettre à zéro wao.ui.action.resetFields=Remettre le formulaire à zéro wao.ui.action.revert=Annuler wao.ui.action.runExport=Lancer l'export Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-25 17:22:15 UTC (rev 1750) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-25 17:42:12 UTC (rev 1751) @@ -42,6 +42,16 @@ <s:form method="GET"> + <s:textfield name="filter.periodFrom" + label="%{getText('wao.ui.form.periodFrom')}" + placeholder="04/2014" + cssClass="input-small" /> + + <s:textfield name="filter.periodTo" + label="%{getText('wao.ui.form.period.to')}" + placeholder="03/2015" + cssClass="input-small" /> + <s:select name="filter.companyIds" label="%{getText('wao.ui.entity.Company')}" list="samplingPlan.filterValues.companies" @@ -54,6 +64,37 @@ multiple="true" cssClass="input-xxlarge" /> + <s:select name="filter.fishingZoneFacadeNames" + label="%{getText('wao.ui.field.FishingZone.facadeName')}" + list="samplingPlan.filterValues.fishingZoneFacadeNames" + multiple="true" + cssClass="input-xxlarge" /> + + <s:select name="filter.fishingZoneSectorNames" + label="%{getText('wao.ui.field.FishingZone.sectorName')}" + list="samplingPlan.filterValues.fishingZoneSectorNames" + multiple="true" + cssClass="input-xxlarge" /> + + <s:select name="filter.sampleRowCodes" + label="%{getText('wao.ui.field.SampleRow.code')}" + list="samplingPlan.filterValues.sampleRowCodes" + multiple="true" + cssClass="input-xxlarge" /> + + <s:select name="filter.fishingGearDcfIds" + label="%{getText('wao.ui.entity.fishingGearDCF')}" + list="samplingPlan.filterValues.fishingGearDcfs" + value="%getText(#value)" + multiple="true" + cssClass="input-xxlarge" /> + + <s:select name="filter.targetSpeciesDcfIds" + label="%{getText('wao.ui.entity.targetSpeciesDCF')}" + list="samplingPlan.filterValues.targetSpeciesDcfs" + multiple="true" + cssClass="input-xxlarge" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset" />