Author: bleny Date: 2014-06-23 22:52:12 +0200 (Mon, 23 Jun 2014) New Revision: 2096 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2096 Log: fixes #5318 prevent negative effort in sample row form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.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/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:52:12 UTC (rev 2096) @@ -26,6 +26,7 @@ import com.google.common.base.Strings; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; @@ -125,6 +126,13 @@ addFieldError("updateSampleRowCommand.sampleRow.samplingStrategy", t("wao.ui.form.SampleRow.error.missingProfessionSpecies")); } + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { + if (sampleMonth.getExpectedTidesValue() < 0) { + addActionError(t("wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue", + formatMonth(sampleMonth.getPeriodDate()))); + } + } + } @Override 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=You must define the month when the observations ends wao.ui.form.SampleRow.error.missingProfessionSpecies=You must define the target species wao.ui.form.SampleRow.error.missingProgramName=You must provide the program name +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Effort for month %s must be positive wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=Il faut préciser le mois auquel se termine la période d'observation wao.ui.form.SampleRow.error.missingProfessionSpecies=Il faut préciser les espèces cibles wao.ui.form.SampleRow.error.missingProgramName=Il faut préciser le nom du programme +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Il faut donner un effort positif pour le mois %s wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.ui.form.SampleRow.missingBeginDate=Date de début manquante pour générer le code de la ligne \!