Author: fdesbois Date: 2010-01-17 13:58:46 +0000 (Sun, 17 Jan 2010) New Revision: 211 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java Log: Resolve issue on observer list in Contact + suppress abstract methods getFilterZone Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 13:58:46 UTC (rev 211) @@ -12,7 +12,6 @@ import fr.ifremer.suiviobsmer.services.ServiceUser; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Log; @@ -39,15 +38,17 @@ * <pre> * - BoatName uses an Autocomplete mixins : * <t:textfield t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete"/> - * - FacadeName uses the zoneUpdater mixins : - * <input t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> - * The zone_id is the one of the zone returned by {@link #getFilterZone() } * - SampleRow select value is sampleRowId : * <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> * - Company select value is companyId : * <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> - * - Observer select value is observerId and have a zoneUpdater mixins : - * <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> + * - Observer select value is observerId : + * <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> + * - Select change, use JavaScript : + * <script type="text/javascript"> + * Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); + * Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); + * </script> * </pre> * * @author fdesbois @@ -91,11 +92,13 @@ @Persist private SelectModel sectorSelectModel; + @Persist private GenericSelectModel<Company> companySelectModel; @Property private String companyId; + @Persist private GenericSelectModel<User> observerSelectModel; @Property @@ -127,6 +130,9 @@ getFilter().setCompany(user.getCompany()); } + observerSelectModel = null; + getObserverSelectModel(); + if (getFilter().getObserver() != null) { observerId = getFilter().getObserver().getTopiaId(); } @@ -188,16 +194,13 @@ if (observerSelectModel == null) { List<User> observers = new ArrayList<User>(); if (getFilter().getCompany() != null) { - if (log.isDebugEnabled()) { - log.debug("Company filter users : " + getFilter().getCompany()); - } observers = getFilter().getCompany().getUser(); } else if (user.getAdmin()) { - if (log.isDebugEnabled()) { - log.debug("BUSINESS REQUEST [getObservers]"); + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getObservers]"); } observers = serviceUser.getObservers(getAvailableDataForFiltersOnly()); - } + } observerSelectModel = new GenericSelectModel<User>(observers,User.class, "fullName","topiaId",propertyAccess); } @@ -208,10 +211,10 @@ protected abstract void resetFilter(); - protected abstract Zone getSampleRowFilterZone(); +// protected abstract Zone getSampleRowFilterZone(); +// +// protected abstract Zone getObserverFilterZone(); - protected abstract Zone getObserverFilterZone(); - protected abstract boolean getAvailableDataForFiltersOnly(); public String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException { Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 13:58:46 UTC (rev 211) @@ -161,17 +161,17 @@ contactFilter = null; } - @Override - protected Zone getSampleRowFilterZone() { - return filtersZone; - } +// @Override +// protected Zone getSampleRowFilterZone() { +// return filtersZone; +// } +// +// @Override +// protected Zone getObserverFilterZone() { +// return filtersZone; +// } @Override - protected Zone getObserverFilterZone() { - return filtersZone; - } - - @Override protected boolean getAvailableDataForFiltersOnly() { return true; } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-17 13:58:46 UTC (rev 211) @@ -116,17 +116,17 @@ dataSamplingFilter = null; } - @Override - protected Zone getSampleRowFilterZone() { - return sampleRowZone; - } +// @Override +// protected Zone getSampleRowFilterZone() { +// return sampleRowZone; +// } +// +// @Override +// protected Zone getObserverFilterZone() { +// return observerZone; +// } @Override - protected Zone getObserverFilterZone() { - return observerZone; - } - - @Override protected boolean getAvailableDataForFiltersOnly() { return false; }