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

[Git][ultreiaio/ird-observe][develop] 10 commits: update changelog
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d669a63a by Tony CHEMIT at 2018-10-14T17:12:17Z update changelog - - - - - eb83a860 by Tony CHEMIT at 2018-10-14T17:12:19Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - c5b18fea by Tony CHEMIT at 2018-10-14T17:12:19Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - 7c5282b2 by Tony CHEMIT at 2018-10-14T17:12:19Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 88a33a62 by Tony CHEMIT at 2018-10-14T17:12:19Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - e2c948de by Tony CHEMIT at 2018-10-14T17:12:19Z Amélioration du composant de cartographie - Closes #901 - - - - - c31a4ac0 by Tony CHEMIT at 2018-10-14T17:12:20Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 - - - - - 814798f3 by Tony CHEMIT at 2018-10-14T17:12:21Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - b3038498 by Tony CHEMIT at 2018-10-14T17:12:22Z Realign database model version to 7.0 - - - - - eed3e13c by Tony CHEMIT at 2018-10-14T17:12:26Z Realign database model version to 7.0 - - - - - 30 changed files: - .mvn/gitlab-cache/milestones/532657-issues.json - .mvn/gitlab-cache/milestones/532657.json - + .mvn/gitlab-cache/milestones/655988-artifacts.json - .mvn/gitlab-cache/milestones/655988-issues.json - .mvn/gitlab-cache/milestones/655988.json - + .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/674086.json - CHANGELOG.md - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.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 - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b71a58687705ef56059a07a7a4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b71a58687705ef56059a07a7a4… You're receiving this email because of your account on gitlab.com.

1 0

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

