Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e8122185 by Tony CHEMIT at 2018-10-07T17:31:24Z [LL] Echantillons consignés au niveau marée : Petits ajustements - Closes #1134 - - - - - 20 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml - + validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml - + validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler; +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.data.longline.SampleLogbookDto; @@ -57,7 +57,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - dev@tchemit.fr * @since 3.7 */ -public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> { +public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> { private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class); private final PropertyChangeListener speciesChanged; @@ -76,7 +76,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook())); } else { ui.setContextValue(new SamplePartLogbookUIModel(ui)); - } } @@ -202,16 +201,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb } - @Override - public void doPersist(SampleLogbookDto bean) { - // fait par le doSave de LonglineGlobalCompositionLogbookUIHandler - } - - @Override - protected void loadEditBean(String beanId) { - // fait par le parent - } - private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { Optional<SizeMeasureTypeReference> result = Optional.empty(); if (species != null) { ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -91,7 +91,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -108,7 +108,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -122,7 +122,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -76,7 +76,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -93,7 +93,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -107,7 +107,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -92,7 +92,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -109,7 +109,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -123,7 +123,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -77,7 +77,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -94,7 +94,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -108,7 +108,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -35,8 +35,11 @@ <field name="quadrant"> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> + </param> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -51,9 +54,11 @@ <field name="latitude"> - <!-- latitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> + </param> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -65,9 +70,12 @@ <field name="longitude"> - <!-- longitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> + </param> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -76,6 +84,7 @@ </field-validator> </field> + <field name="comment"> <!-- comentaire de moins de 1024 caractères --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-warning-validation.xml ===================================== @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="timeStamp"> + + <!-- pas de date selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.sampleLogbook.required.date</message> + </field-validator> + + </field> + + <field name="quadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.quadrant</message> + </field-validator> + + </field> + + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.latitude</message> + </field-validator> + + </field> + + <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.longitude</message> + </field-validator> + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength" short-circuit="true"> + <param name="maxLength">1024</param> + <message>observe.validation.catchLongline.comment.tobig</message> + </field-validator> + + </field> + +</validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -33,11 +33,13 @@ </field> - <field name="quadrant"> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> + </param> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -52,9 +54,11 @@ <field name="latitude"> - <!-- latitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> + </param> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -66,9 +70,12 @@ <field name="longitude"> - <!-- longitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> + </param> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -77,6 +84,7 @@ </field-validator> </field> + <field name="comment"> <!-- comentaire de moins de 1024 caractères --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-warning-validation.xml ===================================== @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="timeStamp"> + + <!-- pas de date selectionne --> + <field-validator type="required" short-circuit="true"> + <message>observe.validation.sampleLogbook.required.date</message> + </field-validator> + + </field> + + <field name="quadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.quadrant</message> + </field-validator> + + </field> + + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.latitude</message> + </field-validator> + + </field> + + <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.longitude</message> + </field-validator> + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength" short-circuit="true"> + <param name="maxLength">1024</param> + <message>observe.validation.catchLongline.comment.tobig</message> + </field-validator> + + </field> + +</validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -201,7 +201,7 @@ <field name="settingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -248,7 +248,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -299,7 +299,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -350,7 +350,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -48,7 +48,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -81,7 +81,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -114,7 +114,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -232,7 +232,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -283,7 +283,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -334,7 +334,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -48,7 +48,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -81,7 +81,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -114,7 +114,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -210,7 +210,7 @@ <field name="settingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -254,7 +254,7 @@ <field name="settingEndQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -298,7 +298,7 @@ <field name="haulingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -342,7 +342,7 @@ <field name="haulingEndQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -239,7 +239,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -283,7 +283,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -328,7 +328,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -373,7 +373,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -172,7 +172,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -189,7 +189,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -203,7 +203,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -30,7 +30,7 @@ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> <!-- coherence quadrant par rapport a l'ocean de la maree --> @@ -47,7 +47,7 @@ <!-- latitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -61,7 +61,7 @@ <!-- longitude obligatoire --> <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=A comment is re observe.validation.activity.required.comment.for.reasonForNoFishing=A comment is required for the selected reason for no fishing mode. observe.validation.activity.required.comment.for.vesselActivity=A comment is required for the selected vessel activity mode. observe.validation.activity.required.date=Observation date must be filled. -observe.validation.activity.required.latitude=Latitude must be filled. -observe.validation.activity.required.longitude=Longitude must be filled. observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s -observe.validation.activity.required.quadrant=quadrant must be filled. observe.validation.activity.required.time=Time must be filled. observe.validation.activity.required.vesselActivity=must be filled. observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=English label is not translat observe.validation.referentiel.untranslated.label3=Spanish label is not translated. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. +observe.validation.required.latitude=Latitude must be filled. +observe.validation.required.longitude=Longitude must be filled. +observe.validation.required.quadrant=Quadrant is mandatory. observe.validation.required.species=Species is not filled. observe.validation.route.activityFinDeVeille.notAvailable=There is already an end watch activity on trip. observe.validation.route.comment.tobig=Comment size can not exceed 1024 characters. @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp must be fi observe.validation.setLongline.required.haulingStartLatitude=Latitude must be filled. observe.validation.setLongline.required.haulingStartLongitude=Longitude must be filled. observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp must be filled. -observe.validation.setLongline.required.quadrant=Quadrant is mandatory. observe.validation.setLongline.required.settingEndLatitude=Latitude must be filled. observe.validation.setLongline.required.settingEndLongitude=Longitude must be filled. observe.validation.setLongline.required.settingEndTimeStamp=Timestamp must be filled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -474,10 +474,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Se necesita un observe.validation.activity.required.comment.for.reasonForNoFishing=Se necesita un comentario para la causa de no lance. observe.validation.activity.required.comment.for.vesselActivity=Se necesita un comentario para la actividad del barco. observe.validation.activity.required.date=La fecha de observación de la actividad es mandatoria. -observe.validation.activity.required.latitude=La latitud debe ser introducida -observe.validation.activity.required.longitude=La longitud debe ser introducida observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s \#TODO -observe.validation.activity.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.activity.required.time=La hora de observación para la actividad es mandatoria. observe.validation.activity.required.vesselActivity=Se debe seleccionar la actividad del barco. observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. @@ -706,6 +703,9 @@ observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. +observe.validation.required.latitude=La latitud debe ser introducida +observe.validation.required.longitude=La longitud debe ser introducida +observe.validation.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.required.species=Species is not filled. observe.validation.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta. observe.validation.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. @@ -796,7 +796,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp de fin de observe.validation.setLongline.required.haulingStartLatitude=Latitud de inicio de arrastre vacía. observe.validation.setLongline.required.haulingStartLongitude=Longitud de inicio de arrastre vacía. observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp de inicio de arrastre vacío. -observe.validation.setLongline.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.setLongline.required.settingEndLatitude=Latitud de fin de calada vacíoe. observe.validation.setLongline.required.settingEndLongitude=longitud de fin de calada vacía. observe.validation.setLongline.required.settingEndTimeStamp=Timestamp de fin de calada vacío. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Un commentaire observe.validation.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non pêche sélectionnée. observe.validation.activity.required.comment.for.vesselActivity=Un commentaire est requis pour le type d'activité sélectionné. observe.validation.activity.required.date=La date d'observation de l'activité est obligatoire. -observe.validation.activity.required.latitude=La latitude doit être renseignée. -observe.validation.activity.required.longitude=La longitude doit être renseignée. observe.validation.activity.required.observedSystem.for.nonTargetCatch=Certains systèmes observés parmis les suivants sont obligatoires en regard des captures de faunes accessoires \: %s -observe.validation.activity.required.quadrant=Le quadrant doit être sélectionné. observe.validation.activity.required.time=L'heure d'observation de l'activité est obligatoire. observe.validation.activity.required.vesselActivity=L'activité du navire est obligatoire. observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. observe.validation.required.compagnies=La compagnie n'est pas renseignée. observe.validation.required.harbour=Le port n'est pas renseigné. +observe.validation.required.latitude=La latitude doit être renseignée. +observe.validation.required.longitude=La longitude doit être renseignée. +observe.validation.required.quadrant=Le quadrant est obligatoire. observe.validation.required.species=L'espèce n'est pas renseigné. observe.validation.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route observe.validation.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères. @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Horodatage de fin de observe.validation.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée. observe.validation.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée. observe.validation.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné. -observe.validation.setLongline.required.quadrant=Le quadrant est obligatoire. observe.validation.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée. observe.validation.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée. observe.validation.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e812218542acc19f7ff060b9af72... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e812218542acc19f7ff060b9af72... You're receiving this email because of your account on gitlab.com.