Author: bleny Date: 2014-06-17 15:29:17 +0200 (Tue, 17 Jun 2014) New Revision: 2050 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2050 Log: fixes #5252 review filter reseting Removed: 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/ResetSynthesisFilterAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.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/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -120,13 +120,11 @@ @Override public void prepare() { - filter = getSession().getBoatsFilter(); if (filter == null) { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); getSession().setBoatsFilter(filter); } - if (StringUtils.isNotBlank(startBoatSelectionForSampleRowId)) { session.setStartBoatSelectionForSampleRowId(startBoatSelectionForSampleRowId); @@ -148,6 +146,23 @@ @Override public String execute() { + filter = getSession().getBoatsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newBoatsFilter(getAuthenticatedWaoUser()); + getSession().setBoatsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { + PaginationParameter pager = service.newBoatsPaginationParameter(pageNumber, 25); boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, pager); @@ -155,6 +170,7 @@ lastRangePage = getPaginationLastPage(boatList.getBoats(), 10, firstRangePage); return SUCCESS; + } public SampleRow getStartBoatSelectionForSampleRow() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -108,7 +108,6 @@ @Override public void prepare() { - filter = getSession().getContactsFilter(); if (filter == null) { filter = service.newContactFilter(getAuthenticatedWaoUser()); getSession().setContactsFilter(filter); @@ -119,6 +118,22 @@ @Override public String execute() { + filter = getSession().getContactsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newContactFilter(getAuthenticatedWaoUser()); + getSession().setContactsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { PaginationParameter pager = service.newContactsPaginationParameter(pageNumber, 25); contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, pager); Deleted: 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -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; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit@codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "boats"})}) -public class ResetBoatsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean boats filter from session - getSession().setBoatsFilter(null); - return SUCCESS; - } -} Deleted: 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -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; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit@codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "contacts"})}) -public class ResetContactsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean contacts filter from session - getSession().setContactsFilter(null); - return SUCCESS; - } -} Deleted: 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -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; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit@codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "sampling-plan"})}) -public class ResetSampleRowsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean sampling plan filter from session - getSession().setSampleRowsFilter(null); - return SUCCESS; - } -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,40 +0,0 @@ -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/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -56,9 +56,7 @@ @Override public void prepare() { - filter = getSession().getSampleRowsFilter(); if (filter == null) { - filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); getSession().setSampleRowsFilter(filter); } @@ -68,9 +66,28 @@ @Override public String execute() { + filter = getSession().getSampleRowsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); + + getSession().setSampleRowsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { + samplingPlan = service.getSamplingPlan(getAuthenticatedWaoUser(), filter); return SUCCESS; + } public ObsMerSamplingPlan getSamplingPlan() { 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -28,7 +28,6 @@ @Override public void prepare() { - filter = getSession().getSynthesisFilter(); if (filter == null) { filter = service.newFilter(getAuthenticatedWaoUser()); getSession().setSynthesisFilter(filter); @@ -39,10 +38,25 @@ @Override public String execute() { + filter = getSession().getSynthesisFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newFilter(getAuthenticatedWaoUser()); + getSession().setSynthesisFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { synthesis = service.getObsMerSynthesis(filter); return SUCCESS; - } public ObsMerSynthesis getSynthesis() { 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -147,14 +147,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="boats!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-boats-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="boats!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -216,14 +216,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="contacts!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-contacts-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="contacts!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <s:if test="authenticatedWaoUser.authorizedToExportContacts"> <s:submit action="export-contacts" type="button" cssClass="btn"> 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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -133,14 +133,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="sampling-plan!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> </s:submit> - <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="sampling-plan!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <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-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -151,14 +151,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="synthesis!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-synthesis-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="synthesis!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> </div>