Oct. 14, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 10ac78bf by Tony CHEMIT at 2018-10-14T14:59:39Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 514ffc6b by Tony CHEMIT at 2018-10-14T15:00:09Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - f0eba373 by Tony CHEMIT at 2018-10-14T15:03:27Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 6851f554 by Tony CHEMIT at 2018-10-14T15:03:56Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 22362a2c by Tony CHEMIT at 2018-10-14T15:17:54Z Amélioration du composant de cartographie - Closes #901 - - - - - df297092 by Tony CHEMIT at 2018-10-14T16:23:56Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 - - - - - 840b8d10 by Tony CHEMIT at 2018-10-14T16:24:02Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - 29cc0ae2 by Tony CHEMIT at 2018-10-14T16:24:03Z Realign database model version to 7.0 - - - - - b71a5868 by Tony CHEMIT at 2018-10-14T16:24:10Z Realign database model version to 7.0 - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.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 - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_2.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_4.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_6.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_3.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a640b3f669ff9014b923775fe1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a640b3f669ff9014b923775fe1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: Some data (in table forms) order is not deterministic - Closes #1112 - See #1144
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 991f39f4 by Tony CHEMIT at 2018-10-14T16:14:05Z Some data (in table forms) order is not deterministic - Closes #1112 - See #1144 - - - - - cf4ff6f4 by Tony CHEMIT at 2018-10-14T16:14:13Z [LL][PS] Améliorer le widget position - Closes #1133 - See #1144 - - - - - f0cc209f by Tony CHEMIT at 2018-10-14T16:14:19Z [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131 - See #1144 - - - - - e99e032a by Tony CHEMIT at 2018-10-14T16:14:25Z fix coordinates validation message (and remove a lots of them \o/) (See #1144) - - - - - 9 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - persistence/src/main/models/Observe.model - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-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 Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -41,6 +41,7 @@ DateTimeEditor { CoordinatesEditor { bean: {bean}; displayZeroWhenNull: true; + showGlobalResetButton:true; } NumberEditor { ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -626,7 +626,7 @@ public class DecoratorService extends DecoratorProvider { @Override public void initSpeciesDto() { registerDecorator(new SpeciesDecorator()); - registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s"); + registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s"); } @Override ===================================== persistence/src/main/models/Observe.model ===================================== @@ -72,10 +72,10 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float setLongline + {0..1} longline.SetLongline | dbName=set -encounter + {*} longline.Encounter | reverseDbName=activity +encounter + {*} longline.Encounter | reverseDbName=activity orderBy=topiaCreateDate vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false dataQuality {*:0..1} referentiel.DataQuality -sensorUsed + {*} longline.SensorUsed | reverseDbName=activity +sensorUsed + {*} longline.SensorUsed | reverseDbName=activity orderBy=topiaCreateDate fpaZone {*:1} referentiel.FpaZone getDate() Date getTime() Date @@ -153,14 +153,14 @@ basket {*:0..1} longline.Basket branchline {*:0..1} longline.Branchline catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate discardHealthness {*:1} referentiel.longline.Healthness -sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch +sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate speciesCatch {*:1} referentiel.Species predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch section {*:0..1} longline.Section maturityStatus {*:0..1} referentiel.longline.MaturityStatus stomacFullness {*:0..1} referentiel.longline.StomacFullness hookPosition {*:0..1} referentiel.longline.HookPosition -weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch +weightMeasure + {*} longline.WeightMeasure | reverseDbName=catch orderBy=topiaCreateDate catchHealthness {*:1} referentiel.longline.Healthness sex {*:0..1} referentiel.Sex @@ -242,18 +242,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} longline.BaitsComposition | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set -hooksComposition + {*} longline.HooksComposition | reverseDbName=set +baitsComposition + {*} longline.BaitsComposition | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesComposition | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksComposition | reverseDbName=set orderBy=topiaCreateDate section + {*} longline.Section | unique orderBy=settingIdentifier reverseDbName=set settingShape {*:1} referentiel.longline.SettingShape -tdr + {*} longline.Tdr | reverseDbName=set +tdr + {*} longline.Tdr | reverseDbName=set orderBy=topiaCreateDate catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -312,7 +312,7 @@ maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} longline.Branchline -tdrRecord + {*} longline.TdrRecord +tdrRecord + {*} longline.TdrRecord | orderBy=topiaCreateDate sensorBrand {*:0..1} referentiel.longline.SensorBrand species {*:*} referentiel.Species section {*:0..1} longline.Section @@ -671,8 +671,8 @@ isActivityFinDePeche() boolean isChangedZoneOperation() boolean seine.FloatingObject > CommentableEntity | entity -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate -objectObservedSpecies + {*} seine.ObjectObservedSpecies +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate objectOperation {*:1} referentiel.seine.ObjectOperation supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique @@ -793,7 +793,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set targetSample + {*} seine.TargetSample | unique reverseDbName=set targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set hasTargetCatch() boolean hasRejetThon() boolean ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml ===================================== @@ -98,7 +98,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -112,16 +112,6 @@ </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,16 +127,6 @@ </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/ActivityLonglineDto-update-error-validation.xml ===================================== @@ -84,7 +84,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -98,17 +98,6 @@ </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/> @@ -124,16 +113,6 @@ </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/SetLonglineDto-create-error-validation.xml ===================================== @@ -211,7 +211,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -225,16 +225,6 @@ </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/> @@ -250,16 +240,6 @@ </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/> @@ -277,7 +257,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -291,16 +271,6 @@ </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/> @@ -316,16 +286,6 @@ </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/> @@ -343,7 +303,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -357,16 +317,6 @@ </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/> @@ -382,16 +332,6 @@ </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/> @@ -409,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -423,16 +363,6 @@ </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/> @@ -448,16 +378,6 @@ </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/SetLonglineDto-update-error-validation.xml ===================================== @@ -234,35 +234,28 @@ </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 type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">settingStart</param> + <message/> + </field-validator> + + </field> + + <field name="settingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator>  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">settingStart</param> - <message/> - </field-validator> - </field> <field name="settingEndLatitude"> @@ -273,16 +266,6 @@ </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/> @@ -298,35 +281,28 @@ </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 type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">settingEnd</param> + <message/> + </field-validator> + + </field> + + <field name="settingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator>  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">settingEnd</param> - <message/> - </field-validator> - </field> <field name="haulingStartLatitude"> @@ -337,16 +313,6 @@ </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/> @@ -362,35 +328,27 @@ </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 type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">haulingStart</param> + <message/> + </field-validator> + + </field> + <field name="haulingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator>  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">haulingStart</param> - <message/> - </field-validator> - </field> @@ -402,16 +360,6 @@ </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/> @@ -427,35 +375,28 @@ </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 type="coordinateLongitudeDto" short-circuit="true"> + <param name="editorName">haulingEnd</param> + <message/> + </field-validator> + + </field> + + <field name="haulingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> </field-validator>  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> - <param name="editorName">haulingEnd</param> - <message/> - </field-validator> - </field> <field name="settingShape"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -193,16 +193,6 @@ </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/> @@ -218,16 +208,6 @@ </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 ===================================== @@ -51,17 +51,6 @@ </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/> @@ -77,16 +66,6 @@ </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/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56484c2af6d4afcdc955996a7b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/56484c2af6d4afcdc955996a7b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Revoir le rapport utilisation des dcp - Closes #1082
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 870e6d69 by Tony CHEMIT at 2018-10-14T14:27:34Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - 5ee3d3e9 by Tony CHEMIT at 2018-10-14T14:27:37Z Realign database model version to 7.0 - - - - - 56484c2a by Tony CHEMIT at 2018-10-14T14:28:12Z update pom - - - - - 30 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_3.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_6.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - persistence/src/main/resources/db/migration/7.0/01_fill_non_target_sample_size_measure_type-common.sql → persistence/src/main/resources/db/migration/6.3/01_fill_non_target_sample_size_measure_type-common.sql - persistence/src/main/resources/db/migration/7.0/02_add_data_quality-common.sql → persistence/src/main/resources/db/migration/6.3/02_add_data_quality-common.sql - persistence/src/main/resources/db/migration/7.0/03_add_order_on_seine_catches-common.sql → persistence/src/main/resources/db/migration/6.3/03_add_order_on_seine_catches-common.sql - persistence/src/main/resources/db/migration/7.0/04_add_order_on_seine_samples-common.sql → persistence/src/main/resources/db/migration/6.3/04_add_order_on_seine_samples-common.sql - persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql → persistence/src/main/resources/db/migration/6.4/01_add_non_target_catch_release_status-H2.sql - persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql → persistence/src/main/resources/db/migration/6.4/01_add_non_target_catch_release_status-PG.sql - persistence/src/main/resources/db/migration/7.2/02_add_non_target_catch_release_conformity-H2.sql → persistence/src/main/resources/db/migration/6.5/02_add_non_target_catch_release_conformity-H2.sql - persistence/src/main/resources/db/migration/7.2/02_add_non_target_catch_release_conformity-PG.sql → persistence/src/main/resources/db/migration/6.5/02_add_non_target_catch_release_conformity-PG.sql - persistence/src/main/resources/db/migration/7.2/03_add_non_target_catch_releasing_time-H2.sql → persistence/src/main/resources/db/migration/6.5/03_add_non_target_catch_releasing_time-H2.sql - persistence/src/main/resources/db/migration/7.2/03_add_non_target_catch_releasing_time-PG.sql → persistence/src/main/resources/db/migration/6.5/03_add_non_target_catch_releasing_time-PG.sql - persistence/src/main/resources/db/migration/7.2/04_update_non_target_catch_release_status-common.sql → persistence/src/main/resources/db/migration/6.5/04_update_non_target_catch_release_status-common.sql - persistence/src/main/resources/db/migration/7.2/05_remove_species_group_release_mode_value-common.sql → persistence/src/main/resources/db/migration/6.5/05_remove_species_group_release_mode_value-common.sql - persistence/src/main/resources/db/migration/7.2/06_fix_species_group_release_mode_for_cetaceans-common.sql → persistence/src/main/resources/db/migration/6.5/06_fix_species_group_release_mode_for_cetaceans-common.sql - persistence/src/main/resources/db/migration/7.2/07_update_observed_system-common.sql → persistence/src/main/resources/db/migration/6.5/07_update_observed_system-common.sql - persistence/src/main/resources/db/migration/7.3/01_remove_one_size_measure_type-common.sql → persistence/src/main/resources/db/migration/6.6/01_remove_one_size_measure_type-common.sql - persistence/src/main/resources/db/migration/7.3/02_add_length_length_parameter_fields-common.sql → persistence/src/main/resources/db/migration/6.6/02_add_length_length_parameter_fields-common.sql - persistence/src/main/resources/db/migration/7.5/01_add_speciesRelease-common.sql → persistence/src/main/resources/db/migration/7.0/01_add_speciesRelease-common.sql - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties - − test/src/main/resources/db/6.901/dataForTestLongline.sql.gz - − test/src/main/resources/db/6.901/dataForTestSeine.sql.gz - − test/src/main/resources/db/6.901/empty_h2.sql.gz - − test/src/main/resources/db/6.901/empty_pg.sql.gz - − test/src/main/resources/db/6.901/referentiel.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cbfcbf93054073af433e1e6ab9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cbfcbf93054073af433e1e6ab9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a640b3f6 by Tony CHEMIT at 2018-10-14T13:49:34Z update changelog - - - - - 8 changed files: - .mvn/gitlab-cache/milestones/532657-issues.json - .mvn/gitlab-cache/milestones/532657.json - + .mvn/gitlab-cache/milestones/655988-artifacts.json - .mvn/gitlab-cache/milestones/655988-issues.json - .mvn/gitlab-cache/milestones/655988.json - + .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/674086.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/532657-issues.json ===================================== @@ -1,4 +1,1473 @@ [ + { + "id": 14656735, + "iid": 1111, + "projectId": 2722779, + "title": "[V8-A3] Ne peut pas créer d\u0027échantillon LL Logbook dans cette base", + "description": "Ne peut pas créer d\u0027échantillon LL Logbook dans la base en PJ : [v8a3-pb-creation-echantillon.sql.gz](/uploads/856bda2382134e3287bedd19ea2347d2/v8a3-pb-creation-echantillon.sql.gz)\n\nLog (voir entre 17h31 et 17h33) : [observe-8.0-alpha-3-SNAPSHOT.log](/uploads/4a00fcba2ff5dd42c4e9937c6ee5d4d1/observe-8.0-alpha-3-SNAPSHOT.log)", + "labels": [ + "IRD-2018-01-V8", + "Normal", + "Palangre" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 3, 2018 3:39:55 PM", + "createdAt": "Oct 3, 2018 3:37:13 PM" + }, + { + "id": 14763631, + "iid": 1138, + "projectId": 2722779, + "title": "Internationaliser le référentiel port", + "description": "Internationaliser la table ports.\n\nPour la migration, copier dans label1, label2 et label3 le contenu actuel de name.", + "labels": [ + "Bas", + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 13, 2018 3:22:13 PM", + "createdAt": "Oct 8, 2018 11:57:35 AM" + }, + { + "id": 14713375, + "iid": 1119, + "projectId": 2722779, + "title": "Permettre ou faciliter la sélection du quadrant au clavier", + "description": "Permettre ou faciliter la sélection du quadrant au clavier. Il ne semble pas y avoir actuellement de raccourcis clavier vers les 4 boutons.", + "labels": [ + "Bas", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 5, 2018 8:22:25 PM", + "createdAt": "Oct 5, 2018 12:08:41 PM" + }, + { + "id": 14762827, + "iid": 1137, + "projectId": 2722779, + "title": "[LL] Débarquements : petits ajustements 2", + "description": "Apport d\u0027une correction et d\u0027une idée nouvelle par rapport à #1121.\r\n\r\n* il existe déjà le code port \"39 - Transbordement en mer\", je l\u0027avais raté, donc la création du code \"998 - Transbordement\" demandée dans #1121 n\u0027est pas pertinente. Si tu l\u0027a ajouté dans le processus de migration, il faut le retirer.\r\n* Pour faciliter la création d\u0027un transbordement, on pourrait avoir, à droite du champ \"bateau destinataire\", un bouton qui pré sélectionnerait :\r\n * le bateau inconnu (code 99, topiaid fr.ird.observe.entities.referentiel.Vessel#1308214144311#0.8813727202637713)\r\n * le port Transbordement (code 39, topiaid fr.ird.observe.entities.referentiel.Harbour#11#0.38)\r\n\r\nLe bouton pourrait porter le nom \"Transbordement en mer\" / \"Transshipment at sea\" / \"Transbordo en el mar\"", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 8, 2018 3:12:23 PM", + "createdAt": "Oct 8, 2018 11:22:37 AM" + }, + { + "id": 14734845, + "iid": 1135, + "projectId": 2722779, + "title": "[LL] Marée : redondance des listes Type de marée", + "description": "Sur les 3 onglets du formulaire marée apparaissent 3 listes de type de marée, avec de la redondance :\n\nCaractéristiques générales : table TripType\n\n![image](/uploads/cfd0280f852d166127953f8488141798/image.png)\n\nCaractéristiques observations : table ObservationTripType\n\n![image](/uploads/ceb02fed33d776495b662cf344f84c77/image.png)\n\nCaractéristiques logbook: table LogbookTripType\n\n![image](/uploads/d1f8198b71d923b25803562a1c7e4ad8/image.png)\n\nOn souhaite :\n* Garder la liste sur l\u0027onglet Caractéristiques générales (table de référence TripType). Ses 2 seules entrées seront :\n * Scientifique\n * Commerciale\n* Garder la liste sur l\u0027onglet Caractéristiques d\u0027observation (table de référence ObservationTripType, à renommer ObservationMethod). Ses 2 seules entrées seront :\n * Observateur\n * Équipage (auto-échantillonnée)\n* Supprimer la liste de l\u0027onglet Caractéristiques logbook (et supprimer la table LogbookTripType)", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 10, 2018 12:30:21 PM", + "createdAt": "Oct 6, 2018 10:56:48 AM" + }, + { + "id": 14728408, + "iid": 1134, + "projectId": 2722779, + "title": "[LL] Echantillons consignés au niveau marée : Petits ajustements", + "description": "Sur ce formulaire, la position n\u0027est utile que dans un cas bien particulier (marées dites industrielles). Donc elle doit être facultative.\n\nDe plus, comme spécifié ici #1133 , il doit être possible de réinitialiser (nuller) les valeurs du widget facilement.\n\n![image](/uploads/dc011214d2b9249b1a9b05e5dbc81f7a/image.png)", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 7, 2018 7:31:33 PM", + "createdAt": "Oct 5, 2018 10:08:13 PM" + }, + { + "id": 14728227, + "iid": 1133, + "projectId": 2722779, + "title": "[LL][PS] Améliorer le widget position", + "description": "Ajouter un bouton ![image](/uploads/555238eaa9c88463dab2897137e364a1/image.png) qui permette de mettre à null toutes les valeurs (quadrant, latitude, longitude).\n\nCe besoin provient des logbooks et échantillons LL, pour lesquels plusieurs positions sont facultatives. Or sans ce bouton réinitialiser le quandrant n\u0027est actuellement pas possible, et réinitialiser les valeurs du masque assez pénible.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 6, 2018 4:13:48 PM", + "createdAt": "Oct 5, 2018 9:53:41 PM" + }, + { + "id": 14727903, + "iid": 1132, + "projectId": 2722779, + "title": "[LL] Echantillons : Petits ajustements", + "description": "Sur le formulaire échantillons, sur celui proposé au niveau marée comme sur celui proposé au niveau Opération de pêche :\n* Sexe par défaut : \"Non collecté\"\n* Méthode de mesure de taille par défaut si une taille est saisie : \"Pied à coulisse\"\n* Méthode de mesure de taille par défaut si aucune taille saisie : null\n* Méthode de mesure de poids par défaut si un poids est saisi : \"Balance\"\n* Méthode de mesure de poids par défaut si aucun poids saisi : null\n\n[En attente de confirmation pour la méthode de mesure]", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 9, 2018 6:29:51 PM", + "createdAt": "Oct 5, 2018 9:34:12 PM" + }, + { + "id": 14727850, + "iid": 1131, + "projectId": 2722779, + "title": "[LL][PS] Dans le widget liste déroulante d\u0027espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante", + "description": "Dans le widget liste déroulante d\u0027espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 6, 2018 6:34:33 PM", + "createdAt": "Oct 5, 2018 9:30:44 PM" + }, + { + "id": 14727820, + "iid": 1130, + "projectId": 2722779, + "title": "[LL] Créer une liste d\u0027affichage d\u0027espèces propre aux captures, débarquements et échantillons LL Logbooks", + "description": "Créer une liste d\u0027affichage d\u0027espèces qui sera propre aux captures, débarquements et échantillons LL Logbooks (différente de la liste existante dédiée aux LL Observations).\n\nJuliette doit fournir la liste d\u0027espèces à y faire figurer.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 8, 2018 12:03:59 PM", + "createdAt": "Oct 5, 2018 9:28:31 PM" + }, + { + "id": 14727747, + "iid": 1129, + "projectId": 2722779, + "title": "[LL] Capture : petits ajustements", + "description": "* Mode saisie groupée par défaut\n* Santé à la capture par défaut : UNK (inconnu)\n* Prévoir une liste d\u0027affichage d\u0027espèces propre à ce formulaire. Voir #1130 \n* Dans la liste déroulante d\u0027espèces, après le code FAO et le mon scientifique, ajouter le nom commun (vernaculaire) dans la langue courante. Voir #1131 \n* Dans le tableau récapitulatif des captures, ajouter les colonnes \"déprédaté? (yes/no)\" et \"nombre de déprédatés\"", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 9, 2018 6:26:03 PM", + "createdAt": "Oct 5, 2018 9:23:50 PM" + }, + { + "id": 14727652, + "iid": 1128, + "projectId": 2722779, + "title": "[LL] Composition globale de la palangre : petits ajustements", + "description": "Orins :\n* Type peut rester obligatoire, mais il faut rajouter dans la liste une entrée UNK / Inonnu / Unknown / Desconocido et la sélectionner par défaut\n* Proportion par défaut : 100%\n\nAvançons :\n* Type haut et bas peuvent rester obligatoire, mais il faut sélectionner par défaut l\u0027entrée UNK (dont la création est demandée ci-dessus)\n* Proportion par défaut : 100%\n\nHameçons :\n* Type : ajouter une entrée UNK / Inonnu / Unknown / Desconocido et la sélectionner par défaut\n* Taille : valeur UNK par défaut (existe déjà)\n* Proportion par défaut : 100%\n\nAppâts :\n* Proportion par défaut : 100%", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 7, 2018 3:11:52 PM", + "createdAt": "Oct 5, 2018 9:16:18 PM" + }, + { + "id": 14727558, + "iid": 1127, + "projectId": 2722779, + "title": "[LL] La position d\u0027activité devrait-elle est optionnelle ?", + "description": "Ce pourrait être nécessaires pour les activités hors ZEE, pour lesquelles les bateaux ne fournissent pas toujours les positions.\n\nCas en cours d\u0027investigation...", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 5, 2018 9:09:04 PM", + "createdAt": "Oct 5, 2018 9:08:48 PM" + }, + { + "id": 14726783, + "iid": 1126, + "projectId": 2722779, + "title": "[LL] Opération de pêche : petits ajustements", + "description": "Onglet caractéristiques :\n* Nombre total de sections : valeur par défaut \"1\"\n* nombre total de sections : optionnel avec warning\n* nombre de paniers/section: optionnel avec warning\n* nombre d\u0027hameçons/panier : optionnel avec warning\n\nOnglet Cyalumes :\n* Renommer onglet \"cyalumnes\" en \"cyalumes\"\n* Changer \"nombre de cyalumes/panier\", en \"Nombre total de cyalumes\" / \"Total number of lightsticks\" / \"Número total de barras de luz\". Le champ en base devrait être renommé en conséquence.\n\nOnglet Virage :\n* Sens du virage : autoriser la valeur \"Indéterminé\" + mettre la valeur \"Indéterminé\" par défaut dans ce champ", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 8, 2018 12:07:02 PM", + "createdAt": "Oct 5, 2018 8:34:34 PM" + }, + { + "id": 14725849, + "iid": 1125, + "projectId": 2722779, + "title": "[LL] Opération de pêche : recopie de propriétés", + "description": "Les propriétés de la palangre sont très souvent identiques d\u0027un coup de pêche à l\u0027autre.\n\nPour accélérer la saisie, on souhaiterait, sur le formulaire opération de pêche, un bouton qui aurait pour effet de recopier les propriétés suivantes à partir de l\u0027opération de pêche chronologiquement précédente (de la même marée) :\n* Longueur totale de la ligne\n* Longueur de la ligne par panier\n* Distance entre avançons\n* Type de ligne\n* L\u0027intégralité du formulaire \"composition globale\"\n\nSi l\u0027opération de pêche est la première de la marée, le bouton est désactivé.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 7, 2018 7:27:14 PM", + "createdAt": "Oct 5, 2018 7:55:33 PM" + }, + { + "id": 14725682, + "iid": 1124, + "projectId": 2722779, + "title": "[LL] Marée : Petits ajustements", + "description": "**Onglet Caractéristiques**\n\n* Entre les champs date début et date fin, on aimerait intercaler un champ informatif, non éditable, non persité, qui indique le nombre de jours correspondant (Durée (jours) / Duration \u0027days) / Duración (días)\n* Supprimer le champ (actuellement persisté) \"Nombre d\u0027opérations de pêche\"\n* Le remplacer par un champ informatif, non éditable, non persisté, de même nom, qui indique le nombre d\u0027opération de pêche obtenu par sommation du nombre d\u0027activités de type opération de pêche\n* Renommer \"Nombre d\u0027équipages\" en \"Nombre de membres d\u0027équipage\"\n\n* Id Métier : Selon faisabilité. Ce champ est et doit rester alphanumérique. On aimerait toutefois rajouter à l\u0027extrémité droite un bouton qui permettre d\u0027auto générer, au besoin, un identifiant \"unique\" facilement lisible. L\u0027utilisation de ce bouton sera optionnel et il resterait possible d\u0027attribuer un id manuellement, alphanumérique. On pense :\n * aux générateurs d\u0027identifiants courts du type de ceux utilisés pour générer les URL abrégées : https://hashids.org/\n * aux générateurs utilisant un dictionnaire de nom et d\u0027adjectifs : https://www.npmjs.com/package/human-readable-ids\n\n**Onglet Caractéristiques Logbook**\n\n* Type de marée doit être obligatoire\n* Opérateur de saisie doit être obligatoire\n* Supprimer le champ Suspicious data (redondant avec la liste Qualité des données)", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 6, 2018 10:11:48 AM", + "createdAt": "Oct 5, 2018 7:43:10 PM" + }, + { + "id": 14724922, + "iid": 1123, + "projectId": 2722779, + "title": "[LL] Attribution de codes aux états de conservation", + "description": "Table observe_longline.Conservation : attribuer les codes (champ code) suivants aux entrées :\n* Frais : FRESH\n* Congelé : FROZEN\n* Séché (ajouté spécifié dans #1121) : DRIED", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 6, 2018 4:13:48 PM", + "createdAt": "Oct 5, 2018 7:00:24 PM" + }, + { + "id": 14715026, + "iid": 1122, + "projectId": 2722779, + "title": "[LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements", + "description": "", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 5, 2018 1:31:54 PM", + "createdAt": "Oct 5, 2018 1:31:54 PM" + }, + { + "id": 14714946, + "iid": 1121, + "projectId": 2722779, + "title": "[LL] Débarquements : petits ajustements", + "description": "Sur le formulaire débarquements :\n* Renommer le champ \"Compagnie siège du traitement\" en \"Destination\"\n* La liste des bateaux doit être limitée au type : cargos (10) et Inconnu (99)\n* Dans le but de gérer correctement les transbordements en mer : dans la liste des ports ajouter un port 998 / \"Transbordement en mer\" / \"At sea transshipment\" / \"Transbordo en el mar\". La combinaison CARGO + AT SEA TRANSHIPMENT permettra de notifier un transbordement\n* Etat de conservation : dans la liste sous-jacente ajouter l\u0027entrée DRIED / \"Séché\" / \"Dried\" / \"Secado\"\n* Rendre optionnelles les bornes min/max de la catégorie de poids, sans warning\n* Rendre optionnel le champ Nombre, sans warning\n* Méthode de mesure de poids par défaut : Balance (à placer dans la conf de l\u0027appli)", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 8, 2018 1:35:52 PM", + "createdAt": "Oct 5, 2018 1:28:40 PM" + }, + { + "id": 14714463, + "iid": 1120, + "projectId": 2722779, + "title": "[LL] Rendre fonctionnels les boutons \"Déplacer échantillon\"", + "description": "Rendre fonctionnels les boutons \"Déplacer échantillon\" :\n* du trip vers un set (proposer liste des sets)\n* d\u0027un set vers le trip", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 10, 2018 4:49:27 PM", + "createdAt": "Oct 5, 2018 12:59:01 PM" + }, + { + "id": 14687420, + "iid": 1118, + "projectId": 2722779, + "title": "[LL] Activité : Petits ajustements", + "description": "Ajouter :\n* sous \"Vitesse vent\", \"Direction du vent (°)\" / \"Wind direction (°)\" / \"Dirección del viento (°)\" (validation : 0 à 359°, null autorisé)\n* \"Vitesse du courant (nd)\" / \"Current speed (kt)\" / \"Current speed (kt) #TODO\" (validation : 0 à 20 kt, null autorisé)\n* Direction du courant (°) / \"Current direction (°) / \"Current direction (°) #TODO\" (validation : 0 à 359°, null autorisé)\n* champ et liste Qualité des données (table de référence observe_common.DataQuality). Valeur par défaut \"Très bon\"\n* liste déroulante des activités observées disponibles dans cette marée (afficher dans la liste dates+heures+positions+types) pour pouvoir établir le lien avec l\u0027activité idoine. Le renseignement de ce champ sera par ailleurs assisté par l\u0027assistant d\u0027appariement d\u0027activités", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 7, 2018 6:54:53 PM", + "createdAt": "Oct 4, 2018 1:09:22 PM" + }, + { + "id": 14687293, + "iid": 1117, + "projectId": 2722779, + "title": "[LL] Correction de libellés", + "description": "Cyalumnes -\u003e Cyalumes :\n![image](/uploads/f54ddcc99c561a090a788d8dd840e329/image.png)", + "labels": [ + "Anomalie", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 7, 2018 7:01:29 PM", + "createdAt": "Oct 4, 2018 1:04:44 PM" + }, + { + "id": 14680204, + "iid": 1116, + "projectId": 2722779, + "title": "[LL] Opération de pêche / Caractéristiques générales : champs requis et champs optionnels", + "description": "Devraient être optionnels sans warning :\n* nombre total de sections\n* nombre de paniers/section\n* nombre d\u0027hameçons/panier", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 5, 2018 9:00:44 PM", + "createdAt": "Oct 4, 2018 12:50:04 PM" + }, + { + "id": 14679423, + "iid": 1115, + "projectId": 2722779, + "title": "[LL] Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires", + "description": "Les positions géographiques de fin de filage, début et fin de virage ne doivent pas être obligatoires. Leur mettre un warning.", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 8, 2018 12:05:30 PM", + "createdAt": "Oct 4, 2018 12:45:46 PM" + }, + { + "id": 14679291, + "iid": 1114, + "projectId": 2722779, + "title": "[LL] Retirer le champ Marée/Nombre total d\u0027opérations de pêche ?", + "description": "", + "labels": [ + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 5, 2018 9:10:04 PM", + "createdAt": "Oct 4, 2018 12:38:51 PM" + }, + { + "id": 14671107, + "iid": 1113, + "projectId": 2722779, + "title": "Fix some coordinates validation", + "description": "There is some missing validation on coordinate data, I will fix them (activities, set).", + "labels": [ + "Anomalie", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 4, 2018 9:24:56 AM", + "createdAt": "Oct 4, 2018 8:46:05 AM" + }, + { + "id": 14659845, + "iid": 1112, + "projectId": 2722779, + "title": "Some data (in table forms) order is not deterministic", + "description": "For example in Encounters form, when you save the hole form, then the last modified entry is always the last entry after save.\nFor all such data when we did not implements an order (catches,samples,...), we should always use the **topiaCreateDate** technical field to sort incoming data.", + "labels": [ + "Anomalie", + "Contrat Code Lutin-2016" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 5:36:54 PM", + "createdAt": "Oct 3, 2018 5:31:54 PM" + }, + { + "id": 14636532, + "iid": 1108, + "projectId": 2722779, + "title": "[V8] L\u0027enregistrement d\u0027une activité logbook LL échoue lorsque l\u0027on tente des créer des activités logbook dans une marée issue d\u0027une marée d\u0027observation saisie en V5", + "description": "L\u0027enregistrement d\u0027une activité logbook LL échoue lorsque l\u0027on tente des créer des activités logbook dans une marée issue d\u0027une marée d\u0027observation saisie en V5 et migrée en V8.\n\nA contrario l\u0027enregistrement d\u0027un activité logbook LL dans une marée fraichement créée en V8 (sans données d\u0027observation) fonctionne bien.\n\nOn ne sait pas si c\u0027est anormal ou si c\u0027est la limite actuelle de cette version préliminaire, auquel cas ignorer ce ticket.\n\nLog : [observe-8.0-alpha-3-SNAPSHOT.log](/uploads/7974c56f248ce11146a3ee3f1abced59/observe-8.0-alpha-3-SNAPSHOT.log)", + "labels": [ + "Anomalie", + "IRD-2018-01-V8", + "Palangre" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 5:36:54 PM", + "createdAt": "Oct 2, 2018 6:52:59 PM" + }, + { + "id": 12729061, + "iid": 1031, + "projectId": 2722779, + "title": "Création de nouvelles icônes de navigation", + "description": "", + "labels": [ + "IRD-2018-01-V8", + "Tâche" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 12, 2018 10:50:37 PM", + "createdAt": "Jul 13, 2018 2:18:33 PM" + }, + { + "id": 9963535, + "iid": 918, + "projectId": 2722779, + "title": "Déplacement de groupes de données", + "description": "Comme cela a été évoqué précédemment dans ce document, il faut permettre, par clic droit, de\ndéplacer les groupes « données d’observation », « logbooks », « échantillons » d’une marée à l’autre.\n\nExactement comme l’on peut, actuellement, déplacer une marée de programme par le menu contextuel. \n\nCeci entraînera nécessairement la perte des appariements entre activités d’observation et\nlogbooks s’il y en avait. Par contre on fera suivre si possible les champs de la table Activité relatifs à\nces groupes (données des onglets Caractéristiques d’observation et Caractéristiques logbooks).\n\nLes déplacements possibles seront :\n * Déplacer le logbook d’une marée vers une autre\n * Déplacer les débarquements d’une marée vers une autre\n * Déplacer les échantillons :\n * de la racine de la marée vers une opération de pêche (de la même marée ou d’une autre)\n * d’une opération de pêche vers la racine de la marée (ou d’une autre marée)\n * d’une opération de pêche vers une autre opération de pêche (de la même marée ou d’un autre)", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 8, 2018 12:08:30 PM", + "createdAt": "Mar 27, 2018 3:49:17 PM" + }, { "id": 9962937, "iid": 915, @@ -15,9 +1484,9 @@ "projectId": 2722779, "groupId": 0, "title": "8.0-alpha-4", - "description": "Dernier lot du contrat IRD-2018-01-V8", - "dueDate": "Jun 8, 2018 2:00:00 AM", - "startDate": "May 31, 2018 2:00:00 AM", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", "state": "active" }, "assignee": { @@ -47,5 +1516,152 @@ "state": "opened", "updatedAt": "May 24, 2018 10:46:25 AM", "createdAt": "Mar 27, 2018 3:13:54 PM" + }, + { + "id": 9962673, + "iid": 914, + "projectId": 2722779, + "title": "Gestion des transbordements", + "description": "Les transbordements seront gérés comme des débarquements, en indiquant comme destination du\ndébarquement l’identité d’un bateau. Le formulaire destiné aux débarquements devra donc\ncomporter une liste déroulante alimentée par la table observe_common.vessel.\n\nUn marqueur débarquement/transbordement serait peut-être pertinent sur le formulaire débarquement", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 7, 2018 7:02:14 PM", + "createdAt": "Mar 27, 2018 2:54:56 PM" + }, + { + "id": 9961323, + "iid": 908, + "projectId": 2722779, + "title": "Nouvelle action « Apparier les activités logbook/observations »", + "description": "La liste déroulante des activités d’observation sur l\u0027écran d\u0027une activité Logbook potentiellement rattachables pourra être saisie\nmanuellement ou via un algorithme d’appariement.\n\nCet algorithme sera accessible par un menu Actions/apparier les activités logbook/observations :\n * Soit un intervalle de temps d’approximation ta, paramétrable depuis la configuration. Valeur par défaut 30min.\n * Soit une distance spatiale d’approximation (en miles ou km) da, paramétrable depuis la configuration. Valeur par défaut 50km.\n * L’assistant permet d’abord de décider d’écraser ou de laisser en l’état les appariements déjà existants (case à cocher)\n * Pour chaque activité logbook de la marée, rechercher l’activité de même type la plus proche dans les données d’observation :\n * Le temps (date/heure d’observation) est le critère prioritaire : l’activité d’observation la plus proche temporellement gagne\n * Vérifier que l’activité élue satisfait aux seuils maximums ta et da\n * L’assistant présente le résultat de la mise en correspondance avant application et permet à\nl’utilisateur de modifier une à une les associations s’il le souhaite. Typiquement un tableau à\ndeux colonnes présente à gauche la liste des activités logbook, et à droite, en regard de chaque\nactivité, une liste déroulante contenant toutes les activités d’observation de même type, avec\nla plus probable sélectionnée par défaut\n * Une fois les propositions passées en revue et éventuellement modifiées, l’utilisateur peut choisir d’appliquer ou d’annuler", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "opened", + "updatedAt": "Oct 7, 2018 6:00:54 PM", + "createdAt": "Mar 27, 2018 1:27:27 PM" + }, + { + "id": 9960458, + "iid": 901, + "projectId": 2722779, + "title": "Amélioration du composant de cartographie", + "description": "Sur la carte on ajoute également deux boutons Zoom+/Zoom- pour faciliter le zoom lorsque l’on n’a pas\nde molette. \nLe Zoom- est limité de sorte à ce que le planisphère occupe pleinement hauteur ou largeur.", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532657, + "iid": 115, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-4", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", + "state": "active" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 12, 2018 10:50:36 PM", + "createdAt": "Mar 27, 2018 12:29:15 PM" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/532657.json ===================================== @@ -4,8 +4,8 @@ "projectId": 2722779, "groupId": 0, "title": "8.0-alpha-4", - "description": "Dernier lot du contrat IRD-2018-01-V8", - "dueDate": "Jun 8, 2018 2:00:00 AM", - "startDate": "May 31, 2018 2:00:00 AM", + "description": "Seconde partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient fonctionnalités avancées.", + "dueDate": "Sep 30, 2018 2:00:00 AM", + "startDate": "Sep 17, 2018 2:00:00 AM", "state": "active" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/655988-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application (SNAPSHOT)", + "filename": "observe-7.0.0-SNAPSHOT.zip", + "url": "https://ultreia.io/release/observe-7.0.0-SNAPSHOT.zip" + }, + { + "name": "Serveur (SNAPSHOT)", + "filename": "observe-7.0.0-SNAPSHOT.war", + "url": "https://ultreia.io/release/observe-7.0.0-SNAPSHOT.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/655988-issues.json ===================================== @@ -1 +1,554 @@ -[] \ No newline at end of file +[ + { + "id": 14867405, + "iid": 1142, + "projectId": 2722779, + "title": "Problème d\u0027affichage dans l\u0027UI référentiel relations taille-poids", + "description": "Repris des commentaires de : #637 \n\n**Exemple**\n\nCette relation taille-poids (fr.ird.observe.entities.referentiel.LengthWeightParameter#201008191245#0.19) :\n![image](/uploads/eb9e0678539190db49d33e4fce1c217d/image.png)\n\na un poids moyen associé, mais il ne s\u0027affiche pas dans l\u0027UI :\n![image](/uploads/5f6a6bb509e5e9a492be9e4f7a79f8b2/image.png)\n\nIl semble qu\u0027il y ai aussi le même problème sur le champ \"Taille moyenne\".", + "labels": [ + "Anomalie", + "Contrat Code Lutin-2016", + "Haut" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 10:11:16 AM", + "createdAt": "Oct 11, 2018 7:14:24 PM" + }, + { + "id": 14866402, + "iid": 1140, + "projectId": 2722779, + "title": "Création de profils de connexions : cosmétique", + "description": "Lors de la création d\u0027une connexion, supprimer le libellé par défaut \"Change me\" :\n![image](/uploads/cf69c89e9a0648ff2b97929a6f435814/image.png)\n\nOn en avait parlé ici : #842 \n\nPar ailleurs, en cours de création de connexion, il serait pratique d\u0027avoir un bouton \"Annuler\", au cas où on se ravise (car il nous manque une info pour compléter le profil par exemple).", + "labels": [ + "Bas", + "Contrat AZTI-2017", + "Evolution" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 10:56:04 AM", + "createdAt": "Oct 11, 2018 6:26:45 PM" + }, + { + "id": 14561843, + "iid": 1102, + "projectId": 2722779, + "title": "Extension de fichier du rapport de validation", + "description": "Le rapport de validation est en format XML.\n\nPar défaut on propose une extension .txt\n\nNe serait-il pas plus logique de proposer par défaut .xml, .htm ou .html ?", + "labels": [ + "Bas", + "Contrat AZTI-2017", + "Contrat Code Lutin-2016", + "Evolution" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 5:23:40 AM", + "createdAt": "Sep 28, 2018 9:00:48 PM" + }, + { + "id": 14561211, + "iid": 1099, + "projectId": 2722779, + "title": "Petit renommage de libellé", + "description": "Le formulaire d\u0027opérations sur balise s\u0027est toujours appelé \"Opération sue l\u0027objet\" :\n\n![image](/uploads/4f26a7fb100f56b175d3914bc54981cc/image.png)\n\nCela n\u0027est pas clair, on voudrait le renommer \"Balise\" / \"Beacon\" / \"Baliza\"", + "labels": [ + "Bas", + "Contrat AZTI-2017", + "Evolution", + "À facturer" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 5:23:40 AM", + "createdAt": "Sep 28, 2018 8:14:55 PM" + }, + { + "id": 4425699, + "iid": 642, + "projectId": 2722779, + "title": "Limiter le Zoom- de la carte", + "description": "Serait-il possible de limiter le Zoom- sur les cartes de sorte à éviter un affichage du type de celui de la PJ ?\n\n\n*(from redmine issue 8662 created on 2016-10-14)*\n\n### Files\n * [picture802-1.png] (https://forge.codelutin.com/attachments/download/4138/picture802-1.png)", + "labels": [ + "Bas", + "Contrat Code Lutin-2016", + "Evolution", + "From Redmine", + "Livré" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 11:22:39 AM", + "createdAt": "Feb 17, 2017 1:54:03 PM" + }, + { + "id": 4425171, + "iid": 354, + "projectId": 2722779, + "title": "[PS] Ajouter un champ \"Numéro de cuve\", sur le formulaire des captures accessoires", + "description": "Ajouter un champ \"Numéro de cuve\", sur le formulaire des captures accessoires, sur le même principe que le n° de cuve sur les captures d\u0027espèces cibles\n\nCe champ reste optionnel.\n\n*(from redmine issue 6999 created on 2015-04-20, closed on 2016-10-28)*\n\n### Files\n * [picture554-1.png] (https://forge.codelutin.com/attachments/download/4395/picture554-1.png)", + "labels": [ + "Bas", + "Contrat Code Lutin-2016", + "Evolution", + "From Redmine", + "Livré" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 11:24:10 AM", + "createdAt": "Feb 17, 2017 1:32:04 PM" + }, + { + "id": 14867622, + "iid": 1143, + "projectId": 2722779, + "title": "[PS] Calée / Captures accessoires : le numéro de cuve n\u0027est plus éditable après le premier enregistrement", + "description": "Repris de #354 \n\nLe numéro de cuve n\u0027est plus éditable après le premier enregistrement\n\n![image](/uploads/efb459c917b3614564509ad71a029edc/image.png)\n\nA priori il n\u0027y a pas de raison d\u0027empêcher l\u0027édition.", + "labels": [ + "Anomalie", + "Contrat Code Lutin-2016" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 10:11:30 AM", + "createdAt": "Oct 11, 2018 7:31:05 PM" + }, + { + "id": 14867150, + "iid": 1141, + "projectId": 2722779, + "title": "Connexion HTTP probablement périmée", + "description": "En connexion serveur, après avoir laissé l\u0027UI inactive quelques minutes (15 minutes ?), un clic sur la marée a donné cette erreur :\n\n![image](/uploads/33cc155241ea69a0f88070a9e3438f1d/image.png)\n\nC\u0027est étonnant car normalement, une popup s\u0027affiche pour confirmer la demande de reconnexion.\n\nLog client (18h45) : [observe-7.0-RC-22.log](/uploads/f5dcd89b504166f595a7b28f08b950a6/observe-7.0-RC-22.log)\n\nLog serveur : [tomcat8-stderr.2018-10-11.log](/uploads/c2ef7738f5c960b302bc0e53ecc541bc/tomcat8-stderr.2018-10-11.log)", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 1:55:58 PM", + "createdAt": "Oct 11, 2018 6:53:05 PM" + }, + { + "id": 14749868, + "iid": 1136, + "projectId": 2722779, + "title": "[PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés", + "description": "Les mappings anciens types FAD / Nouveaux matériaux sont erronés. Plus étonnant, les traductions ancien types vers matériaux ne semblent pas toujours constants.\r\n\r\nLe mapping des opérations sur objet est, lui, correct.\r\nLe ciblage des champs \"en arrivant\" et \"en repartant\" en fonction du type d\u0027opération sur objet est lui aussi correct.\r\n\r\nSur les 510 exemples que j\u0027ai analysés en détails, les types d\u0027origine sont converties en [2-1-1-2 - Palmier, palme] ou [2-1-2-1 - Charogne].\r\n\r\nFichier de résultat des diagnostics : [comparaison-objets-v5-v7.xlsx](/uploads/f7c94f7bde94e8a743601070d5d484c0/comparaison-objets-v5-v7.xlsx)\r\n\r\nNote : J\u0027ai requêté la base v5 en SQL et vérifié les activités correspondantes en v7 visuellement dans l\u0027UI.\r\n\r\nRequête v5/v7 : [fad-type-operation-destiny-v5-v7.sql](/uploads/887e03864e262bf000cbf1ca34321e5c/fad-type-operation-destiny-v5-v7.sql)", + "labels": [ + "Anomalie", + "Contrat AZTI-2017" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 2:11:18 PM", + "createdAt": "Oct 7, 2018 4:27:27 PM" + }, + { + "id": 14561762, + "iid": 1101, + "projectId": 2722779, + "title": "[RAPPORTS] Les 4 requêtes sur espèces cibles ne fonctionnent pas", + "description": "Les 4 requêtes sur espèces cibles ne fonctionnent pas.\n\nCela est probablement du au fait qu\u0027elles font appel aux 2 types de mesures LD1 et LF, et que la gestion des types de mesures a changé en v7.\n\n![image](/uploads/1aeabb1b47fafc993456643e0e58a8e7/image.png)", + "labels": [ + "Anomalie", + "Contrat AZTI-2017", + "Contrat Code Lutin-2016" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 5:23:40 AM", + "createdAt": "Sep 28, 2018 8:52:05 PM" + }, + { + "id": 14412628, + "iid": 1082, + "projectId": 2722779, + "title": "Revoir le rapport utilisation des dcp", + "description": "Il ne fonctionne plus, il faudra me fournir un nouveau report.", + "labels": [ + "Contrat AZTI-2017", + "Evolution" + ], + "milestone": { + "id": 655988, + "iid": 126, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 14, 2018 3:34:55 PM", + "createdAt": "Sep 23, 2018 10:42:42 PM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/655988.json ===================================== @@ -3,6 +3,9 @@ "iid": 126, "projectId": 2722779, "groupId": 0, - "title": "7.0-RC-23", - "state": "active" + "title": "7.0.0", + "description": "", + "dueDate": "Oct 19, 2018 2:00:00 AM", + "startDate": "Sep 23, 2018 2:00:00 AM", + "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -0,0 +1 @@ +[] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086.json ===================================== @@ -0,0 +1,11 @@ +{ + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Oct 31, 2018 1:00:00 AM", + "startDate": "Oct 15, 2018 2:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-10-03 04:23. + * Last generated at 2018-10-14 15:49. ## Version [8.0-alpha-3](https://gitlab.com/ultreiaio/ird-observe/milestones/114) Première partie du troisième lot du contrat IRD-2018-01-V8.
contient les nouveaux écrans, mais aucune des fonctionnalités avancées. @@ -74,6 +74,27 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0.0](https://gitlab.com/ultreiaio/ird-observe/milestones/126) + +**Closed at 2018-10-19.** + +### Download +* [Application (SNAPSHOT) (observe-7.0.0-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.0-SNAPSHOT.zip) +* [Serveur (SNAPSHOT) (observe-7.0.0-SNAPSHOT.war)](https://ultreia.io/release/observe-7.0.0-SNAPSHOT.war) + +### Issues + * [[Anomalie 1101]](https://gitlab.com/ultreiaio/ird-observe/issues/1101) **[RAPPORTS] Les 4 requêtes sur espèces cibles ne fonctionnent pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1136]](https://gitlab.com/ultreiaio/ird-observe/issues/1136) **[PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1141]](https://gitlab.com/ultreiaio/ird-observe/issues/1141) **Connexion HTTP probablement périmée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1142]](https://gitlab.com/ultreiaio/ird-observe/issues/1142) **Problème d'affichage dans l'UI référentiel relations taille-poids** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1143]](https://gitlab.com/ultreiaio/ird-observe/issues/1143) **[PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 354]](https://gitlab.com/ultreiaio/ird-observe/issues/354) **[PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 642]](https://gitlab.com/ultreiaio/ird-observe/issues/642) **Limiter le Zoom- de la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1082]](https://gitlab.com/ultreiaio/ird-observe/issues/1082) **Revoir le rapport utilisation des dcp** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 1099]](https://gitlab.com/ultreiaio/ird-observe/issues/1099) **Petit renommage de libellé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1102]](https://gitlab.com/ultreiaio/ird-observe/issues/1102) **Extension de fichier du rapport de validation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1140]](https://gitlab.com/ultreiaio/ird-observe/issues/1140) **Création de profils de connexions : cosmétique** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0-RC-22](https://gitlab.com/ultreiaio/ird-observe/milestones/125) **Closed at 2018-09-22.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a640b3f669ff9014b923775fe1e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a640b3f669ff9014b923775fe1e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Revoir le rapport utilisation des dcp - Closes #1082
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: cbfcbf93 by Tony CHEMIT at 2018-10-14T13:34:45Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -124,23 +124,28 @@ report.dailySetAndCatch.request.1=0,0|row|\ report.dcpUsage.modelType=PS report.dcpUsage.name=Utilisation des DCP report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es +report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ - Select to.id \ - From TripSeineImpl m \ - Join m.route r \ - Join r.activitySeine a \ - Join a.floatingObject dcp \ - Join dcp.objectType to \ - Where \ - m.id In :tripId \ - Order by to.code + Select distinct (om.standardCode) \ + From ObjectMaterialImpl om \ + Where standardCode is not null \ + And standardCode != '' \ + And (Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.code) , ' - ', to.label2) \ - From ObjectTypeImpl to \ + Select concat(str(to.standardCode) , ' - ', to.label2) \ + From ObjectMaterialImpl to \ Where \ - to.id = :typeObjetId + to.standardCode = :typeObjetId report.dcpUsage.request.1.repeat=typeObjetId|column +# visite report.dcpUsage.request.2=1,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -149,9 +154,10 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' report.dcpUsage.request.2.repeat=typeObjetId|column +# peche report.dcpUsage.request.3=2,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -160,9 +166,10 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' report.dcpUsage.request.3.repeat=typeObjetId|column +# mis a l'eau report.dcpUsage.request.4=3,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -171,9 +178,12 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column +# modification ou rneforcement +#FIXME Supprime de la requete du dessous +#FIXME and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -182,10 +192,10 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ - and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ - and dcp.objectOperation.id != 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column +# Retrait report.dcpUsage.request.6=5,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -194,10 +204,59 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column -report.dcpUsage.request.7=6,0|row| \ +# abondonne +report.dcpUsage.request.7=6,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' +report.dcpUsage.request.7.repeat=typeObjetId|column +# coule +report.dcpUsage.request.8=7,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' +report.dcpUsage.request.8.repeat=typeObjetId|column +# remplacement +report.dcpUsage.request.9=8,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' +report.dcpUsage.request.9.repeat=typeObjetId|column +# autre +report.dcpUsage.request.10=9,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' +report.dcpUsage.request.10.repeat=typeObjetId|column +# tortues +report.dcpUsage.request.11=10,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m \ Join m.route r \ @@ -206,9 +265,10 @@ report.dcpUsage.request.7=6,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and dcp.objectType.id = :typeObjetId \ + and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' -report.dcpUsage.request.7.repeat=typeObjetId|column +report.dcpUsage.request.11.repeat=typeObjetId|column + ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cbfcbf93054073af433e1e6ab99… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cbfcbf93054073af433e1e6ab99… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Connexion HTTP probablement périmée - Closes #1141
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f838f332 by Tony CHEMIT at 2018-10-14T11:55:45Z Connexion HTTP probablement périmée - Closes #1141 - - - - - 22aa408e by Tony CHEMIT at 2018-10-14T11:55:47Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 - - - - - 13 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - − persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_4.java - persistence/src/main/resources/db/migration/7.2/01_update_objectMaterial-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql - persistence/src/main/resources/db/migration/7.4/01_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql - persistence/src/main/resources/db/migration/7.4/02_update_object_material-common.sql → persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql - − test/src/main/resources/db/7.4/dataForTestLongline.sql.gz - − test/src/main/resources/db/7.4/dataForTestSeine.sql.gz - − test/src/main/resources/db/7.4/empty_h2.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fa200798150308b23339d8f237… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fa200798150308b23339d8f237… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Connexion HTTP probablement périmée - Closes #1141
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fa200798 by Tony CHEMIT at 2018-10-14T10:09:19Z Connexion HTTP probablement périmée - Closes #1141 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java ===================================== @@ -112,9 +112,7 @@ public class ContentUIManager { UIHelper.handlingError(e); withError = true; } finally { - if (withError) { - close(); - } else { + if (!withError) { getLayoutContent().removeAll(); getLayoutContent().add(content, BorderLayout.CENTER); getMainUI().getHandler().updateContentSize(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -35,6 +35,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.services.security.InvalidAuthenticationTokenException; +import io.ultreia.java4all.http.HResponseErrorException; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -561,7 +562,9 @@ public class UIHelper extends SwingUtil { if (type.isInstance(e)) { return true; } - + if (e instanceof HResponseErrorException) { + return containsExceptionInStack(((HResponseErrorException) e).getError().getException(), type); + } while (e.getCause() != null) { e = e.getCause(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Création de profils de connexions : cosmétique - Closes #1642
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f5a66b58 by Tony CHEMIT at 2018-10-14T09:19:26Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.util.tripMap; */ import com.google.common.collect.Lists; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.renderer.lite.RendererUtilities; import org.geotools.styling.FeatureTypeStyle; @@ -68,6 +68,7 @@ public class ObserveMapPane extends JMapPane { protected String labelScaleUp; protected double rotation; + private long scaleInMiles; public ObserveMapPane() { labelScaleUp = "0 m"; @@ -84,6 +85,16 @@ public class ObserveMapPane extends JMapPane { } + public long getScaleInMiles() { + return scaleInMiles; + } + + public void setScaleInMiles(long scaleInMiles) { + long oldValue = getScaleInMiles(); + this.scaleInMiles = scaleInMiles; + firePropertyChange("scaleInMiles", oldValue, scaleInMiles); + } + protected void updateScale() { ReferencedEnvelope displayArea = getDisplayArea(); double dpi = 2.54 / 100; // pour avoir l'echélle en metre/pixel @@ -109,9 +120,9 @@ public class ObserveMapPane extends JMapPane { useFirstDigit = 1; } - long scaleInMiles = useFirstDigit * (long) Math.pow(10, nbDigit); + setScaleInMiles(useFirstDigit * (long) Math.pow(10, nbDigit)); - scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); + this.scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); labelScaleUp = String.format("%,d " + t("observe.content.map.miles"), scaleInMiles); @@ -297,7 +308,6 @@ public class ObserveMapPane extends JMapPane { } - @Override public void paint(Graphics graphics) { ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss ===================================== @@ -32,6 +32,7 @@ } #zoomMoins { + enabled:{observeMapPane.getScaleInMiles() < 2000}; _observeAction:{ZoomMoinsUIAction.ACTION_NAME}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda91… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda91… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Création de profils de connexions : cosmétique - Closes #1140
by Tony CHEMIT Oct. 14, 2018

Oct. 14, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 21ccec2c by Tony CHEMIT at 2018-10-14T08:55:30Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 12 changed files: - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - 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 Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java ===================================== @@ -0,0 +1,62 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%L + * ObServe :: Client + * %% + * 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% + */ + +import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; + +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CancelRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = CancelRemoteUIAction.class.getName(); + + public CancelRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.cancel"), n("observe.action.cancel.remote.tip"), "cancel", ObserveKeyStrokes.KEY_STROKE_RESET); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + RemoteDataSourceConfiguration configuration = ui.getModel().getRemoteDataSourceConfiguration(); + + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeRemoteDataSourceConfiguration(configuration); + ui.getModel().setRemoteDataSourceConfiguration(null); + ui.getModel().setRemoteCreateMode(false); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java ===================================== @@ -0,0 +1,62 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%L + * ObServe :: Client + * %% + * 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% + */ + +import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; + +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CancelServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = CancelServerUIAction.class.getName(); + + public CancelServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.cancel"), n("observe.action.cancel.server.tip"), "cancel", ObserveKeyStrokes.KEY_STROKE_RESET); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ServerDataSourceConfiguration configuration = ui.getModel().getServerDataSourceConfiguration(); + + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setServerDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeServerDataSourceConfiguration(configuration); + ui.getModel().setServerDataSourceConfiguration(null); + ui.getModel().setServerCreateMode(false); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java ===================================== @@ -52,21 +52,19 @@ public class CreatePresetUIAction extends PresetsUIActionSupport { switch (ui.getTabs().getSelectedIndex()) { case 0: { RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); - configuration.setName("Change me"); List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); configurations.add(configuration); ui.getModel().setRemoteDataSourceConfigurations(configurations); - + ui.getModel().setRemoteCreateMode(true); ui.getRemoteConfigurations().setSelectedValue(configuration, true); } break; case 1: { ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); - configuration.setName("Change me"); - List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); configurations.add(configuration); ui.getModel().setServerDataSourceConfigurations(configurations); + ui.getModel().setServerCreateMode(true); ui.getServerConfigurations().setSelectedValue(configuration, true); } break; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java ===================================== @@ -59,6 +59,9 @@ public class SaveRemoteUIAction extends PresetsUIActionSupport { ui.getModel().setRemoteDataSourceConfiguration(null); ui.getModel().setRemoteDataSourceConfiguration(remoteDataSourceConfiguration); ui.getModel().setRemoteModified(false); + if (ui.getModel().isRemoteCreateMode()) { + ui.getModel().setRemoteCreateMode(false); + } } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java ===================================== @@ -60,6 +60,9 @@ public class SaveServerUIAction extends PresetsUIActionSupport { ui.getModel().setServerDataSourceConfiguration(null); ui.getModel().setServerDataSourceConfiguration(serverDataSourceConfiguration); ui.getModel().setServerModified(false); + if (ui.getModel().isServerCreateMode()) { + ui.getModel().setServerCreateMode(false); + } } } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx ===================================== @@ -29,7 +29,9 @@ fr.ird.observe.client.ui.actions.storage.presets.DeleteRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.DeleteServerUIAction fr.ird.observe.client.ui.actions.storage.presets.QuitPresetsUIAction + fr.ird.observe.client.ui.actions.storage.presets.CancelRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.ResetRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.CancelServerUIAction fr.ird.observe.client.ui.actions.storage.presets.ResetServerUIAction fr.ird.observe.client.ui.actions.storage.presets.SaveRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.SaveServerUIAction @@ -89,7 +91,8 @@ <row> <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> + <JPanel id="remoteActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelRemoteAction"/> <JButton id="resetRemoteAction"/> <JButton id="saveRemoteAction"/> <JButton id="deleteRemoteAction"/> @@ -151,7 +154,8 @@ <row> <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> + <JPanel id="serverActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelServerAction"/> <JButton id="resetServerAction"/> <JButton id="saveServerAction"/> <JButton id="deleteServerAction"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss ===================================== @@ -81,8 +81,11 @@ text:{SwingUtil.getStringValue(model.getServerDataSourceConfiguration().getDatabaseName())}; } +#cancelRemoteAction { + _observeAction:{CancelRemoteUIAction.ACTION_NAME}; +} + #resetRemoteAction { - enabled:{model.isRemoteModified()}; _observeAction:{ResetRemoteUIAction.ACTION_NAME}; } @@ -99,6 +102,10 @@ _observeAction:{TestRemoteUIAction.ACTION_NAME}; } +#cancelServerAction { + _observeAction:{CancelServerUIAction.ACTION_NAME}; +} + #resetServerAction { enabled:{model.isServerModified()}; _observeAction:{ResetServerUIAction.ACTION_NAME}; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.storage.presets; * 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>. @@ -40,6 +40,7 @@ import javax.swing.ActionMap; import javax.swing.DefaultListModel; import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.JPanel; import javax.swing.JSplitPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; @@ -88,7 +89,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } - Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class,DecoratorService.WITH_URL); + Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, DecoratorService.WITH_URL); ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); @@ -140,7 +141,20 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { SwingUtilities.invokeLater(ui::repaint); }); - Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class,DecoratorService.WITH_URL); + ui.getModel().addPropertyChangeListener("remoteCreateMode", evt -> { + JPanel remoteActions = ui.getRemoteActions(); + if ((Boolean) evt.getNewValue()) { + remoteActions.remove(ui.getResetRemoteAction()); + remoteActions.remove(ui.getDeleteRemoteAction()); + remoteActions.add(ui.getCancelRemoteAction(), 0); + } else { + remoteActions.add(ui.getResetRemoteAction(), 0); + remoteActions.add(ui.getDeleteRemoteAction(), 2); + remoteActions.remove(ui.getCancelRemoteAction()); + } + }); + ui.getRemoteActions().remove(0); + Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, DecoratorService.WITH_URL); ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); @@ -191,6 +205,21 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { SwingUtilities.invokeLater(ui::repaint); }); + ui.getModel().addPropertyChangeListener("serverCreateMode", evt -> { + JPanel serverActions = ui.getServerActions(); + if ((Boolean) evt.getNewValue()) { + serverActions.remove(ui.getResetServerAction()); + serverActions.remove(ui.getDeleteServerAction()); + serverActions.add(ui.getCancelServerAction(), 0); + } else { + + serverActions.add(ui.getResetServerAction(), 0); + serverActions.add(ui.getDeleteServerAction(), 2); + serverActions.remove(ui.getCancelServerAction()); + } + }); + + ui.getServerActions().remove(0); UIHelper.askFocus(ui.getCreateAction()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java ===================================== @@ -43,6 +43,8 @@ public class RemotePresetsUIModel extends AbstractBean { private boolean remoteModified; private boolean serverModified; + private boolean remoteCreateMode; + private boolean serverCreateMode; public List<RemoteDataSourceConfiguration> getRemoteDataSourceConfigurations() { return remoteDataSourceConfigurations; @@ -99,4 +101,22 @@ public class RemotePresetsUIModel extends AbstractBean { this.serverModified = serverModified; firePropertyChange("serverModified", null, serverModified); } + + public boolean isRemoteCreateMode() { + return remoteCreateMode; + } + + public void setRemoteCreateMode(boolean remoteCreateMode) { + this.remoteCreateMode = remoteCreateMode; + firePropertyChange("remoteCreateMode", null, remoteCreateMode); + } + + public boolean isServerCreateMode() { + return serverCreateMode; + } + + public void setServerCreateMode(boolean serverCreateMode) { + this.serverCreateMode = serverCreateMode; + firePropertyChange("serverCreateMode", null, serverCreateMode); + } } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Copy automaticly in clipboard with rep observe.action.back.to.list=Back to list observe.action.back.to.list.tip=Go back to the list observe.action.cancel=Cancel +observe.action.cancel.remote.tip=Cancel create remote configuration +observe.action.cancel.server.tip=Cancel create server configuration observe.action.change.storage=Change storage observe.action.change.storage.tip=To change current storage observe.action.choose.db.dump=Choose the backup ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Puesta a punto automáticamente el con observe.action.back.to.list=Volver a la lista observe.action.back.to.list.tip=Volver a la lista de datos observe.action.cancel=Cancelar +observe.action.cancel.remote.tip=Cancel create remote configuration \#TODO +observe.action.cancel.server.tip=Cancel create server configuration \#TODO observe.action.change.storage=Cambiar la fuente de datos observe.action.change.storage.tip=Para cambiar la fuente de datos de la aplicación observe.action.choose.db.dump=Elegir la copia de seguridad ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler +observe.action.cancel.remote.tip=Annuler la création de la configuration +observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données observe.action.change.storage.tip=Pour changer la source de données de l'application observe.action.choose.db.dump=Choisir la sauvegarde View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/21ccec2c0c29eb0e02e425c24cc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/21ccec2c0c29eb0e02e425c24cc… You're receiving this email because of your account on gitlab.com.

