Author: sletellier Date: 2011-04-07 16:13:16 +0000 (Thu, 07 Apr 2011) New Revision: 1162 Log: - Display filter only if somthing on filter is selected - Fix checkbox bug Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/js/contactForm.js Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java 2011-04-07 16:13:16 UTC (rev 1162) @@ -70,4 +70,21 @@ // just convert list to array allowedStates.toArray(new ContactState[allowedStates.size()])); } + + @Override + public Boolean getFiltersVisible() { + + // If visible on startup + Boolean filtersVisible = super.getFiltersVisible(); + if (filtersVisible == null) { + filtersVisible = getVisibleOnStartup(); + + // If somthing is selected + if (!filtersVisible) { + filtersVisible = !getFilter().isFiltered(); + } + } + + return filtersVisible; + } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-04-07 16:13:16 UTC (rev 1162) @@ -84,9 +84,6 @@ } public Boolean getFiltersVisible() { - if (filtersVisible == null) { - filtersVisible = getVisibleOnStartup(); - } return filtersVisible; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-04-07 16:13:16 UTC (rev 1162) @@ -62,6 +62,23 @@ } @Override + public Boolean getFiltersVisible() { + + // If visible on startup + Boolean filtersVisible = super.getFiltersVisible(); + if (filtersVisible == null) { + filtersVisible = getVisibleOnStartup(); + + // If somthing is selected + if (!filtersVisible) { + filtersVisible = !getFilter().isPeriodFilteredOnly(); + } + } + + return filtersVisible; + } + + @Override public void resetFilter() { // Don't reset period in filters PeriodDates period = null; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-07 16:13:16 UTC (rev 1162) @@ -348,4 +348,10 @@ return messages.get(value.getDeclaringClass().getSimpleName() + "." + value.name()); } + public String getMammalsInfoBoxStyle() { + if (!contact.isMammalsCapture()) { + return "display: none;"; + } + return StringUtils.EMPTY; + } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-04-07 16:13:16 UTC (rev 1162) @@ -154,10 +154,11 @@ } public boolean isFiltersVisible() { - boolean companyFiltered = getContactFilter().getCompany() != null && - user.isAdmin(); - return (getContactFilter().isFiltered() || companyFiltered) && - StringUtils.isEmpty(getContactFilter().getBoatName()); +// boolean companyFiltered = getContactFilter().getCompany() != null && +// user.isAdmin(); +// return (getContactFilter().isFiltered() || companyFiltered) && +// StringUtils.isEmpty(getContactFilter().getBoatName()); + return filterComponent.getFiltersVisible(); } protected SamplingFilter getFilter() throws WaoException { @@ -168,6 +169,17 @@ return importExportZone.getBody(); } + Object onActionFromShowFilters() { + + filterComponent.switchFiltersVisible(); + + if (isFiltersVisible()) { + return filterComponent.getFiltersZone().getBody(); + } else { + return filterComponent.getFiltersZone(); + } + } + void onSelectedFromReset() { reset = true; } Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-07 16:13:16 UTC (rev 1162) @@ -228,9 +228,13 @@ ${message:wao.ui.field.Contact.mammalsCapture} <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> </label> - <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" onclick="updateMammalsInfoBox(this);" /> + <input t:type="checkbox" + t:id="mammalsCapture" + value="contact.mammalsCapture" + onclick="updateMammalsInfoBox(this);" /> </div> - <div id="mammalsInfoBox"> + <div id="mammalsInfoBox" + style="${mammalsInfoBoxStyle}"> <label for="mammalsInfo"> ${message:wao.ui.field.Contact.mammalsInfo}<br /> <span style="color: red;"> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-07 16:13:16 UTC (rev 1162) @@ -59,6 +59,7 @@ </div> <t:contactFilterComponent t:id="filterComponent" + t:visibleOnStartup="false" t:user="user" t:serviceContact="serviceContact"/> <!-- FILTRES --> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 16:13:16 UTC (rev 1162) @@ -84,12 +84,12 @@ </a> </div> - <!--FIXME sletellier 20110316 : visible on parameter dont work in this case....--> - <t:samplingFilterComponent t:id="filterComponent" - t:visibleOnStartup="false" - t:user="user" - t:serviceSampling="serviceSampling" - t:legendMsg="${message:wao.ui.misc.advancedSearch}"/> + <!--FIXME sletellier 20110316 : visible on parameter dont work in this case....--> + <t:samplingFilterComponent t:id="filterComponent" + t:visibleOnStartup="false" + t:user="user" + t:serviceSampling="serviceSampling" + t:legendMsg="${message:wao.ui.misc.advancedSearch}"/> </div> <t:zone t:id="samplingZone"> <table class="t-data-grid"> Modified: trunk/wao-ui/src/main/webapp/js/contactForm.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contactForm.js 2011-04-07 16:02:13 UTC (rev 1161) +++ trunk/wao-ui/src/main/webapp/js/contactForm.js 2011-04-07 16:13:16 UTC (rev 1162) @@ -47,7 +47,7 @@ } } -Event.observe(window, 'load', function(event) { - updateMammalsInfoBox($('mammalsCapture')); -}); +//Event.observe(window, 'load', function(event) { +// updateMammalsInfoBox($('mammalsCapture')); +//});