Author: bleny Date: 2011-04-11 13:03:02 +0000 (Mon, 11 Apr 2011) New Revision: 1173 Log: fix obsdebsampling plan page layout Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-04-11 10:57:07 UTC (rev 1172) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-04-11 13:03:02 UTC (rev 1173) @@ -85,17 +85,11 @@ /********* Page layout ***********/ @Persist - private Boolean showFilters; + private Boolean showImport; -// @InjectComponent -// private Zone filtersZone; + @InjectComponent + private Zone importZone; - @Persist - private Boolean showImportExport; - -// @InjectComponent -// private Zone importExportZone; - @InjectComponent private SamplingFilterComponent samplingFilter; @@ -103,32 +97,27 @@ return serviceSampling; } - public boolean getShowFilters() { - if (showFilters == null) { - showFilters = samplingFilter.getFilter().isPeriodFilteredOnly(); + public boolean getShowImport() { + if (showImport == null) { + showImport = false; } - return showFilters; + return showImport; } - public boolean getShowImportExport() { - if (showImportExport == null) { - showImportExport = false; - } - return showImportExport; + public Object onActionFromShowFilters() { + samplingFilter.switchFiltersVisible(); + return samplingFilter; } - public Zone onActionFromShowFilters() { - showFilters = ! getShowFilters(); - //return filtersZone; - return null; + public Object onActionFromShowImport() { + showImport = ! getShowImport(); + if (showImport) { + return importZone.getBody(); + } else { + return importZone; + } } - public Zone onActionFromShowImportExport() { - showImportExport = ! getShowImportExport(); - //return importExportZone; - return null; - } - /********* GRID ********/ private GridDataSource sampleRows; @@ -177,7 +166,7 @@ return new ExportStreamResponse("wao-echantillonnage-obsdeb") { @Override public InputStream getStream() throws IOException { - InputStream csv = null; + InputStream csv; try { csv = serviceSampling.exportSamplingPlanCsv(connectedUser, samplingFilter.getFilter()); } catch (WaoException eee) { Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-11 10:57:07 UTC (rev 1172) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-11 13:03:02 UTC (rev 1173) @@ -26,11 +26,11 @@ <h1 class="fleft">${message:wao.ui.samplingPlan.title}</h1> <div style="clear: left;" class="actions-top"> - <t:actionlink t:id="showFilters" t:zone="filtersZone"> + <t:actionlink t:id="showFilters" t:zone="so-sampling-filters"> ${message:wao.ui.misc.advancedSearch} </t:actionlink> <t:unless test="connectedUser.observer"> - <t:actionlink t:id="showImport"> + <t:actionlink t:id="showImport" t:zone="importZone"> ${message:wao.ui.misc.import} </t:actionlink> </t:unless> @@ -41,15 +41,14 @@ <div style="clear: both;" /> - <!--<t:zone t:id="importExportZone" t:visible="showImportExport">--> + <t:zone t:id="importZone" t:visible="false"> <t:importFieldSet t:label="${message:wao.ui.import.samplingPlanLabel}" t:engine="samplingPlanImportEngine" /> - <!--/t:zone--> - <!--t:zone t:id="filtersZone" t:visible="showFilters"--> - <t:samplingFilterComponent t:id="samplingFilter" - t:user="connectedUser" - t:serviceSampling="serviceSampling" - t:legendMsg="${message:wao.ui.misc.advancedSearch}" /> - <!--/t:zone--> + </t:zone> + <t:samplingFilterComponent t:id="samplingFilter" + t:user="connectedUser" + t:serviceSampling="serviceSampling" + t:visibleOnStartup="false" + t:legendMsg="${message:wao.ui.misc.advancedSearch}" /> <div t:type="grid" Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-11 10:57:07 UTC (rev 1172) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-11 13:03:02 UTC (rev 1173) @@ -84,7 +84,6 @@ </a> </div> - <!--FIXME sletellier 20110316 : visible on parameter dont work in this case....--> <t:samplingFilterComponent t:id="filterComponent" t:visibleOnStartup="false" t:user="user"