Author: sletellier Date: 2011-04-07 09:49:29 +0000 (Thu, 07 Apr 2011) New Revision: 1155 Log: Move filterManagers on filterComponents Removed: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/BoatFilterManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ContactFilterManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingFilterManager.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 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/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/BoatFilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/BoatFilterManager.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/BoatFilterManager.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,109 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.ui.base; - -import fr.ifremer.wao.bean.BoatFilter; -import fr.ifremer.wao.bean.BoatFilterValues; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.service.ServiceBoat; - -import java.util.List; - -/** - * @author sletellier <letellier at codelutin.com> - */ -public class BoatFilterManager extends FilterManager<BoatFilter> { - - protected ServiceBoat serviceBoat; - - /* - * Datas - */ - protected BoatFilterValues possibleValuesForFilter; - - protected SampleRow sampleRow; - - public BoatFilterManager(ConnectedUser user, - ServiceBoat serviceBoat) { - - super(user); - - this.serviceBoat = serviceBoat; - } - - @Override - protected boolean isAvailableDataForFiltersOnly() { - return false; - } - - @Override - public void resetFilter() { - sampleRow = null; - filter = serviceBoat.newBoatFilter(user); - } - - @Override - public void updateSearchFields() { - updatePossibleValuesForFilter(); - } - - public BoatFilterValues getPossibleValuesForFilter() { - return getPossibleValuesForFilter(false); - } - - public BoatFilterValues updatePossibleValuesForFilter() { - return getPossibleValuesForFilter(true); - } - - protected BoatFilterValues getPossibleValuesForFilter(boolean update) { - if (update || possibleValuesForFilter == null) { - possibleValuesForFilter = serviceBoat.getPossibleValuesForFilter(getFilter()); - } - return possibleValuesForFilter; - } - - public String[] getShipOwnerNamesContains(String input) { - List<String> results = serviceBoat.getShipOwnerNamesContains(input); - return results.toArray(new String[results.size()]); - } - - public String[] getBoatNamesStartWith(String input) { - List<String> results = serviceBoat.getBoatNamesStartWith(input); - return results.toArray(new String[results.size()]); - } - - public SampleRow getSampleRow() { - return sampleRow; - } - - public void setSampleRow(SampleRow sampleRow) { - getFilter().setSampleRow(sampleRow); - getFilter().setSampleRowExists(true); - } - - public boolean isSampleRowExists() { - return getFilter().isSampleRowExists(); - } -} Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ContactFilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ContactFilterManager.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ContactFilterManager.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,67 +0,0 @@ -package fr.ifremer.wao.ui.base; - -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ContactFilter; -import fr.ifremer.wao.bean.ContactFilterValues; -import fr.ifremer.wao.bean.ContactState; -import fr.ifremer.wao.service.ServiceContact; -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.ioc.Messages; -import org.apache.tapestry5.util.EnumSelectModel; - -import java.util.List; - -/** - * @author sletellier <letellier at codelutin.com> - */ -public class ContactFilterManager extends FilterManager<ContactFilter> { - - protected ServiceContact serviceContact; - - /* - * Datas - */ - protected ContactFilterValues possibleValuesForFilter; - - public ContactFilterManager(ConnectedUser user, ServiceContact serviceContact) { - super(user); - this.serviceContact = serviceContact; - } - - @Override - public void resetFilter() { - filter = serviceContact.newContactFilter(user); - } - - @Override - protected boolean isAvailableDataForFiltersOnly() { - return false; - } - - @Override - public void updateSearchFields() { - updatePossibleValuesForFilter(); - } - - public ContactFilterValues getPossibleValuesForFilter() { - return getPossibleValuesForFilter(false); - } - - public ContactFilterValues updatePossibleValuesForFilter() { - return getPossibleValuesForFilter(true); - } - - protected ContactFilterValues getPossibleValuesForFilter(boolean update) { - if (update || possibleValuesForFilter == null) { - possibleValuesForFilter = serviceContact.getPossibleValuesForFilter(getFilter()); - } - return possibleValuesForFilter; - } - - public SelectModel getContactStateSelectModel(Messages messages) { - List<ContactState> allowedStates = ContactState.getAllowedStates(user.getProfile().getObsProgram()); - return new EnumSelectModel(ContactState.class, messages, - // just convert list to array - allowedStates.toArray(new ContactState[allowedStates.size()])); - } -} Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,76 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.ui.base; - -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.SamplingFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author sletellier <letellier at codelutin.com> - */ -public abstract class FilterManager<E extends SamplingFilter> { - - /** - * Logger. - */ - private static final Logger log = LoggerFactory.getLogger(FilterManager.class); - - protected ConnectedUser user; - - protected E filter; - - public FilterManager(ConnectedUser user) { - this.user = user; - } - - public ConnectedUser getUser() { - return user; - } - - public E getFilter() { - if (filter == null) { - resetFilter(); - } - return filter; - } - - /** - * Method to initialize filter, is call on constructor - */ - public abstract void resetFilter(); - - /** - * Used to show only active company and observers. - * - * @return true if only active users will be showed, false otherwise - */ - protected abstract boolean isAvailableDataForFiltersOnly(); - - /** - * Used to update search fields - */ - public abstract void updateSearchFields(); -} Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingFilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingFilterManager.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingFilterManager.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,90 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.ui.base; - -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.SamplingFilterValues; -import fr.ifremer.wao.service.ServiceSampling; -import org.nuiton.util.PeriodDates; - -/** - * @author sletellier <letellier at codelutin.com> - */ -public class SamplingFilterManager extends FilterManager<SamplingFilter> { - - /* - * Services - */ - protected ServiceSampling serviceSampling; - - /* - * Datas - */ - protected SamplingFilterValues possibleValuesForFilter; - - public SamplingFilterManager(ConnectedUser user, - ServiceSampling serviceSampling) { - - super(user); - - this.serviceSampling = serviceSampling; - } - - @Override - protected boolean isAvailableDataForFiltersOnly() { - return false; - } - - @Override - public void resetFilter() { - // Don't reset period in filters - PeriodDates period = (filter == null ? null : filter.getPeriod()); - filter = serviceSampling.newSamplingFilter(user); - - if (period != null) { - filter.setPeriod(period); - } - } - - @Override - public void updateSearchFields() { - updatePossibleValuesForFilter(); - } - - public SamplingFilterValues getPossibleValuesForFilter() { - return getPossibleValuesForFilter(false); - } - - public SamplingFilterValues updatePossibleValuesForFilter() { - return getPossibleValuesForFilter(true); - } - - protected SamplingFilterValues getPossibleValuesForFilter(boolean update) { - if (update || possibleValuesForFilter == null) { - possibleValuesForFilter = serviceSampling.getPossibleValuesForFilter(getFilter()); - } - return possibleValuesForFilter; - } -} Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -2,37 +2,99 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoatFilter; -import fr.ifremer.wao.bean.SamplingFilterValues; -import fr.ifremer.wao.ui.base.BoatFilterManager; +import fr.ifremer.wao.bean.BoatFilterValues; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.service.ServiceBoat; import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Persist; +import java.util.List; + /** * @author sletellier <letellier at codelutin.com> */ -public class BoatFilterComponent extends FilterComponent<BoatFilter, BoatFilterManager> { +public class BoatFilterComponent extends FilterComponent<BoatFilter> { @InjectComponent private FeedBack filterFeedback; - public SamplingFilterValues getPossibleValuesForFilter() { + @Parameter(required = true) + private ServiceBoat serviceBoat; + /* + * Datas + */ + @Persist + private BoatFilterValues possibleValuesForFilter; + + @Persist + private SampleRow sampleRow; + + @Override + protected boolean isAvailableDataForFiltersOnly() { + return false; + } + + @Override + public void resetFilter() { + sampleRow = null; + setFilter(serviceBoat.newBoatFilter(getUser())); + } + + @Override + public void updateSearchFields() { + updatePossibleValuesForFilter(); + } + + public BoatFilterValues getPossibleValuesForFilter() { // Manage sampleRow from context - if (getFilterManager().isSampleRowExists()) { - filterFeedback.addInfo("Vous êtes en cours de sélection d'un navire pour la ligne du plan " + getFilterManager().getSampleRow().getCode()); + if (isSampleRowExists()) { + filterFeedback.addInfo("Vous êtes en cours de sélection d'un navire pour la ligne du plan " + getSampleRow().getCode()); } - return getFilterManager().getPossibleValuesForFilter(); + return getPossibleValuesForFilter(false); } + public BoatFilterValues updatePossibleValuesForFilter() { + return getPossibleValuesForFilter(true); + } + + protected BoatFilterValues getPossibleValuesForFilter(boolean update) { + if (update || possibleValuesForFilter == null) { + possibleValuesForFilter = serviceBoat.getPossibleValuesForFilter(getFilter()); + } + return possibleValuesForFilter; + } + + public String[] getShipOwnerNamesContains(String input) { + List<String> results = serviceBoat.getShipOwnerNamesContains(input); + return results.toArray(new String[results.size()]); + } + + public String[] getBoatNamesStartWith(String input) { + List<String> results = serviceBoat.getBoatNamesStartWith(input); + return results.toArray(new String[results.size()]); + } + + public SampleRow getSampleRow() { + return sampleRow; + } + + public void setSampleRow(SampleRow sampleRow) { + getFilter().setSampleRow(sampleRow); + getFilter().setSampleRowExists(true); + } + public String[] onProvideCompletionsFromShipOwnerName(String input) { - return getFilterManager().getShipOwnerNamesContains(input); + return getShipOwnerNamesContains(input); } public String[] onProvideCompletionsFromBoatName(String input) throws WaoException { - return getFilterManager().getBoatNamesStartWith(input); + return getBoatNamesStartWith(input); } public boolean isSampleRowExists() { - return getFilterManager().isSampleRowExists(); + return getFilter().isSampleRowExists(); } } 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 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,31 +1,73 @@ package fr.ifremer.wao.ui.components; -import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactFilterValues; -import fr.ifremer.wao.ui.base.ContactFilterManager; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.service.ServiceContact; import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.util.EnumSelectModel; +import java.util.List; + /** * @author sletellier <letellier at codelutin.com> */ -public class ContactFilterComponent extends FilterComponent<ContactFilter, ContactFilterManager> { +public class ContactFilterComponent extends FilterComponent<ContactFilter> { @Inject private Messages messages; - public ConnectedUser getUser() { - return getFilterManager().getUser(); + @Parameter(required = true) + private ServiceContact serviceContact; + + /* + * Datas + */ + @Persist + private ContactFilterValues possibleValuesForFilter; + + @Override + public void resetFilter() { + setFilter(serviceContact.newContactFilter(getUser())); } + @Override + protected boolean isAvailableDataForFiltersOnly() { + return false; + } + + @Override + public void updateSearchFields() { + updatePossibleValuesForFilter(); + } + public ContactFilterValues getPossibleValuesForFilter() { + return getPossibleValuesForFilter(false); + } - return getFilterManager().getPossibleValuesForFilter(); + public ContactFilterValues updatePossibleValuesForFilter() { + return getPossibleValuesForFilter(true); } + protected ContactFilterValues getPossibleValuesForFilter(boolean update) { + if (update || possibleValuesForFilter == null) { + possibleValuesForFilter = serviceContact.getPossibleValuesForFilter(getFilter()); + } + return possibleValuesForFilter; + } + public SelectModel getContactStateSelectModel() { - return getFilterManager().getContactStateSelectModel(messages); + return getContactStateSelectModel(messages); } + + public SelectModel getContactStateSelectModel(Messages messages) { + List<ContactState> allowedStates = ContactState.getAllowedStates(getUser().getProfile().getObsProgram()); + return new EnumSelectModel(ContactState.class, messages, + // just convert list to array + allowedStates.toArray(new ContactState[allowedStates.size()])); + } } 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 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -1,7 +1,7 @@ package fr.ifremer.wao.ui.components; +import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.ui.base.FilterManager; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Parameter; @@ -16,7 +16,7 @@ /** * @author sletellier <letellier at codelutin.com> */ -public abstract class FilterComponent<E extends SamplingFilter, F extends FilterManager<E>> { +public abstract class FilterComponent<E extends SamplingFilter> { @Inject private Logger log; @@ -25,8 +25,43 @@ private ComponentResources resources; @Parameter(required = true) - private F filterManager; + private ConnectedUser user; + @Persist + private E filter; + + public ConnectedUser getUser() { + return user; + } + + public E getFilter() { + if (filter == null) { + resetFilter(); + } + return filter; + } + + public void setFilter(E filter) { + this.filter = filter; + } + + /** + * Method to initialize filter, is call on constructor + */ + public abstract void resetFilter(); + + /** + * Used to show only active company and observers. + * + * @return true if only active users will be showed, false otherwise + */ + protected abstract boolean isAvailableDataForFiltersOnly(); + + /** + * Used to update search fields + */ + public abstract void updateSearchFields(); + @Parameter(required = false) private Boolean visibleOnStartup; @@ -67,18 +102,6 @@ return filtersZone; } - public E getFilter() { - return filterManager.getFilter(); - } - - public F getFilterManager() { - return filterManager; - } - - public void setFilterManager(F filterManager) { - this.filterManager = filterManager; - } - public DateFormat getDateFormat() { return new SimpleDateFormat("MM/yyyy"); } @@ -107,11 +130,11 @@ public Object onSuccessFromFiltersForm() { if (isReset()) { - getFilterManager().resetFilter(); + resetFilter(); } // Limite search panel - getFilterManager().updateSearchFields(); + updateSearchFields(); if (isRefresh()) { // Refresh search panel 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 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -25,13 +25,15 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterValues; -import fr.ifremer.wao.ui.base.SamplingFilterManager; +import fr.ifremer.wao.service.ServiceSampling; import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Persist; +import org.nuiton.util.PeriodDates; /** * @author sletellier <letellier at codelutin.com> */ -public class SamplingFilterComponent extends FilterComponent<SamplingFilter, SamplingFilterManager> { +public class SamplingFilterComponent extends FilterComponent<SamplingFilter> { @Parameter(required = false) private Boolean showEstimatedTides; @@ -39,6 +41,63 @@ @Parameter(required = true) private String legendMsg; + /* + * Services + */ + @Parameter(required = true) + private ServiceSampling serviceSampling; + + /* + * Datas + */ + @Persist + private SamplingFilterValues possibleValuesForFilter; + + @Persist + private boolean initFlag; + + @Override + protected boolean isAvailableDataForFiltersOnly() { + return false; + } + + @Override + public void resetFilter() { + // Don't reset period in filters + PeriodDates period = null; + if (initFlag) { + SamplingFilter filter = getFilter(); + period = (filter == null ? null : filter.getPeriod()); + } else { + initFlag = true; + } + setFilter(serviceSampling.newSamplingFilter(getUser())); + + if (period != null) { + getFilter().setPeriod(period); + } + } + + @Override + public void updateSearchFields() { + updatePossibleValuesForFilter(); + } + + public SamplingFilterValues getPossibleValuesForFilter() { + return getPossibleValuesForFilter(false); + } + + public SamplingFilterValues updatePossibleValuesForFilter() { + return getPossibleValuesForFilter(true); + } + + protected SamplingFilterValues getPossibleValuesForFilter(boolean update) { + if (update || possibleValuesForFilter == null) { + possibleValuesForFilter = serviceSampling.getPossibleValuesForFilter(getFilter()); + } + return possibleValuesForFilter; + } + // False by default public Boolean getShowEstimatedTides() { if (showEstimatedTides == null) { @@ -47,10 +106,6 @@ return showEstimatedTides; } - public SamplingFilterValues getPossibleValuesForFilter() { - return getFilterManager().getPossibleValuesForFilter(); - } - public String getLegendMsg() { return legendMsg; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -41,19 +41,14 @@ import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; -import fr.ifremer.wao.ui.base.BoatFilterManager; import fr.ifremer.wao.ui.components.BoatFilterComponent; import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.BoatDataSource; import fr.ifremer.wao.ui.data.ExportStreamResponse; -import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.Block; -import org.apache.tapestry5.Link; -import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; @@ -63,10 +58,8 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; -import org.apache.tapestry5.services.PageRenderLinkSource; import org.slf4j.Logger; import java.io.IOException; @@ -115,6 +108,10 @@ @Inject private PropertyAccess propertyAccess; + public ServiceBoat getServiceBoat() { + return serviceBoat; + } + void setupRender() throws WaoException { // if (boatSelectedImmatriculation != null && getBoatSelected() == null) { @@ -181,21 +178,6 @@ @Persist private Integer boatSelectedImmatriculation; - @Persist - private BoatFilterManager filterManager; - - public BoatFilterManager getFilterManager() { - if (filterManager == null) { - filterManager = new BoatFilterManager(user, serviceBoat); - } - return filterManager; - } - - public void setFilterManager(BoatFilterManager filterManager) { - this.filterManager = filterManager; - } - - /** Filters to apply on boats list */ // @Persist // private BoatFilter boatFilter; @@ -230,7 +212,7 @@ } public BoatFilter getBoatFilter() throws WaoException { - return filterManager.getFilter(); + return filterComponent.getFilter(); } // @Override @@ -392,7 +374,7 @@ } public boolean canCreateNewContactFromList() throws WaoException { - if (!user.isAdmin() && !user.isProfessional() && !user.isReadOnly() && getFilterManager().isSampleRowExists()) { + if (!user.isAdmin() && !user.isProfessional() && !user.isReadOnly() && filterComponent.isSampleRowExists()) { return boat.canCreateContact(user.getProfile().getObsProgram(), user.getCompany()); } return false; @@ -706,7 +688,7 @@ Object onActionFromAddNewContactFromBoat(int boatImmatriculation) throws WaoException { // Get selected sampleRow - SampleRow sampleRow = getFilterManager().getSampleRow(); + SampleRow sampleRow = filterComponent.getSampleRow(); // Get boat from list boat = getBoats().get(boatImmatriculation); //contacts.createNewContact(boat, sampleRow); @@ -720,7 +702,7 @@ ElligibleBoat elligible = getCompanyBoatInfos().getElligibleBoat(sampleRowCode); SampleRow sampleRow = elligible.getSampleRow(); // Keep it in manager - getFilterManager().setSampleRow(sampleRow); + filterComponent.setSampleRow(sampleRow); Contact newContact = serviceContact.getNewContact(user, sampleRow, getBoatSelected()); // contacts.createNewContact(getBoatSelected(), sampleRow); contacts.setContactSelectedId(newContact.getTopiaId()); 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 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -38,7 +38,7 @@ import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceUser; -import fr.ifremer.wao.ui.base.ContactFilterManager; +import fr.ifremer.wao.ui.components.ContactFilterComponent; import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ContactDataSource; import fr.ifremer.wao.ui.data.ExportStreamResponse; @@ -108,20 +108,13 @@ @Inject private Messages messages; - @Persist - private ContactFilterManager filterManager; + @InjectComponent + private ContactFilterComponent filterComponent; - public ContactFilterManager getFilterManager() { - if (filterManager == null) { - filterManager = new ContactFilterManager(user, serviceContact); - } - return filterManager; + public ServiceContact getServiceContact() { + return serviceContact; } - public void setFilterManager(ContactFilterManager filterManager) { - this.filterManager = filterManager; - } - public String getLabelForEnum(Enum value) { return messages.get(value.getDeclaringClass().getSimpleName() + "." + value.name()); } @@ -157,7 +150,7 @@ private ContactState stateFilter; public ContactFilter getContactFilter() throws WaoException { - return getFilterManager().getFilter(); + return filterComponent.getFilter(); } public boolean isFiltersVisible() { 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-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -30,7 +30,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.service.ServiceSampling; -import fr.ifremer.wao.ui.base.SamplingFilterManager; +import fr.ifremer.wao.ui.components.SamplingFilterComponent; import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.ImportEngine; import fr.ifremer.wao.ui.data.RequiresAuthentication; @@ -85,9 +85,16 @@ @InjectComponent private Zone importExportZone; + @InjectComponent + private SamplingFilterComponent filterComponent; + + public ServiceSampling getServiceSampling() { + return serviceSampling; + } + public boolean getShowFilters() { if (showFilters == null) { - showFilters = getFilterManager().getFilter().isPeriodFilteredOnly(); + showFilters = filterComponent.getFilter().isPeriodFilteredOnly(); } return showFilters; } @@ -109,19 +116,6 @@ return importExportZone; } - - /********* FILTERS ********/ - - @Persist - private SamplingFilterManager filterManager; - - public SamplingFilterManager getFilterManager() { - if (filterManager == null) { - filterManager = new SamplingFilterManager(connectedUser, serviceSampling); - } - return filterManager; - } - /********* GRID ********/ private GridDataSource sampleRows; @@ -131,7 +125,7 @@ public GridDataSource getSampleRows() { if (sampleRows == null) { - sampleRows = new SampleRowDataSource(getFilterManager().getFilter(), serviceSampling); + sampleRows = new SampleRowDataSource(filterComponent.getFilter(), serviceSampling); } return sampleRows; } @@ -172,7 +166,7 @@ public InputStream getStream() throws IOException { InputStream csv = null; try { - csv = serviceSampling.exportSamplingPlanCsv(connectedUser, getFilterManager().getFilter()); + csv = serviceSampling.exportSamplingPlanCsv(connectedUser, filterComponent.getFilter()); } catch (WaoException eee) { throw new IOException(eee); } 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 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -35,7 +35,6 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceSampling; -import fr.ifremer.wao.ui.base.SamplingFilterManager; import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.components.SamplingFilterComponent; import fr.ifremer.wao.ui.data.ExportStreamResponse; @@ -99,9 +98,6 @@ @Property private ConnectedUser user; - @Persist - private SamplingFilterManager filterManager; - private long nbTidesExpectedTime; private long nbTidesRealTime; @@ -110,17 +106,10 @@ private long totalTidesRealTime; - public SamplingFilterManager getFilterManager() { - if (filterManager == null) { - filterManager = new SamplingFilterManager(user, serviceSampling); - } - return filterManager; + public ServiceSampling getServiceSampling() { + return serviceSampling; } - public void setFilterManager(SamplingFilterManager filterManager) { - this.filterManager = filterManager; - } - /** * Page initialization */ @@ -172,7 +161,7 @@ } public SamplingFilter getFilter() { - return getFilterManager().getFilter(); + return filterComponent.getFilter(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-04-07 09:49:29 UTC (rev 1155) @@ -42,7 +42,6 @@ import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceSynthesis; -import fr.ifremer.wao.ui.base.SamplingFilterManager; import fr.ifremer.wao.ui.components.SamplingFilterComponent; import fr.ifremer.wao.ui.data.ChartUtils; import fr.ifremer.wao.ui.data.ChartUtils.ChartType; @@ -131,20 +130,10 @@ @Inject private Messages messages; - @Persist - private SamplingFilterManager filterManager; - - public SamplingFilterManager getFilterManager() { - if (filterManager == null) { - filterManager = new SamplingFilterManager(user, serviceSampling); - } - return filterManager; + public ServiceSampling getServiceSampling() { + return serviceSampling; } - public void setFilterManager(SamplingFilterManager filterManager) { - this.filterManager = filterManager; - } - void setupRender() { // add a special CSS to make global synthesis page printable without // menu, filters, etc. @@ -273,7 +262,7 @@ /********************* FILTERS ********************************************/ public SamplingFilter getFilter() throws WaoException { - return getFilterManager().getFilter(); + return filterComponent.getFilter(); } public PeriodDates getPeriod() throws WaoException { Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -47,7 +47,7 @@ <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:format="MM/yyyy" t:validate="required"/>  </div> - <t:if test="filterManager.user.obsDeb"> + <t:if test="user.obsDeb"> <!-- filter fields only for obsdeb--> <div> <label for="observationUnit">${message:wao.ui.field.SampleRow.observationUnit}</label> @@ -68,7 +68,7 @@ <p:else> <!-- filter field for ObsMer and ObsVente --> <div> - <t:if t:test="filterManager.user.admin"> + <t:if t:test="user.admin"> <label for="company">${message:wao.ui.entity.Company} :</label> <t:topiaEntitySelector t:id="company" t:clazzName="Company" @@ -91,7 +91,7 @@ <t:simpleSelector t:id="sectorName" t:values="possibleValuesForFilter.sectorsNamesAsList" t:selectedValue="filter.sectorName"/>  - <t:if test="filterManager.user.obsVente"> + <t:if test="user.obsVente"> <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> <t:topiaEntitySelector t:id="terrestrialDistrict" t:clazzName="TerrestrialLocation" @@ -113,7 +113,7 @@ t:labelPropertyName="fullDescription" t:values="possibleValuesForFilter.targetSpeciesDCFCodesAsList" t:selectedValue="filter.targetSpeciesDCF"/>  - <t:if test="filterManager.user.obsVente"> + <t:if test="user.obsVente"> <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> </t:if> Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -44,7 +44,8 @@ </a> </div--> <t:boatFilterComponent t:id="filterComponent" - t:filterManager="filterManager"/> + t:user="user" + t:serviceBoat="serviceBoat"/> </fieldset> </div> <!--t:filters t:title="Filtres de recherche" t:mainId="so-boats-filters"--> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -59,7 +59,8 @@ </div> <t:contactFilterComponent t:id="filterComponent" - t:filterManager="filterManager"/> + t:user="user" + t:serviceContact="serviceContact"/> <!-- FILTRES --> <!--div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters"> <fieldset> Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -41,7 +41,8 @@ <t:zone t:id="filtersZone" t:visible="showFilters"> <t:samplingFilterComponent t:id="samplingFilter" t:visibleOnStartup="true" - t:filterManager="filterManager" + t:user="connectedUser" + t:serviceSampling="serviceSampling" t:legendMsg="${message:wao.ui.misc.advancedSearch}" /> </t:zone> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -87,7 +87,8 @@ <!--FIXME sletellier 20110316 : visible on parameter dont work in this case....--> <t:samplingFilterComponent t:id="filterComponent" t:visibleOnStartup="false" - t:filterManager="filterManager" + t:user="user" + t:serviceSampling="serviceSampling" t:legendMsg="${message:wao.ui.misc.advancedSearch}"/> </div> <t:zone t:id="samplingZone"> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-07 08:43:40 UTC (rev 1154) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-07 09:49:29 UTC (rev 1155) @@ -104,7 +104,8 @@ <t:samplingFilterComponent t:id="filterComponent" - t:filterManager="filterManager" + t:user="user" + t:serviceSampling="serviceSampling" t:showEstimatedTides="true" t:legendMsg="${message:wao.ui.filters.filters}"/>