October 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après…
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9cfd1b6f by Tony CHEMIT at 2018-10-14T08:02:22Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 64264463 by Tony CHEMIT at 2018-10-14T08:10:52Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss ===================================== @@ -46,13 +46,11 @@ #resetWell { toolTipText:"observe.common.DataDto.action.reset.well.tip"; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _resetTablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } #well { text:{getStringValue(tableEditBean.getWell())}; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _tablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java ===================================== @@ -52,6 +52,9 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType())); + entity.setMeanLength(dto.getMeanLength()); + entity.setMeanWeight(dto.getMeanWeight()); + } @@ -69,7 +72,8 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType())); - + dto.setMeanLength(entity.getMeanLength()); + dto.setMeanWeight(entity.getMeanWeight()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120
by Tony CHEMIT 13 Oct '18

13 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6cce186b by Tony CHEMIT at 2018-10-12T11:30:12Z [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120 - - - - - e068dbf5 by Tony CHEMIT at 2018-10-13T13:21:28Z Internationaliser le référentiel port - Closes #1138 - - - - - 704da5e7 by Tony CHEMIT at 2018-10-13T13:21:32Z fix typo - - - - - 75ed4e6b by Tony CHEMIT at 2018-10-13T13:21:32Z add missing license header - - - - - 9b7e19a4 by Tony CHEMIT at 2018-10-13T13:21:32Z fix referential ui. - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/DefaultMoveMultipleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/DefaultMoveSingleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/BackToReferentialListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/EditReferentialFromListUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DetailReferentialUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineLandingLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveMultipleActivitySeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveMultipleRouteUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f32b0c3e93a220bbb94fcbecdc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f32b0c3e93a220bbb94fcbecdc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120
by Tony CHEMIT 10 Oct '18

10 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f32b0c3e by Tony CHEMIT at 2018-10-10T10:32:30Z [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleTripUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/DefaultMoveSingleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleActivitySeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleRouteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleTripSeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f32b0c3e93a220bbb94fcbecdc4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f32b0c3e93a220bbb94fcbecdc4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update toolkit
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2e14f03d by Tony CHEMIT at 2018-10-07T17:51:55Z update toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.5-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.5</observeToolkitVersion>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2e14f03d6744553b78e6ad0af13… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2e14f03d6744553b78e6ad0af13… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Echantillons consignés au niveau marée : Petits ajustements - Closes #1134
by Tony CHEMIT 07 Oct '18

07 Oct '18

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(a)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 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -108,7 +108,7 @@  <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 @@  <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 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -93,7 +93,7 @@  <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 @@  <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 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -109,7 +109,7 @@  <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 @@  <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 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -94,7 +94,7 @@  <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 @@  <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>  @@ -51,9 +54,11 @@ <field name="latitude"> -  - <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"> -  - <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">  ===================================== 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"?> + + +<!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"> + +  + <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"> + +  + <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>  @@ -52,9 +54,11 @@ <field name="latitude"> -  - <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"> -  - <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">  ===================================== 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"?> + + +<!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"> + +  + <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"> + +  + <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>  @@ -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>  @@ -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>  @@ -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>  ===================================== 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>  @@ -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>  @@ -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>  ===================================== 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>  @@ -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>  @@ -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>  @@ -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>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -239,7 +239,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -283,7 +283,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -328,7 +328,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -373,7 +373,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -172,7 +172,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -189,7 +189,7 @@  <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 @@  <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 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -47,7 +47,7 @@  <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 @@  <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/e812218542acc19f7ff060b9af7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e812218542acc19f7ff060b9af7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Activité : Petits ajustements - Closes #1118
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fb37a010 by Tony CHEMIT at 2018-10-07T16:57:36Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - 24 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - 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/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-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/ActivityLonglineLogbookUI.jaxx ===================================== @@ -113,12 +113,41 @@ </row>  + <row> + <cell anchor='west'> + <JLabel id='windSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='windDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/> + </cell> + </row> +  <row> <cell anchor='west'> <JLabel id='currentSpeedLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/> + <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -57,6 +57,26 @@ storageTemperature:{bean.getSeaSurfaceTemperature()}; } +#currentSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED}; + numberValue:{bean.getCurrentSpeed()}; +} + +#currentDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION}; + numberValue:{bean.getCurrentDirection()}; +} + +#windSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED}; + numberValue:{bean.getWindSpeed()}; +} + +#windDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION}; + numberValue:{bean.getWindDirection()}; +} + #dataQuality { property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY}; selectedItem:{bean.getDataQuality()}; ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operatio observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.moves=Change trip observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip > observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=An activity is opened in another trip. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp observe.common.ActivityLonglineLogbookDto.titles=Activities observe.common.ActivityLonglineLogbookDto.wind=Wind +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt) observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineObsDto.action.moves=Change trip ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineObsDto.action.moves=Cambiar de marea ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante > observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Une activité ouverte existe dans une autre marée. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Activité obse observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage observe.common.ActivityLonglineLogbookDto.titles=Activités observe.common.ActivityLonglineLogbookDto.wind=Vent +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd) observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineObsDto.action.moves=Changer de marée ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -27,6 +27,7 @@ hasSetLongline + {*:1} boolean quadrant + {*:1} Integer fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference wind {*:1} fr.ird.observe.dto.referential.WindReference +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline; * 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>. @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS entity.setFpaZone(toEntity(dto.getFpaZone())); entity.setDataQuality(toEntity(dto.getDataQuality())); entity.setSample(toDataEntity(dto.getSample())); + entity.setWind(toEntity(dto.getWind())); + entity.setWindSpeed(dto.getWindSpeed()); + entity.setWindDirection(dto.getWindDirection()); + entity.setCurrentSpeed(dto.getCurrentSpeed()); + entity.setCurrentDirection(dto.getCurrentDirection()); } @Override @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS dto.setSample(toDataReference(referentialLocale, entity.getSample())); dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); + + dto.setWind(toReferentialReference(referentialLocale, entity.getWind())); + dto.setWindSpeed(entity.getWindSpeed()); + dto.setWindDirection(entity.getWindDirection()); + dto.setCurrentSpeed(entity.getCurrentSpeed()); + dto.setCurrentDirection(entity.getCurrentDirection()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); + executor.addScript("05", "update_longline_activity_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -5,6 +5,7 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float wind + {*:1} referentiel.Wind +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- 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% +--- + +ALTER TABLE observe_longline.ACTIVITYLOGBOOK ADD COLUMN windSpeed REAL; \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java ===================================== @@ -36,6 +36,7 @@ import fr.ird.observe.entities.longline.ActivityLonglineLogbook; import fr.ird.observe.entities.longline.ActivityLonglineLogbookTopiaDao; import fr.ird.observe.entities.longline.SampleLogbook; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.referentiel.DataQuality; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.longline.ActivityLonglineLogbookService; @@ -48,6 +49,9 @@ import java.util.List; */ public class ActivityLonglineLogbookServiceLocal extends ObserveServiceLocal implements ActivityLonglineLogbookService { + //FIXME-PROTECTED-ID + private static final String LONGLINE_ACTIVITY_LOGBOOK_DEFAULT_DATA_QUALITY_ID = "fr.ird.observe.entities.referentiel.DataQuality#0#1"; + @Override public DataDtoReferenceSet<ActivityLonglineLogbookReference> getActivityLonglineByTripLongline(String tripLonglineId) { ActivityLonglineLogbookTopiaDao dao = ACTIVITY_LONGLINE_LOGBOOK_SPI.getDao(getTopiaPersistenceContext()); @@ -92,6 +96,8 @@ public class ActivityLonglineLogbookServiceLocal extends ObserveServiceLocal imp timestamp = lastActivityLongline.getTimeStamp(); } preCreated.setTimeStamp(timestamp); + DataQuality defaultDataQuality = getTopiaPersistenceContext().getDataQualityDao().forTopiaIdEquals(LONGLINE_ACTIVITY_LOGBOOK_DEFAULT_DATA_QUALITY_ID).findUnique(); + preCreated.setDataQuality(defaultDataQuality); return ACTIVITY_LONGLINE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale()); } ===================================== test/src/main/resources/db/8.3/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/empty_h2.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windSpeed float, windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion integer, individualSize integer, individualWeight float, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/empty_pg.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windSpeed float4, windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion int4, individualSize int4, individualWeight float4, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -190,4 +190,37 @@ </field-validator> </field> + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -165,4 +165,39 @@ <message>observe.validation.activity.desactivated.dataQuality</message> </field-validator> </field> + + + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -134,7 +134,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]> + <![CDATA[ wind == null || wind.enabled ]]> </param> <message>observe.validation.activity.desactivated.wind</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml ===================================== @@ -156,8 +156,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -168,7 +168,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml ===================================== @@ -168,8 +168,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -180,7 +180,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Activity comment +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt) observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality observe.common.ActivityLonglineLogbookDto.date=Date observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineLogbookDto.time=Time observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°) observe.common.ActivityLonglineObsDto.comment=Activity comment observe.common.ActivityLonglineObsDto.dataQuality=Data quality observe.common.ActivityLonglineObsDto.date=Date @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required. observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s. observe.validation.basket.required.settingIdentifier=Setting identifier is required. +observe.validation.bound.currentDirection=current direction must be bound between %s and %s. +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s. +observe.validation.bound.windDirection=wind direction must be bound between %s and %s. observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s. observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s. observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled. observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled. observe.validation.sensorUsed.required.sensorType=Sensor type must be filled. -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s. -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s. observe.validation.set.bound.delay=Delay must be bound between %s and %s. observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s. observe.validation.set.bound.schoolMeanDepth=School mean depth must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°) observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s. observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=El estado del cebo está desactivado. @@ -735,8 +741,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=El tipo de formato d observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado. observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio. observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria. -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s observe.validation.set.bound.delay=La duración entre la hora final del lance y la de fin de recogida de la jareta debe ser al menos de %1$s minutos. observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s. observe.validation.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd) observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineLogbookDto.date=Jour d'observation observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineLogbookDto.time=Heure observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°) observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineObsDto.date=Jour d'observation @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s. observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s. observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Le type de format de observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. observe.validation.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fb37a0107db9ba37620a94da187… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fb37a0107db9ba37620a94da187… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Activité : Petits ajustements - Closes #1118
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 71b5db56 by Tony CHEMIT at 2018-10-07T16:54:39Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - 23 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - 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/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-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/ActivityLonglineLogbookUI.jaxx ===================================== @@ -113,12 +113,41 @@ </row>  + <row> + <cell anchor='west'> + <JLabel id='windSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='windDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/> + </cell> + </row> +  <row> <cell anchor='west'> <JLabel id='currentSpeedLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/> + <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -57,6 +57,26 @@ storageTemperature:{bean.getSeaSurfaceTemperature()}; } +#currentSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED}; + numberValue:{bean.getCurrentSpeed()}; +} + +#currentDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION}; + numberValue:{bean.getCurrentDirection()}; +} + +#windSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED}; + numberValue:{bean.getWindSpeed()}; +} + +#windDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION}; + numberValue:{bean.getWindDirection()}; +} + #dataQuality { property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY}; selectedItem:{bean.getDataQuality()}; ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operatio observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.moves=Change trip observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip > observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=An activity is opened in another trip. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp observe.common.ActivityLonglineLogbookDto.titles=Activities observe.common.ActivityLonglineLogbookDto.wind=Wind +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt) observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineObsDto.action.moves=Change trip ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineObsDto.action.moves=Cambiar de marea ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante > observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Une activité ouverte existe dans une autre marée. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Activité obse observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage observe.common.ActivityLonglineLogbookDto.titles=Activités observe.common.ActivityLonglineLogbookDto.wind=Vent +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd) observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineObsDto.action.moves=Changer de marée ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -27,6 +27,7 @@ hasSetLongline + {*:1} boolean quadrant + {*:1} Integer fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference wind {*:1} fr.ird.observe.dto.referential.WindReference +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline; * 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>. @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS entity.setFpaZone(toEntity(dto.getFpaZone())); entity.setDataQuality(toEntity(dto.getDataQuality())); entity.setSample(toDataEntity(dto.getSample())); + entity.setWind(toEntity(dto.getWind())); + entity.setWindSpeed(dto.getWindSpeed()); + entity.setWindDirection(dto.getWindDirection()); + entity.setCurrentSpeed(dto.getCurrentSpeed()); + entity.setCurrentDirection(dto.getCurrentDirection()); } @Override @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS dto.setSample(toDataReference(referentialLocale, entity.getSample())); dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); + + dto.setWind(toReferentialReference(referentialLocale, entity.getWind())); + dto.setWindSpeed(entity.getWindSpeed()); + dto.setWindDirection(entity.getWindDirection()); + dto.setCurrentSpeed(entity.getCurrentSpeed()); + dto.setCurrentDirection(entity.getCurrentDirection()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); + executor.addScript("05", "update_longline_activity_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -5,6 +5,7 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float wind + {*:1} referentiel.Wind +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- 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% +--- + +ALTER TABLE observe_longline.ACTIVITYLOGBOOK ADD COLUMN windSpeed REAL; \ No newline at end of file ===================================== test/src/main/resources/db/8.3/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/empty_h2.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windSpeed float, windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion integer, individualSize integer, individualWeight float, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/empty_pg.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windSpeed float4, windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion int4, individualSize int4, individualWeight float4, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -190,4 +190,37 @@ </field-validator> </field> + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -165,4 +165,39 @@ <message>observe.validation.activity.desactivated.dataQuality</message> </field-validator> </field> + + + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -134,7 +134,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]> + <![CDATA[ wind == null || wind.enabled ]]> </param> <message>observe.validation.activity.desactivated.wind</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml ===================================== @@ -156,8 +156,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -168,7 +168,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml ===================================== @@ -168,8 +168,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -180,7 +180,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Activity comment +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt) observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality observe.common.ActivityLonglineLogbookDto.date=Date observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineLogbookDto.time=Time observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°) observe.common.ActivityLonglineObsDto.comment=Activity comment observe.common.ActivityLonglineObsDto.dataQuality=Data quality observe.common.ActivityLonglineObsDto.date=Date @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required. observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s. observe.validation.basket.required.settingIdentifier=Setting identifier is required. +observe.validation.bound.currentDirection=current direction must be bound between %s and %s. +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s. +observe.validation.bound.windDirection=wind direction must be bound between %s and %s. observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s. observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s. observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled. observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled. observe.validation.sensorUsed.required.sensorType=Sensor type must be filled. -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s. -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s. observe.validation.set.bound.delay=Delay must be bound between %s and %s. observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s. observe.validation.set.bound.schoolMeanDepth=School mean depth must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°) observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s. observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=El estado del cebo está desactivado. @@ -735,8 +741,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=El tipo de formato d observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado. observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio. observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria. -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s observe.validation.set.bound.delay=La duración entre la hora final del lance y la de fin de recogida de la jareta debe ser al menos de %1$s minutos. observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s. observe.validation.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd) observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineLogbookDto.date=Jour d'observation observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineLogbookDto.time=Heure observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°) observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineObsDto.date=Jour d'observation @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s. observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s. observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Le type de format de observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. observe.validation.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Opération de pêche : petits ajustements - Closes #1126
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60ebe3c4 by Tony CHEMIT at 2018-10-07T15:59:12Z [LL] Opération de pêche : petits ajustements - Closes #1126 - - - - - 23 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/resources/db/migration/8.3/03_update_referential_longline_line_type-common.sql - + persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-H2.sql - + persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-PG.sql - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - 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/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/SetLonglineLogbookUI.jaxx ===================================== @@ -326,13 +326,13 @@ <JCheckBox id='lightsticksUsed' styleClass="i18n"/> </cell> </row> -  +  <row> <cell anchor='west'> - <JLabel id='lightsticksPerBasketCountLabel'/> + <JLabel id='totalLightsticksCountLabel'/> </cell> <cell fill='both' weightx="1" columns="3"> - <NumberEditor id='lightsticksPerBasketCount' constructorParams='this' styleClass="int6"/> + <NumberEditor id='totalLightsticksCount' constructorParams='this' styleClass="int6"/> </cell> </row>  ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss ===================================== @@ -196,9 +196,9 @@ selected:{BooleanUtils.isTrue(bean.getLightsticksUsed())}; } -#lightsticksPerBasketCount { - property:{SetLonglineLogbookDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; - numberValue:{bean.getLightsticksPerBasketCount()}; +#totalLightsticksCount { + property:{SetLonglineLogbookDto.PROPERTY_TOTAL_LIGHTSTICKS_COUNT}; + numberValue:{bean.getTotalLightsticksCount()}; } #lightsticksType { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java ===================================== @@ -127,16 +127,16 @@ class SetLonglineLogbookUIHandler extends ContentEditUIHandler<SetLonglineLogboo if (BooleanUtils.isTrue(newValue)) { // depredated - ui.getLightsticksPerBasketCount().setEnabled(true); + ui.getTotalLightsticksCount().setEnabled(true); ui.getLightsticksType().setEnabled(true); ui.getLightsticksColor().setEnabled(true); } else { // not depredated - ui.getLightsticksPerBasketCount().setEnabled(false); + ui.getTotalLightsticksCount().setEnabled(false); ui.getLightsticksType().setEnabled(false); ui.getLightsticksColor().setEnabled(false); - tableEditBean.setLightsticksPerBasketCount(null); + tableEditBean.setTotalLightsticksCount(null); tableEditBean.setLightsticksType(null); tableEditBean.setLightsticksColor(null); } ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -49,11 +49,11 @@ branchlinesPerBasketCount + {*:1} Integer totalSectionsCount + {*:1} Integer totalBasketsCount + {*:1} Integer totalHooksCount + {*:1} Integer +totalLightsticksCount + {*:1} Integer weightedSnap + {*:1} Boolean snapWeight + {*:1} Float weightedSwivel + {*:1} Boolean swivelWeight + {*:1} Float -lightsticksPerBasketCount + {*:1} Integer timeBetweenHooks + {*:1} Long shooterUsed + {*:1} Boolean shooterSpeed + {*:1} Float ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookEntityDtoBinder.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline; * 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>. @@ -74,7 +74,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor entity.setMonitored(dto.getMonitored()); entity.setLightsticksUsed(dto.getLightsticksUsed()); - entity.setLightsticksPerBasketCount(dto.getLightsticksPerBasketCount()); + entity.setTotalLightsticksCount(dto.getTotalLightsticksCount()); entity.setLightsticksType(toEntity(dto.getLightsticksType())); entity.setLightsticksColor(toEntity(dto.getLightsticksColor())); @@ -126,7 +126,7 @@ public class SetLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderSuppor dto.setMonitored(entity.getMonitored()); dto.setLightsticksUsed(entity.getLightsticksUsed()); - dto.setLightsticksPerBasketCount(entity.getLightsticksPerBasketCount()); + dto.setTotalLightsticksCount(entity.getTotalLightsticksCount()); dto.setLightsticksType(toReferentialReference(referentialLocale, entity.getLightsticksType())); dto.setLightsticksColor(toReferentialReference(referentialLocale, entity.getLightsticksColor())); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -44,6 +44,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("01", "update_referential_longline_conservation"); executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); + executor.addScript("04", "update_longline_set_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -51,11 +51,11 @@ branchlinesPerBasketCount + {*:1} Integer totalSectionsCount + {*:1} Integer totalBasketsCount + {*:1} Integer totalHooksCount + {*:1} Integer +totalLightsticksCount + {*:1} Integer weightedSnap + {*:1} Boolean snapWeight + {*:1} Float | sqlType=numeric weightedSwivel + {*:1} Boolean swivelWeight + {*:1} Float | sqlType=numeric -lightsticksPerBasketCount + {*:1} Integer timeBetweenHooks + {*:1} Long shooterUsed + {*:1} Boolean shooterSpeed + {*:1} Float | sqlType=numeric ===================================== persistence/src/main/resources/db/migration/8.3/03_update_referential_longline_line_type-common.sql ===================================== @@ -19,26 +19,5 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_longline.linetype (topiaid, - topiaversion, - topiacreatedate, - lastupdatedate, - status, - needComment, - code, - label1, - label2, - label3) -values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9', - 0, - CURRENT_DATE, - CURRENT_TIMESTAMP, - 1, - false, - 'UNK', - 'Unknown', - 'Inconnu', - 'Desconocido'); -UPDATE observe_common.LASTUPDATEDATE -SET lastupdatedate = CURRENT_TIMESTAMP -WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48'; \ No newline at end of file +INSERT INTO observe_longline.linetype (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); +UPDATE observe_common.LASTUPDATEDATE SET lastupdatedate = CURRENT_TIMESTAMP WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48'; \ No newline at end of file ===================================== persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-H2.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- 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% +--- +ALTER TABLE observe_longline.setlogbook ALTER COLUMN lightsticksPerBasketCount RENAME TO totalLightsticksCount; \ No newline at end of file ===================================== persistence/src/main/resources/db/migration/8.3/04_update_longline_set_logbook_field-PG.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- 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% +--- +ALTER TABLE observe_longline.setlogbook RENAME COLUMN lightsticksPerBasketCount TO totalLightsticksCount; \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java ===================================== @@ -76,8 +76,7 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen ActivityLonglineLogbook activityLongline = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId); SetLonglineLogbook preCreated = SET_LONGLINE_LOGBOOK_SPI.newEntity(); - // on utilise la date - heure de l'activité pour initialiser les horodatages - // de l'opération de pêche + // on utilise la date - heure de l'activité pour initialiser les horodatages de l'opération de pêche Date timeStamp = activityLongline.getTimeStamp(); preCreated.setSettingStartTimeStamp(timeStamp); preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1)); @@ -87,6 +86,9 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen // on reporte la position de l'activité pour la position de début de filage preCreated.setSettingStartLatitude(activityLongline.getLatitude()); preCreated.setSettingStartLongitude(activityLongline.getLongitude()); + + // by default 1 section count + preCreated.setTotalSectionsCount(1); Form<SetLonglineLogbookDto> form = SET_LONGLINE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale()); form.getObject().setOtherSets(getOtherSetLonglineDtoSet(activityLongline, preCreated)); return form; ===================================== test/src/main/resources/db/8.3/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/empty_h2.sql.gz ===================================== @@ -85,7 +85,7 @@ create table OBSERVE_LONGLINE.sensorBrand (topiaId varchar(255) not null, topiaV create table OBSERVE_LONGLINE.sensorDataFormat (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sensorType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sensorUsedObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, data blob, dataFilename varchar(255), dataLocation varchar(255), sensorSerialNo varchar(255), sensorType varchar(255), sensorDataFormat varchar(255), sensorBrand varchar(255), activity varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount integer, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, totalLineLength integer, basketLineLength integer, lengthBetweenBranchlines integer, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount integer, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, totalLightsticksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, totalLineLength integer, basketLineLength integer, lengthBetweenBranchlines integer, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount integer, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.SetObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), homeId varchar(255), number integer, basketsPerSectionCount integer, branchlinesPerBasketCount integer, totalSectionsCount integer, totalBasketsCount integer, totalHooksCount integer, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount integer, timeBetweenHooks bigint, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted integer, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks integer, monitored boolean, settingShape varchar(255), lineType varchar(255), lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.settingShape (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sizeMeasureObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, size numeric, sizeMeasureType varchar(255), lengthMeasureMethod varchar(255), catch varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/empty_pg.sql.gz ===================================== @@ -85,7 +85,7 @@ create table OBSERVE_LONGLINE.sensorBrand (topiaId varchar(255) not null, topiaV create table OBSERVE_LONGLINE.sensorDataFormat (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sensorType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sensorUsedObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, data oid, dataFilename varchar(255), dataLocation varchar(255), sensorSerialNo varchar(255), sensorType varchar(255), sensorDataFormat varchar(255), sensorBrand varchar(255), activity varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount int4, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, totalLineLength int4, basketLineLength int4, lengthBetweenBranchlines int4, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount int4, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.SetLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, totalLightsticksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, totalLineLength int4, basketLineLength int4, lengthBetweenBranchlines int4, settingShape varchar(255), lineType varchar(255), lightsticksUsed boolean, lightsticksCount int4, lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.SetObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, homeId varchar(255), number int4, basketsPerSectionCount int4, branchlinesPerBasketCount int4, totalSectionsCount int4, totalBasketsCount int4, totalHooksCount int4, weightedSnap boolean, snapWeight numeric, weightedSwivel boolean, swivelWeight numeric, lightsticksPerBasketCount int4, timeBetweenHooks int8, shooterUsed boolean, shooterSpeed numeric, maxDepthTargeted int4, settingStartTimeStamp timestamp, settingStartLatitude numeric, settingStartLongitude numeric, settingEndTimeStamp timestamp, settingEndLatitude numeric, settingEndLongitude numeric, settingVesselSpeed numeric, haulingDirectionSameAsSetting boolean, haulingStartTimeStamp timestamp, haulingStartLatitude numeric, haulingStartLongitude numeric, haulingEndTimeStamp timestamp, haulingEndLatitude numeric, haulingEndLongitude numeric, haulingBreaks int4, monitored boolean, settingShape varchar(255), lineType varchar(255), lightsticksType varchar(255), lightsticksColor varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.settingShape (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.sizeMeasureObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, size numeric, sizeMeasureType varchar(255), lengthMeasureMethod varchar(255), catch varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -42,15 +42,6 @@ </field> - <field name="haulingDirectionSameAsSetting"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message> - </field-validator> - - </field> - <field name="settingStartTimeStamp">  @@ -454,11 +445,6 @@ <field name="totalSectionsCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.totalSectionsCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:100</param> @@ -475,16 +461,11 @@ <field name="basketsPerSectionCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.basketsPerSectionCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:100</param> <param name="expression"><![CDATA[ - (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max) + basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max) ]]> </param> <message> @@ -496,16 +477,11 @@ <field name="branchlinesPerBasketCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:50</param> <param name="expression"><![CDATA[ - (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max) + branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max) ]]> </param> <message> @@ -547,17 +523,17 @@ </field> - <field name="lightsticksPerBasketCount"> + <field name="totalLightsticksCount"> -  +  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:50</param> <param name="expression"><![CDATA[ - lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max) + totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max) ]]> </param> <message> - observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max} + observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -140,4 +140,31 @@ </field> + <field name="totalSectionsCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.totalSectionsCount</message> + </field-validator> + + </field> + + <field name="basketsPerSectionCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.basketsPerSectionCount</message> + </field-validator> + + </field> + + <field name="branchlinesPerBasketCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -42,15 +42,6 @@ </field> - <field name="haulingDirectionSameAsSetting"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingDirectionSameAsSetting</message> - </field-validator> - - </field> - <field name="settingStartTimeStamp">  @@ -438,11 +429,6 @@ <field name="totalSectionsCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.totalSectionsCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:100</param> @@ -459,16 +445,11 @@ <field name="basketsPerSectionCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.basketsPerSectionCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:100</param> <param name="expression"><![CDATA[ - (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max) + basketsPerSectionCount == null || (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max) ]]> </param> <message> @@ -480,16 +461,11 @@ <field name="branchlinesPerBasketCount"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message> - </field-validator> -  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:50</param> <param name="expression"><![CDATA[ - (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max) + branchlinesPerBasketCount == null || (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max) ]]> </param> <message> @@ -531,17 +507,17 @@ </field> - <field name="lightsticksPerBasketCount"> + <field name="totalLightsticksCount"> -  +  <field-validator type="fieldexpressionwithparams" short-circuit="true"> <param name="intParams">min:0|max:50</param> <param name="expression"><![CDATA[ - lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max) + totalLightsticksCount == null || (ints.min <= totalLightsticksCount && totalLightsticksCount <= ints.max) ]]> </param> <message> - observe.validation.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max} + observe.validation.setLongline.bound.totalLightsticksCount##${ints.min}##${ints.max} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -140,4 +140,31 @@ </field> + <field name="totalSectionsCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.totalSectionsCount</message> + </field-validator> + + </field> + + <field name="basketsPerSectionCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.basketsPerSectionCount</message> + </field-validator> + + </field> + + <field name="branchlinesPerBasketCount"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.setLongline.required.branchlinesPerBasketCount</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -254,7 +254,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Hauling start quadrant observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Start timestamp observe.common.SetLonglineLogbookDto.homeId=Home id observe.common.SetLonglineLogbookDto.lightsticksColor=Lightsticks color -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=lightsticks per basket count observe.common.SetLonglineLogbookDto.lightsticksType=Lightsticks type observe.common.SetLonglineLogbookDto.lineType=Line type observe.common.SetLonglineLogbookDto.maxDepthTargeted=Max depth targeted (m) @@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=swivel weight (kg) observe.common.SetLonglineLogbookDto.timeBetweenHooks=time between hooks observe.common.SetLonglineLogbookDto.totalBasketsCount=Total baskets count observe.common.SetLonglineLogbookDto.totalHooksCount=Total hooks count +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Total number of lightsticks observe.common.SetLonglineLogbookDto.totalSectionsCount=Total sections count observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Baits composition observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Baits composition proportion sum @@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Swivel weight must be bound be observe.validation.setLongline.bound.timeBetweenHooks=Time between hooks must be bound between %s and %s. observe.validation.setLongline.bound.totalBasketsCount=Total baskets count must be bound between %s and %s. observe.validation.setLongline.bound.totalHooksCount=Total hooks count must be bound between %s and %s. +observe.validation.setLongline.bound.totalLightsticksCount=Total number of lightsticks must be bound between %s and %s. observe.validation.setLongline.bound.totalSectionsCount=must be bound between %s and %s. observe.validation.setLongline.branchlinesComposition.uniqueKey=Tuple (topType/type/size) must be unique. observe.validation.setLongline.desactivated.lightsticksColor=Selected lightstick color is disabled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -256,7 +256,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Arrastre Quadrant observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Timestamp del inicio observe.common.SetLonglineLogbookDto.homeId=Id de negocio observe.common.SetLonglineLogbookDto.lightsticksColor=Color de barrita de luz -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Número de barrita de luz por cesta observe.common.SetLonglineLogbookDto.lightsticksType=Tipo de barrita de luz observe.common.SetLonglineLogbookDto.lineType=Tipo de línea observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profundidad máxima deseada @@ -277,6 +276,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Peso de el destorcedor (kg) observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre anzuelos (s) observe.common.SetLonglineLogbookDto.totalBasketsCount=Número total de baskets observe.common.SetLonglineLogbookDto.totalHooksCount=Número total d'arponcillos +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Número total de barras de luz observe.common.SetLonglineLogbookDto.totalSectionsCount=Número total de secciones observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Cebo observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) @@ -768,6 +768,7 @@ observe.validation.setLongline.bound.swivelWeight=El peso destorcedor debe estar observe.validation.setLongline.bound.timeBetweenHooks=El tiempo entre avanzuelos debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.bound.totalBasketsCount=El número total de cestas debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.bound.totalHooksCount=El número total de avanzuelos debe estar comprendido entre %1$s y %2$s. +observe.validation.setLongline.bound.totalLightsticksCount=El total de barras de luz debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.bound.totalSectionsCount=El número total de secciones debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.branchlinesComposition.uniqueKey=La tupla (tipo alto/tipo bajo/tamaño) debe ser única, la tupa ya está utilizada. observe.validation.setLongline.desactivated.lightsticksColor=El color de la barrita de luz seleccionado está desactivado. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -254,7 +254,6 @@ observe.common.SetLonglineLogbookDto.haulingStartQuadrant=Quadrant de début de observe.common.SetLonglineLogbookDto.haulingStartTimeStamp=Horodatage début observe.common.SetLonglineLogbookDto.homeId=Id métier observe.common.SetLonglineLogbookDto.lightsticksColor=Couleur de cyalumes -observe.common.SetLonglineLogbookDto.lightsticksPerBasketCount=Nombre de cyalumes par panier observe.common.SetLonglineLogbookDto.lightsticksType=Type de cyalumes observe.common.SetLonglineLogbookDto.lineType=Type de ligne observe.common.SetLonglineLogbookDto.maxDepthTargeted=Profondeur maximum ciblée @@ -275,6 +274,7 @@ observe.common.SetLonglineLogbookDto.swivelWeight=Poids de l'émerillon (kg) observe.common.SetLonglineLogbookDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineLogbookDto.totalBasketsCount=Nombre total de paniers observe.common.SetLonglineLogbookDto.totalHooksCount=Nombre total d'avançons +observe.common.SetLonglineLogbookDto.totalLightsticksCount=Nombre total de cyalumes observe.common.SetLonglineLogbookDto.totalSectionsCount=Nombre total de sections observe.common.SetLonglineLogbookGlobalCompositionDto.baitsComposition=Appâts observe.common.SetLonglineLogbookGlobalCompositionDto.baitsCompositionProportionSum=Somme des proportions d'appâts (%) @@ -766,6 +766,7 @@ observe.validation.setLongline.bound.swivelWeight=Le poids émerillon doit être observe.validation.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s. observe.validation.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s. observe.validation.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s. +observe.validation.setLongline.bound.totalLightsticksCount=Le nombre total de cyalumes doit être compris entre %1$s et %2$s. observe.validation.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s. observe.validation.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique observe.validation.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60ebe3c43dc1e0ebbf447140098… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60ebe3c43dc1e0ebbf447140098… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [LL] Composition globale de la palangre : petits ajustements - Closes #1128…
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4f62c2f4 by Tony CHEMIT at 2018-10-07T15:12:10Z [LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation) - - - - - 39e3eb2c by Tony CHEMIT at 2018-10-07T15:12:13Z [LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115 - - - - - a370d2af by Tony CHEMIT at 2018-10-07T15:12:13Z fix coordinates validation message (and remove a lots of them \o/) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/NotStandaloneContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/591c5b54eec1351876d3e9baaf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/591c5b54eec1351876d3e9baaf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Les positions géographiques de fin de filage, début et fin de virage ne…
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 40c00247 by Tony CHEMIT at 2018-10-07T14:32:34Z [LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires - Closes #1115 - - - - - 591c5b54 by Tony CHEMIT at 2018-10-07T14:57:37Z fix coordinates validation message (and remove a lots of them \o/) - - - - - 22 changed files: - + services/.mvn/i18n-generate - + services/.mvn/i18n-parse-java - + services/src/main/resources/i18n/services_en_GB.properties - + services/src/main/resources/i18n/services_es_ES.properties - + services/src/main/resources/i18n/services_fr_FR.properties - 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-update-error-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: ===================================== services/.mvn/i18n-generate ===================================== ===================================== services/.mvn/i18n-parse-java ===================================== ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.degree.longitude.outOfBound=Longitude must be between 0 and 180. +observe.validation.coordinate.minute.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.minute.longitude.outOfBound=Longitude must be between 0 and 180. +observe.validation.coordinate.second.latitude.outOfBound=Latitude must be between 0 and 90. +observe.validation.coordinate.second.longitude.outOfBound=Longitude must be between 0 and 180. ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.degree.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. +observe.validation.coordinate.minute.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.minute.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. +observe.validation.coordinate.second.latitude.outOfBound=La latitud estar comprendida entre 0 y 90. +observe.validation.coordinate.second.longitude.outOfBound=La longitud estar comprendida entre 0 y 180. ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== @@ -0,0 +1,6 @@ +observe.validation.coordinate.degree.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.degree.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. +observe.validation.coordinate.minute.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.minute.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. +observe.validation.coordinate.second.latitude.outOfBound=La latitude doit être comprise entre 0 et 90. +observe.validation.coordinate.second.longitude.outOfBound=La longitude doit être comprise entre 0 et 180. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -111,17 +111,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -136,17 +125,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -96,18 +96,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -122,17 +110,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -112,17 +112,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -137,17 +126,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -97,18 +97,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -123,17 +111,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -56,17 +56,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -81,15 +70,9 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> + <field-validator type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">coordinate</param> + <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -57,17 +57,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -82,17 +71,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -230,17 +230,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -255,17 +244,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -275,7 +253,10 @@ <field name="settingEndQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -291,20 +272,11 @@ <field name="settingEndLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -316,20 +288,11 @@ <field name="settingEndLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -341,7 +304,10 @@ <field name="haulingStartQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -357,20 +323,11 @@ <field name="haulingStartLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -382,20 +339,11 @@ <field name="haulingStartLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -407,7 +355,10 @@ <field name="haulingEndQuadrant"> - <field-validator type="required" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> + </param> <message>observe.validation.setLongline.required.quadrant</message> </field-validator> @@ -423,20 +374,11 @@ <field name="haulingEndLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -448,20 +390,11 @@ <field name="haulingEndLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -42,4 +42,102 @@ </field> + <field name="settingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="settingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLatitude</message> + </field-validator> + + </field> + + <field name="settingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLongitude</message> + </field-validator> + + </field> + + <field name="haulingStartQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingStartLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> + </field-validator> + + </field> + + <field name="haulingStartLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> + </field-validator> + </field> + + <field name="haulingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -214,17 +214,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -239,17 +228,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -257,11 +235,13 @@ </field> - <field name="settingStartQuadrant"> + <field name="settingEndQuadrant"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator>  @@ -276,20 +256,11 @@ <field name="settingEndLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> + <![CDATA[ settingEndLatitude != null || ( settingEndQuadrant == null && settingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -301,20 +272,11 @@ <field name="settingEndLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.settingEndLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> + <![CDATA[ settingEndLongitude != null || ( settingEndQuadrant == null && settingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -324,11 +286,13 @@ </field> - <field name="settingEndQuadrant"> + <field name="haulingStartQuadrant"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator>  @@ -343,20 +307,11 @@ <field name="haulingStartLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> + <![CDATA[ haulingStartLatitude != null || ( haulingStartQuadrant == null && haulingStartLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -368,20 +323,11 @@ <field name="haulingStartLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingStartLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> + <![CDATA[ haulingStartLongitude != null || ( haulingStartQuadrant == null && haulingStartLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -391,11 +337,13 @@ </field> - <field name="haulingStartQuadrant"> + <field name="haulingEndQuadrant"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> </field-validator>  @@ -410,20 +358,11 @@ <field name="haulingEndLatitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLatitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> + <![CDATA[ haulingEndLatitude != null || ( haulingEndQuadrant == null && haulingEndLongitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -435,20 +374,11 @@ <field name="haulingEndLongitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.haulingEndLongitude</message> - </field-validator> - -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> + <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> + <![CDATA[ haulingEndLongitude != null || ( haulingEndQuadrant == null && haulingEndLatitude == null )]]> </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -458,23 +388,6 @@ </field> - <field name="haulingEndQuadrant"> - -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> - </field-validator> - -  - <field-validator type="quadrantDto" short-circuit="true"> - <param name="ocean">currentTripLongline.ocean</param> - <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} - </message> - </field-validator> - - </field> - <field name="settingShape">  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -42,4 +42,102 @@ </field> + <field name="settingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="settingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLatitude</message> + </field-validator> + + </field> + + <field name="settingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.settingEndLongitude</message> + </field-validator> + + </field> + + <field name="haulingStartQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingStartLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLatitude</message> + </field-validator> + + </field> + + <field name="haulingStartLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingStartLongitude</message> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.quadrant</message> + </field-validator> + + </field> + + <field name="haulingEndLatitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLatitude</message> + </field-validator> + </field> + + <field name="haulingEndLongitude"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> + </param> + <message>observe.validation.setLongline.required.haulingEndLongitude</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -230,17 +230,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -255,17 +244,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -296,17 +274,6 @@ <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -321,17 +288,6 @@ <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -362,17 +318,6 @@ <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -387,17 +332,6 @@ <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -428,17 +362,6 @@ <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -453,17 +376,6 @@ <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -214,17 +214,6 @@ <message>observe.validation.setLongline.required.settingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLatitude && settingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -239,17 +228,6 @@ <message>observe.validation.setLongline.required.settingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingStartLongitude && settingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -281,17 +259,6 @@ <message>observe.validation.setLongline.required.settingEndLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLatitude && settingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -306,17 +273,6 @@ <message>observe.validation.setLongline.required.settingEndLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= settingEndLongitude && settingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.settingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -347,17 +303,6 @@ <message>observe.validation.setLongline.required.haulingStartLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLatitude && haulingStartLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -372,17 +317,6 @@ <message>observe.validation.setLongline.required.haulingStartLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingStartLongitude && haulingStartLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingStartLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -414,17 +348,6 @@ <message>observe.validation.setLongline.required.haulingEndLatitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLatitude && haulingEndLatitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLatitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -439,17 +362,6 @@ <message>observe.validation.setLongline.required.haulingEndLongitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= haulingEndLongitude && haulingEndLongitude <= doubles.max)]]> - </param> - <message> - observe.validation.setLongline.bound.haulingEndLongitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -192,17 +192,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -217,17 +206,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -50,18 +50,6 @@ <message>observe.validation.activity.required.latitude</message> </field-validator> -  - - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-90.0|max:90.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= latitude && latitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.latitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> @@ -76,17 +64,6 @@ <message>observe.validation.activity.required.longitude</message> </field-validator> -  - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:-180.0|max:180.0</param> - <param name="expression"> - <![CDATA[ (doubles.min <= longitude && longitude <= doubles.max)]]> - </param> - <message> - observe.validation.activity.bound.longitude##0.0##${doubles.max} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Length observe.common.BranchlinesCompositionObsDto.proportion=Proportion observe.common.BranchlinesCompositionObsDto.topType=Top part type observe.common.BranchlinesCompositionObsDto.tracelineType=Traceline type -observe.common.CatchLonglineLogbookDto.basket=Basket -observe.common.CatchLonglineLogbookDto.branchline=Branchline observe.common.CatchLonglineLogbookDto.catchFateLongline=Fate observe.common.CatchLonglineLogbookDto.catchHealthness=Catch healthness observe.common.CatchLonglineLogbookDto.comment=Comment observe.common.CatchLonglineLogbookDto.count=Count observe.common.CatchLonglineLogbookDto.discardHealthness=Discard healthness -observe.common.CatchLonglineLogbookDto.gonadeWeight=Gonade weight (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Hook position -observe.common.CatchLonglineLogbookDto.maturityStatus=Sexual maturity observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing -observe.common.CatchLonglineLogbookDto.section=Section -observe.common.CatchLonglineLogbookDto.sex=Sex observe.common.CatchLonglineLogbookDto.speciesCatch=Species -observe.common.CatchLonglineLogbookDto.stomacFullness=Stomac fullness observe.common.CatchLonglineObsDto.basket=Basket observe.common.CatchLonglineObsDto.branchline=Branchline observe.common.CatchLonglineObsDto.catchFateLongline=Fate @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Gauge label observe.common.WeightCategorySeineDto.species=Thuna species observe.common.WindDto.speedRange=Speed range observe.common.WindDto.waveHeight=Wave weight -observe.validation.activity.bound.latitude=Latitude must be between %1$s and %2$s. -observe.validation.activity.bound.longitude=Longitude must be between %1$s and %2$s. observe.validation.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s%3$s and %2$s%3$s. observe.validation.activity.bound.vesselSpeed=Vessel speed must be between %1$s and %2$s. observe.validation.activity.comment.tobig=Comment size is bound to 1024 characters. @@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=Selected vessel activity observe.validation.activity.desactivated.wind=Selected wind is disabled. observe.validation.activity.duplicated.time=There is already another activity at this time. observe.validation.activity.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4). -observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. observe.validation.activity.invalid.speed=Activity speed is %s nb, which is more than the maximum authorized which is %s nd. observe.validation.activity.null.dcp=No floating object selected. observe.validation.activity.null.fpaZone=Fpa zone is not filled. @@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled. observe.validation.lengthLengthParameter.null.sex=Sex must be filled. observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required. -observe.validation.lengthLengthParameter.required.endDate=End date must be filled. observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required. observe.validation.lengthLengthParameter.required.outputInputFormula=Formula is required. observe.validation.lengthLengthParameter.required.species=Species must be filled. -observe.validation.lengthLengthParameter.required.startDate=Start date must be filled. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled. observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique. @@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Tuple (species - objectFate) must be observe.validation.nonTargetCatchRelease.bound.count=Count must be between %1$s and %2$s. observe.validation.nonTargetCatchRelease.comment.tobig=Comment size can not exceed 1024 characters. observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. observe.validation.nonTargetCatchRelease.desactivated.sex=Selected sex fate is disabled. observe.validation.nonTargetCatchRelease.desactivated.species=Selected species is disabled. observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Selected release mode is disabled. @@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=Status is disabled (it can't observe.validation.referentiel.status.required=Status must be filled. observe.validation.referentiel.untranslated.label1=English label is not translated. observe.validation.referentiel.untranslated.label3=Spanish label is not translated. -observe.validation.required.categoryMax=Category max is not filled. -observe.validation.required.categoryMin=Category min is not filled. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. observe.validation.required.species=Species is not filled. @@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Date must be after trip start date (%1$s). observe.validation.route.invalid.endLogValue.maximum=End log can't be before start log. observe.validation.route.invalid.endLogValue.minimum=End log must be after start log. observe.validation.route.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4). -observe.validation.route.invalid.seaSurfaceTemperature=Sear surface temperature can't vary more than 12° between two activities (activity at position %1$s is not correct). observe.validation.route.invalid.speed=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.route.invalid.startLogValue=Start log value (%1$s) can't be after end log value (%2$s) of route %3$s. observe.validation.route.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct). @@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=Sum of proporti observe.validation.setLongline.baitsComposition.uniqueKey=Tuple (type/status/size/weight) must be unique. observe.validation.setLongline.bound.basketsPerSectionCount=Baskets per section count must be bound between %s and %s. observe.validation.setLongline.bound.branchlinesPerBasketCount=Branchlines per basket count must be bound between %s and %s. -observe.validation.setLongline.bound.haulingEndLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingEndLongitude=Longitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingStartLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.haulingStartLongitude=Longitude must be bound between %s and %s. observe.validation.setLongline.bound.lightsticksPerBasketCount=Lightsticks per basket count must be bound between %s and %s. -observe.validation.setLongline.bound.settingEndLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingEndLongitude=Longitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingStartLatitude=Latitude must be bound between %s and %s. -observe.validation.setLongline.bound.settingStartLongitude=Longitude must be bound between %s and %s. observe.validation.setLongline.bound.settingVesselSpeed=Setting vessel speed must be bound between %s and %s. observe.validation.setLongline.bound.shooterSpeed=Shooter speed must be bound between %s and %s. observe.validation.setLongline.bound.snapWeight=Snap weight must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longitud (m) observe.common.BranchlinesCompositionObsDto.proportion=Proporción (%) observe.common.BranchlinesCompositionObsDto.topType=Tipo de la parte superior observe.common.BranchlinesCompositionObsDto.tracelineType=Tipo bajo de línea -observe.common.CatchLonglineLogbookDto.basket=cesta -observe.common.CatchLonglineLogbookDto.branchline=Arponcillo observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir observe.common.CatchLonglineLogbookDto.catchHealthness=Salud a la captura observe.common.CatchLonglineLogbookDto.comment=Comentario observe.common.CatchLonglineLogbookDto.count=Numéro observe.common.CatchLonglineLogbookDto.discardHealthness=Salud al rechazo -observe.common.CatchLonglineLogbookDto.gonadeWeight=Peso de las gonadas (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Posición del gancho -observe.common.CatchLonglineLogbookDto.maturityStatus=Maturidad sexual observe.common.CatchLonglineLogbookDto.onBoardProcessing=On board processing \#TODO -observe.common.CatchLonglineLogbookDto.section=sección -observe.common.CatchLonglineLogbookDto.sex=Sexo observe.common.CatchLonglineLogbookDto.speciesCatch=Especie -observe.common.CatchLonglineLogbookDto.stomacFullness=Estatuto del estomago observe.common.CatchLonglineObsDto.basket=cesta observe.common.CatchLonglineObsDto.branchline=Arponcillo observe.common.CatchLonglineObsDto.catchFateLongline=Devenir @@ -446,8 +438,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Texto «Capacidad» observe.common.WeightCategorySeineDto.species=Especie observe.common.WindDto.speedRange=Texto velocidad del viento observe.common.WindDto.waveHeight=Texto descriptivo de «altura media de la ola» -observe.validation.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. -observe.validation.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. observe.validation.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s%3$s y %2$s%3$s. observe.validation.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s. observe.validation.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. @@ -463,7 +453,6 @@ observe.validation.activity.desactivated.vesselActivity=Actividad del barco sele observe.validation.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada. observe.validation.activity.duplicated.time=Ya existe una actividad a esa hora. observe.validation.activity.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4) -observe.validation.activity.invalid.seaSurfaceTemperature=Previous activity (%1$s) sea temperature was %2$s%5$s, current temperature must be between %3$s%5$s and %4$s%5$s. \#TODO observe.validation.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. observe.validation.activity.null.dcp=No se ha introducido objeto flotante. observe.validation.activity.null.fpaZone=La selección de una zona FPA es obligatoria. @@ -603,11 +592,9 @@ observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO -observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO observe.validation.lengthLengthParameter.required.species=Especie no especificada. -observe.validation.lengthLengthParameter.required.startDate=fecha de comienzo de validez no especificada. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO @@ -642,7 +629,6 @@ observe.validation.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe s observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. \#TODO observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. \#TODO observe.validation.nonTargetCatchRelease.desactivated.conformity=Selected conformity is disabled. \#TODO -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Selected releasing time is disabled. \#TODO observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. \#TODO observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. \#TODO observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. \#TODO @@ -712,8 +698,6 @@ observe.validation.referentiel.status.desactivated=El objeto está desactivado ( observe.validation.referentiel.status.required=El estatuto activo-inactivo es mandatorio. observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido. observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. -observe.validation.required.categoryMax=Category max is not filled. -observe.validation.required.categoryMin=Category min is not filled. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. observe.validation.required.species=Species is not filled. @@ -724,7 +708,6 @@ observe.validation.route.invalid.date=El día de observación debe ser superior observe.validation.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. observe.validation.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana. observe.validation.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) -observe.validation.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta). observe.validation.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). observe.validation.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s. observe.validation.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). @@ -777,15 +760,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La suma de las observe.validation.setLongline.baitsComposition.uniqueKey=La tupla (type/estado/tamaño/peso) debe ser única, la tupa ya está utilizada. observe.validation.setLongline.bound.basketsPerSectionCount=El número de cestas en la sección debe estar comprendido entre %1$s y %2$s. observe.validation.setLongline.bound.branchlinesPerBasketCount=El número de avanzuelos en la cesta debe estar comprendido entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingEndLatitude=La latitud de fin de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingEndLongitude=La longitud de fin de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingStartLatitude=La latitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.haulingStartLongitude=La longitud de inicio de arrastre debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.lightsticksPerBasketCount=El número de cyalumes en la cesta debe estar comprendido entre %1$s y %2$s. -observe.validation.setLongline.bound.settingEndLatitude=La latitud de fin de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingEndLongitude=La longitud de fin de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingStartLatitude=La latitud de inicio de calada debe estar comprendida entre %1$s y %2$s. -observe.validation.setLongline.bound.settingStartLongitude=La longitud de inicio de calada debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.settingVesselSpeed=La velocidad del barco debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.shooterSpeed=La velocidad de shooter debe estar comprendida entre %1$s y %2$s. observe.validation.setLongline.bound.snapWeight=El peso snap debe estar comprendido entre %1$s y %2$s. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -70,21 +70,13 @@ observe.common.BranchlinesCompositionObsDto.length=Longueur (m) observe.common.BranchlinesCompositionObsDto.proportion=Proportion (%) observe.common.BranchlinesCompositionObsDto.topType=Type partie supérieure observe.common.BranchlinesCompositionObsDto.tracelineType=Type bas de ligne -observe.common.CatchLonglineLogbookDto.basket=Panier -observe.common.CatchLonglineLogbookDto.branchline=Avançon observe.common.CatchLonglineLogbookDto.catchFateLongline=Devenir observe.common.CatchLonglineLogbookDto.catchHealthness=Santé à la capture observe.common.CatchLonglineLogbookDto.comment=Commentaire observe.common.CatchLonglineLogbookDto.count=Nombre observe.common.CatchLonglineLogbookDto.discardHealthness=Santé au rejet -observe.common.CatchLonglineLogbookDto.gonadeWeight=Poids des gonades (g) -observe.common.CatchLonglineLogbookDto.hookPosition=Position de l'hameçon -observe.common.CatchLonglineLogbookDto.maturityStatus=Maturité sexuelle observe.common.CatchLonglineLogbookDto.onBoardProcessing=Traitement à bord -observe.common.CatchLonglineLogbookDto.section=Section -observe.common.CatchLonglineLogbookDto.sex=Sexe observe.common.CatchLonglineLogbookDto.speciesCatch=Espèce -observe.common.CatchLonglineLogbookDto.stomacFullness=État de l'estomac observe.common.CatchLonglineObsDto.basket=Panier observe.common.CatchLonglineObsDto.branchline=Avançon observe.common.CatchLonglineObsDto.catchFateLongline=Devenir @@ -444,8 +436,6 @@ observe.common.VesselSizeCategoryDto.gaugeLabel=Libellé jauge observe.common.WeightCategorySeineDto.species=Espèce de thon observe.common.WindDto.speedRange=Libellé vitesse vent observe.common.WindDto.waveHeight=Libellé Hauteur moyenne vagues -observe.validation.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. -observe.validation.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. observe.validation.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s%3$s et %2$s%3$s. observe.validation.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s. observe.validation.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères. @@ -461,7 +451,6 @@ observe.validation.activity.desactivated.vesselActivity=L'activité bateau séle observe.validation.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé. observe.validation.activity.duplicated.time=Il existe déjà une autre activité à cette heure. observe.validation.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1 -observe.validation.activity.invalid.seaSurfaceTemperature=La température surface de l'activité précédente (%1$s) est de %2$s%5$s, la température doit être comprise entre %3$s%5$s et %4$s%5$s. observe.validation.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd observe.validation.activity.null.dcp=Aucun objet flottant saisi. observe.validation.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. @@ -601,11 +590,9 @@ observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. -observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. observe.validation.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. observe.validation.lengthLengthParameter.required.species=L'espèce n'est pas renseignée. -observe.validation.lengthLengthParameter.required.startDate=date de début de validité non renseignée. observe.validation.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique @@ -640,7 +627,6 @@ observe.validation.nonTargetCatch.uniqueKey=Le couple (espèce - devenir objet) observe.validation.nonTargetCatchRelease.bound.count=Le nombre doit être compris entre %1$s et %2$s. observe.validation.nonTargetCatchRelease.comment.tobig=La taille du commentaire est limitée à 1024 caractères. observe.validation.nonTargetCatchRelease.desactivated.conformity=La conformité sélectionnée est désactivée. -observe.validation.nonTargetCatchRelease.desactivated.releasingTime=Le moment de libération sélectionné est désactivé. observe.validation.nonTargetCatchRelease.desactivated.sex=Le sexe sélectionné est désactivé. observe.validation.nonTargetCatchRelease.desactivated.species=L'espèce sélectionnée est désactivée. observe.validation.nonTargetCatchRelease.desactivated.speciesGroupReleaseMode=Le mode de libération sélectionné est désactivé. @@ -710,8 +696,6 @@ observe.validation.referentiel.status.desactivated=L'objet est désactivé (il n observe.validation.referentiel.status.required=Le statut actif-inactif est obligatoire. observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit. observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. -observe.validation.required.categoryMax=La catégorie Max n'est pas renseignée. -observe.validation.required.categoryMin=La catégorie Min n'est pas renseignée. observe.validation.required.compagnies=La compagnie n'est pas renseignée. observe.validation.required.harbour=Le port n'est pas renseigné. observe.validation.required.species=L'espèce n'est pas renseigné. @@ -722,7 +706,6 @@ observe.validation.route.invalid.date=Le jour d'observation doit être supérieu observe.validation.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. observe.validation.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin. observe.validation.route.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1 -observe.validation.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte). observe.validation.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). observe.validation.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s. observe.validation.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). @@ -775,15 +758,7 @@ observe.validation.setLongline.bad.hooksCompositionProportionSum=La somme des pr observe.validation.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. observe.validation.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s. observe.validation.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s. -observe.validation.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s. -observe.validation.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s. observe.validation.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b95c598b05fa5dbe8f70f358d4… You're receiving this email because of your account on gitlab.com.

1 0