Author: bleny Date: 2014-06-05 16:15:10 +0200 (Thu, 05 Jun 2014) New Revision: 2004 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2004 Log: refs #4493 user different filter object in session for synthesis Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -54,6 +54,8 @@ protected ContactsFilter contactsFilter; + protected ContactsFilter synthesisFilter; + public Collection<String> getMessages() { if (messages == null) { messages = Lists.newLinkedList(); @@ -143,4 +145,12 @@ public void setContactsFilter(ContactsFilter contactsFilter) { this.contactsFilter = contactsFilter; } + + public void setSynthesisFilter(ContactsFilter synthesisFilter) { + this.synthesisFilter = synthesisFilter; + } + + public ContactsFilter getSynthesisFilter() { + return synthesisFilter; + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteContactAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -59,7 +59,7 @@ } @Override - public String execute() throws Exception { + public String execute() { Contact contact = service.getContact(contactId); String contactCode = contact.getMainObserver().getFullName(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -299,4 +299,5 @@ session.setContactToHighlightId(updateContactCommand.getContact().getTopiaId()); return SUCCESS; } + } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean boats filter from session getSession().setBoatsFilter(null); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean contacts filter from session getSession().setContactsFilter(null); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String execute() throws Exception { + public String execute() { // clean sampling plan filter from session getSession().setSampleRowsFilter(null); Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java (from rev 1985, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -0,0 +1,40 @@ +package fr.ifremer.wao.web.action.obsmer; + +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 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% + */ + +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "synthesis"})}) +public class ResetSynthesisFilterAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public String execute() { + + // clean sampling plan filter from session + getSession().setSynthesisFilter(null); + return SUCCESS; + } +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-05 14:15:10 UTC (rev 2004) @@ -28,7 +28,11 @@ @Override public void prepare() { - filter = service.newFilter(getAuthenticatedWaoUser()); + filter = getSession().getContactsFilter(); + if (filter == null) { + filter = service.newFilter(getAuthenticatedWaoUser()); + getSession().setSynthesisFilter(filter); + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -148,9 +148,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:submit action="reset-boats-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset" /> - </s:submit> + <s:url action="reset-boats-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-boats" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -207,9 +207,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> - </s:submit> + <s:url action="reset-contacts-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-contacts" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -137,9 +137,10 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> </s:submit> - <s:submit action="reset-sample-rows-filter" type="button" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> - </s:submit> + <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> + </s:a> <s:submit action="export-sampling-plan" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:52:12 UTC (rev 2003) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 14:15:10 UTC (rev 2004) @@ -174,9 +174,9 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-synthesis-filter" id="resetSynthesisFilterUrl" /> - <s:a href="%{resetSynthesisFilterUrl}" cssClass="btn"> - <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> + <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> + <s:a href="%{resetFilterUrl}" cssClass="btn"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:a> </div>