1 0

[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 Oct. 14, 2018

Oct. 14, 2018

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 Oct. 13, 2018

Oct. 13, 2018

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 Oct. 10, 2018

Oct. 10, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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 Oct. 7, 2018

Oct. 7, 2018

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

[Git][ultreiaio/ird-observe][develop] [LL] Composition globale de la palangre : petits ajustements - Closes #1128…
by Tony CHEMIT Oct. 7, 2018

Oct. 7, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b95c598b by Tony CHEMIT at 2018-10-07T13:11:36Z [LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation) - - - - - 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/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/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/HooksCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.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 - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT Oct. 7, 2018

Oct. 7, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4ed9f518 by Tony CHEMIT at 2018-10-07T10:16:38Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130 - - - - - f680c163 by Tony CHEMIT at 2018-10-07T10:52:45Z [LL] Capture : petits ajustements - Closes #1129 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java - 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/java/fr/ird/observe/dto/SpeciesListConfiguration.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT Oct. 6, 2018

Oct. 6, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 668d0921 by Tony CHEMIT at 2018-10-06T17:15:24Z [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130 - - - - - 22 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -369,24 +369,43 @@ key = speciesList.seine.objectObservedSpecies type = string defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2" -[option speciesListLonglineCatchId] -description = observe.config.speciesList.longline.catch -key = speciesList.longline.catch +[option speciesListLonglineObsCatchId] +description = observe.config.speciesList.longline.obs.catch +key = speciesList.longline.obs.catch type = string defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" -[option speciesListLonglineEncounterId] -description = observe.config.speciesList.longline.encounter -key = speciesList.longline.encounter +[option speciesListLonglineObsEncounterId] +description = observe.config.speciesList.longline.obs.encounter +key = speciesList.longline.obs.encounter type = string defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4" -[option speciesListLonglineDepredatorId] -description = observe.config.speciesList.longline.encounter -key = speciesList.longline.depredator +[option speciesListLonglineObsDepredatorId] +description = observe.config.speciesList.longline.obs.depredator +key = speciesList.longline.obs.tdr type = string defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5" +[option speciesListLonglineLogbookCatchId] +description = observe.config.speciesList.longline.logbook.catch +key = speciesList.longline.logbook.catch +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" + +[option speciesListLonglineLogbookLandingId] +description = observe.config.speciesList.longline.logbook.landing +key = speciesList.longline.logbook.landing +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" + +[option speciesListLonglineLogbookSampleId] +description = observe.config.speciesList.longline.logbook.sample +key = speciesList.longline.logbook.sample +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" + + [option speciesListLonglineTripId] description = observe.config.speciesList.longline.trip key = speciesList.longline.trip ===================================== client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties ===================================== @@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Server data source con observe.config.showMigrationProgression=Show migration progression observe.config.showMigrationSql=Show migration sql queries observe.config.showSql=Show sql -observe.config.speciesList.longline.catch=Species for catches -observe.config.speciesList.longline.encounter=Species for encounters +observe.config.speciesList.longline.logbook.catch=Species for logbook catches +observe.config.speciesList.longline.logbook.landing=Species for logbook landings +observe.config.speciesList.longline.logbook.sample=Species for logbook samples +observe.config.speciesList.longline.obs.catch=Species for observation catches +observe.config.speciesList.longline.obs.depredator=Species for observation depredator +observe.config.speciesList.longline.obs.encounter=Species for encounters observe.config.speciesList.longline.trip=Species for trip longline observe.config.speciesList.seine.nonTargetCatch=Species for non target catches observe.config.speciesList.seine.objectObservedSpecies=Species for object observed species ===================================== client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties ===================================== @@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Configurations de serv observe.config.showMigrationProgression=Mostar los logs de actualización de una base de datos observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos observe.config.showSql=Mostrar en los los todas las consultas sql ejecutadas -observe.config.speciesList.longline.catch=Especies para las capturas - TDR -observe.config.speciesList.longline.encounter=Especies para los encuentros +observe.config.speciesList.longline.logbook.catch=Especies para las capturas logbook \#TODO +observe.config.speciesList.longline.logbook.landing=Especies para las landing logbook \#TODO +observe.config.speciesList.longline.logbook.sample=Especies para las sample logbook \#TODO +observe.config.speciesList.longline.obs.catch=Especies para las capturas observations \#TODO +observe.config.speciesList.longline.obs.depredator=Species for observation depredator \#TODO +observe.config.speciesList.longline.obs.encounter=Especies para los encuentros observe.config.speciesList.longline.trip=Especies para las marea - Longline observe.config.speciesList.seine.nonTargetCatch=Especies para las capturas que no forman parte del objetivo observe.config.speciesList.seine.objectObservedSpecies=Especies para los especies que no forman parte del objetivo y que fueron observadas ===================================== client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties ===================================== @@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=connexions à des serv observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées -observe.config.speciesList.longline.catch=Espèces pour les captures - TDR -observe.config.speciesList.longline.encounter=Espèces pour les rencontre +observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook +observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook +observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook +observe.config.speciesList.longline.obs.catch=Espèces pour les captures observation +observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations +observe.config.speciesList.longline.obs.encounter=Espèces pour les rencontre observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible observe.config.speciesList.seine.objectObservedSpecies=Espèces pour les espèces non cible observées ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java ===================================== @@ -36,8 +36,8 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.SpeciesListReference; import io.ultreia.java4all.config.ConfigOptionDef; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.widgets.config.ConfigCategoryUI; @@ -234,8 +234,13 @@ public class ShowConfigAction extends MenuActionSupport { n("observe.config.category.speciesList.longline.description"), ObserveUICallback.ui.name()); - helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID); - helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_TRIP_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_CATCH_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_DEPREDATOR_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_ENCOUNTER_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_CATCH_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_LANDING_ID); + helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_SAMPLE_ID); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java ===================================== @@ -70,7 +70,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr } @Override - public void afterInit(TripLonglineUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TripLonglineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> { List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences); return DtoReferenceCollection.filterEnabled(result); @@ -98,6 +98,10 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); + } + + @Override + public void afterInit(TripLonglineUI ui) { super.afterInit(ui); TripMapUI tripMap = ui.getTripMap(); ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java ===================================== @@ -126,22 +126,19 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong } @Override - public void afterInit(CatchLonglineLogbookUI ui) { - super.afterInit(ui); + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookCatchId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); - addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); - } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java ===================================== @@ -22,11 +22,13 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * #L% */ +import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler; 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.LandingLogbookDto; import fr.ird.observe.dto.data.longline.LandingPartLogbookDto; +import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.referential.SpeciesReference; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,6 +38,7 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; +import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -69,6 +72,16 @@ public class LandingPartLogbookUIHandler extends ContentTableUIHandler<LandingLo }; } + @Override + protected void onAfterInitAddReferentialFilters() { + addReferentialFilter(LandingPartLogbookDto.PROPERTY_SPECIES, incomingReferences -> { + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookLandingId(); + String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); + List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); + return DtoReferenceCollection.filterEnabled(result); + }); + } + @Override protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = ui.getTable(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -31,7 +31,7 @@ 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; import fr.ird.observe.dto.data.longline.SamplePartLogbookDto; -import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; +import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.referential.SexReference; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesReference; @@ -46,7 +46,6 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; import java.beans.PropertyChangeListener; -import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -97,21 +96,24 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb } @Override - public void afterInit(SamplePartLogbookUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(SamplePartLogbookDto.PROPERTY_SPECIES, incomingReferences -> { - if (fromActivity) { -// FIXME We do not have the set selected here (since this is a brother of it) - String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId(); - if (setId == null) { - return incomingReferences; - } - ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId); - return new LinkedList<>(sampleSpecies.toSet()); - } else { - return incomingReferences; - } + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookSampleId(); + String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); + List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); + return DtoReferenceCollection.filterEnabled(result); +// if (fromActivity) { +//// FIXME We do not have the set selected here (since this is a brother of it) +// String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId(); +// if (setId == null) { +// return incomingReferences; +// } +// ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId); +// return new LinkedList<>(sampleSpecies.toSet()); +// } else { +// return incomingReferences; +// } }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java ===================================== @@ -161,24 +161,25 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline } @Override - public void afterInit(CatchLonglineObsUI ui) { - - super.afterInit(ui); - + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(CatchLonglineObsDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); addReferentialFilter(CatchLonglineObsDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); + } + @Override + public void afterInit(CatchLonglineObsUI ui) { + super.afterInit(ui); CatchLonglineObsUIModel model = ui.getModel(); model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> { Boolean newValue = (Boolean) evt.getNewValue(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java ===================================== @@ -60,9 +60,9 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin private static final Logger log = LogManager.getLogger(EncounterObsUIHandler.class); @Override - public void afterInit(EncounterObsUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(EncounterObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsEncounterId(); Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -71,7 +71,6 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java ===================================== @@ -181,15 +181,18 @@ public class TdrObsUIHandler extends ContentTableUIHandler<SetLonglineObsTdrDto, } @Override - public void afterInit(TdrObsUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TdrObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { - String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId(); + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId(); String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId(); List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); + } + @Override + public void afterInit(TdrObsUI ui) { + super.afterInit(ui); positionHelper = new LonglinePositionHelper<>(ui.getSection(), ui.getBasket(), ui.getBranchline(), ui.getTableEditBean()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== @@ -113,11 +113,15 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei } @Override - public void afterInit(NonTargetCatchReleaseUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> { ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId()); return new LinkedList<>(sampleSpecies.toSet()); }); + } + + @Override + public void afterInit(NonTargetCatchReleaseUI ui) { super.afterInit(ui); speciesGroupDtoMap = new TreeMap<>(); getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java ===================================== @@ -180,11 +180,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } - @Override - protected void loadEditBean(String beanId) { - Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId); - getModel().openForm(form); + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId(); @@ -193,6 +190,19 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa }); } + @Override + protected void loadEditBean(String beanId) { + Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId); + getModel().openForm(form); + //FIXME voir pk on faisait ça à ce moment +// addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { +// String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); +// String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId(); +// List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList(); +// return DtoReferenceCollection.filterEnabled(result); +// }); + } + @Override protected void onSelectedRowChanged(int editingRow, NonTargetCatchDto bean, boolean create) { ContentTableModel<SetSeineNonTargetCatchDto, NonTargetCatchDto> model = getTableModel(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -91,7 +91,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } @Override - public void afterInit(NonTargetSampleUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, incomingReferences -> { ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getModel().getSelectedId()); return new LinkedList<>(sampleSpecies.toSet()); @@ -102,7 +102,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS return new LinkedList<>(speciesFate); // return ReferentialDtoReferences.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java ===================================== @@ -58,7 +58,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati private static final Logger log = LogManager.getLogger(ObjectObservedSpeciesUIHandler.class); @Override - public void afterInit(ObjectObservedSpeciesUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId(); Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); @@ -69,7 +69,6 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java ===================================== @@ -56,7 +56,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin private static final Logger log = LogManager.getLogger(ObjectSchoolEstimateUIHandler.class); @Override - public void afterInit(ObjectSchoolEstimateUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId(); Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId); @@ -67,7 +67,6 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java ===================================== @@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.n; public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> implements UIHandler<SchoolEstimateUI> { @Override - public void afterInit(SchoolEstimateUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(SchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); @@ -64,7 +64,6 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java ===================================== @@ -67,7 +67,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa private static final Logger log = LogManager.getLogger(TargetCatchUIHandler.class); @Override - public void afterInit(TargetCatchUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); @@ -75,6 +75,10 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); + } + + @Override + public void afterInit(TargetCatchUI ui) { super.afterInit(ui); // lors de la modification d'une species (sur une entree non sauvee) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java ===================================== @@ -71,7 +71,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT private static final Logger log = LogManager.getLogger(TargetDiscardCatchUIHandler.class); @Override - public void afterInit(TargetDiscardCatchUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); @@ -79,6 +79,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList(); return DtoReferenceCollection.filterEnabled(result); }); + } + + @Override + public void afterInit(TargetDiscardCatchUI ui) { super.afterInit(ui); // lors de la modification d'une species (sur une entree non sauvee) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== @@ -136,7 +136,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar } @Override - public void afterInit(U ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TargetLengthDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { List<SpeciesReference> result = TargetSampleUIHandler.this.getTargetSampleService().getSampleSpecies(getModel().getSelectedId(), discarded).toList(); return DtoReferenceCollection.filterEnabled(result); @@ -146,7 +146,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar checkSizeMeasureTypes(result); return DtoReferenceCollection.filterEnabled(result); }); - super.afterInit(ui); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java ===================================== @@ -65,7 +65,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein } @Override - public void afterInit(TripSeineUI ui) { + protected void onAfterInitAddReferentialFilters() { addReferentialFilter(TripSeineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> { List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences); return DtoReferenceCollection.filterEnabled(result); @@ -83,6 +83,10 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein List<VesselReference> result = VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds()); return DtoReferenceCollection.filterEnabled(result); }); + } + + @Override + public void afterInit(TripSeineUI ui) { super.afterInit(ui); TripMapUI tripMap = ui.getTripMap(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a65… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a65… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non…
by Tony CHEMIT Oct. 6, 2018

Oct. 6, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7cb93827 by Tony CHEMIT at 2018-10-06T16:34:10Z [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131 - - - - - 1 changed file: - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -753,7 +753,7 @@ public class DecoratorService extends DecoratorProvider { @Override public void initSpeciesDto() { registerDecorator(new SpeciesDecorator()); - registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s"); + registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s"); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: add test database form model 8.3
by Tony CHEMIT Oct. 6, 2018

Oct. 6, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c75c91f7 by Tony CHEMIT at 2018-10-06T16:15:23Z add test database form model 8.3 - - - - - 97b5b714 by Tony CHEMIT at 2018-10-06T16:15:24Z [LL][PS] Améliorer le widget position - Closes #1133 - - - - - 332de6b9 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (correction libelle) - - - - - 7097ff78 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (catégories de poids non obligatoires) - - - - - 12cee0d3 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (ajout configuration pour la méthode de mesure de poids par défaut pour la création d'un nouveau débarquement) - - - - - 3e814944 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (ajout filtre sur les navires (cargo ou inconnu)) - - - - - 2fa7ea4a by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (utilisation méthode de mensuration de poids lors de la création d'un nouveau débarquement) - - - - - 511c3b13 by Tony CHEMIT at 2018-10-06T16:15:25Z [LL] Débarquements : petits ajustements - See #1121 (correction des messages pour le déplacement) - - - - - 5ecad347 by Tony CHEMIT at 2018-10-06T16:15:25Z Ajout d'un raccourci clavier pour déplacer des éléments - - - - - bd5625ac by Tony CHEMIT at 2018-10-06T16:15:25Z open api - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - 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/MoveMultipleDataUIActionSupport.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/data/longline/move/MoveMultipleTripLonglineLandingLogbookUIAction.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/content/Common.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java - 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 - pom.xml - + 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 - test/src/main/resources/fixtures/count-referential-common.properties - test/src/main/resources/fixtures/count-referential-longline.properties - test/src/main/resources/fixtures/validate-service-referential.properties - validation/src/main/resources/fr/ird/observe/dto/data/longline/LandingPartLogbookDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631… You're receiving this email because of your account on gitlab.com.

1 0