Author: bleny Date: 2010-11-12 19:04:11 +0000 (Fri, 12 Nov 2010) New Revision: 772 Log: merge period selection and filters in sampling plan Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-12 18:13:17 UTC (rev 771) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-12 19:04:11 UTC (rev 772) @@ -41,6 +41,7 @@ import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; +import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; @@ -205,16 +206,27 @@ return false; } + @Persist + private Boolean showFilters; + public boolean isFiltersVisible() { - boolean companyFiltered = getFilter().getCompany() != null - && user.isAdmin(); - return (!getFilter().isPeriodFilteredOnly() || companyFiltered); + if (showFilters == null) { + showFilters = false; + } + return BooleanUtils.isTrue(showFilters); } Object onActionFromShowFilters() { + showFilters = ! showFilters; + // Initialize filters initSelectFilters(true, false, true); - return filtersZone.getBody(); + + if (isFiltersVisible()) { + return filtersZone.getBody(); + } else { + return filtersZone; + } } void onSelectedFromReset() { Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 18:13:17 UTC (rev 771) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-12 19:04:11 UTC (rev 772) @@ -90,7 +90,7 @@ </t:if> </div> </div> - <form t:type="form" t:id="periodForm" action="post"> + <!--form t:type="form" t:id="periodForm" action="post"> <div> <t:label t:for="periodBegin" /> : <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  @@ -99,7 +99,11 @@ <input t:type="submit" class="ico search" value="Search" t:title="Affichage des lignes du plan couvertes par la période sélectionnée" /> <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form">recherche avancée</a> </div> - </form> + </form--> + <div> + Pour la pédiode du <t:output value="period.fromDate" format="dateFormat" /> au <t:output value="period.thruDate" format="dateFormat" /> +  <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form"><img src="${asset:context:img/search.png}" /> recherche avancée</a> + </div> <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> <fieldset> <legend>Recherche avancée</legend> @@ -108,6 +112,12 @@ <t:errors /> <div class="t-beaneditor"> <div> + <t:label t:for="periodBegin" /> : + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  + <t:label t:for="periodEnd" /> : + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required" />  + </div> + <div> <t:if t:test="user.admin"> <t:label t:for="company" /> : <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>