Author: bleny Date: 2014-06-30 11:07:09 +0200 (Mon, 30 Jun 2014) New Revision: 2111 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2111 Log: fixes #5349 add validation on filter#periodTo ?\226?\137?\165 filter#periodFrom Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -29,6 +29,7 @@ import fr.ifremer.wao.services.service.SamplingPlanService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import java.text.SimpleDateFormat; import java.util.Date; @@ -64,6 +65,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -35,6 +35,7 @@ import fr.ifremer.wao.services.service.ObsMerContactsList; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -116,6 +117,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getContactsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -6,6 +6,7 @@ import fr.ifremer.wao.services.service.Synthesis; import fr.ifremer.wao.services.service.SynthesisService; import fr.ifremer.wao.web.WaoJspActionSupport; +import org.nuiton.i18n.I18n; public class SynthesisAction extends WaoJspActionSupport implements Preparable { @@ -36,6 +37,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Companies wao.ui.page.waoUsers.title=Users wao.ui.page.waoUsers.titleForCompany=Users for company %s +wao.ui.periodToMustBeAfterPeriodFrom=The end of the period must be after the beginning wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Sociétés wao.ui.page.waoUsers.title=Utilisateurs wao.ui.page.waoUsers.titleForCompany=Utilisateurs de la société %s +wao.ui.periodToMustBeAfterPeriodFrom=La période de temps doit se terminer après avoir commencé wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ?