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

[Git][ultreiaio/ird-observe][develop] 10 commits: update changelog
by Tony CHEMIT 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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 14 Oct '18

14 Oct '18

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