November 2016 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (930bdee -> e66a1c9)
by codelutin.com scm 03 Nov '16

03 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 930bdee [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) new e66a1c9 [LL] Nombre de coupures inconnu : cas problématique (refs-80 #7883) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e66a1c971821fe66960e08c720ed99ebbe30f5b8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 11:52:26 2016 +0100 [LL] Nombre de coupures inconnu : cas problématique (refs-80 #7883) Summary of changes: .../SetLonglineDto-ui-create-error-validation.xml | 9 -------- ...SetLonglineDto-ui-create-warning-validation.xml | 9 ++++++++ .../SetLonglineDto-ui-update-error-validation.xml | 9 -------- ...SetLonglineDto-ui-update-warning-validation.xml | 9 ++++++++ .../impl/longline/SetLonglineUIHandler.java | 26 ---------------------- 5 files changed, 18 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (aec7d23 -> 930bdee)
by codelutin.com scm 03 Nov '16

03 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from aec7d23 [PS] Sur les échantillons de non cible, ajouter un champ Devenir (Fixes #8578) Merge branch 'feature/8578' into develop new 930bdee [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 930bdeea8b8189933a4284cb03731a4e28a4b4db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 11:36:18 2016 +0100 [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) Summary of changes: ...NonTargetCatchDto-ui-update-error-validation.xml | 14 ++++++++++++++ ...nTargetCatchDto-ui-update-warning-validation.xml | 12 ------------ .../AbstractSpeciesFieldDtoValidator.java | 21 +-------------------- 3 files changed, 15 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c444cdc -> aec7d23)
by codelutin.com scm 03 Nov '16

03 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c444cdc Rajouter un champ Armateur (Fixes #7901) Merge branch 'feature/7901' into develop new eab0e11 Introduce services-topia-binder module new 644de48 Ajout lengthWeightParameter.source (persistence) new 337f82c Ajout lengthWeightParameter.source (service) new 80be6d6 Ajout lengthWeightParameter.source (ui) new 472e339 use last stable of eugene new ccae38f [REFERENTIEL] Relations taille-poids - Ajout d'un champ texte 'source' (Fixes #8196) Merge branch 'feature/8196' into develop new 40a2366 Ajout NonTargetLength.speciesFate (persistence) new 3c5c622 Ajout NonTargetLength.speciesFate (service) new 64f7ce5 Ajout NonTargetLength.speciesFate (ui) new 4fe49c1 Utilisation du devenir espèce dans la consolidation de données new aec7d23 [PS] Sur les échantillons de non cible, ajouter un champ Devenir (Fixes #8578) Merge branch 'feature/8578' into develop The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aec7d23538f4d5993a772cd6e1e24a6357c901a3 Merge: ccae38f 4fe49c1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 11:08:40 2016 +0100 [PS] Sur les échantillons de non cible, ajouter un champ Devenir (Fixes #8578) Merge branch 'feature/8578' into develop commit 4fe49c1bb51b488d274d27ba84a640cea6ca9ee9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 11:07:08 2016 +0100 Utilisation du devenir espèce dans la consolidation de données commit 64f7ce5a9e8edf0896b5148fdeaf2a320a9a4205 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 10:57:52 2016 +0100 Ajout NonTargetLength.speciesFate (ui) commit 3c5c622085b651e07f00db5254c6ccadacda1013 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 10:57:32 2016 +0100 Ajout NonTargetLength.speciesFate (service) commit 40a236626ac3924f319063a4fc49d3602e10eb66 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 10:57:03 2016 +0100 Ajout NonTargetLength.speciesFate (persistence) commit ccae38f7e6bb967d7455bc27e5426509cbf201e3 Merge: eab0e11 472e339 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 09:39:15 2016 +0100 [REFERENTIEL] Relations taille-poids - Ajout d'un champ texte 'source' (Fixes #8196) Merge branch 'feature/8196' into develop commit 472e33992b169596b2ac14e7b01d03a13ec67404 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 09:39:12 2016 +0100 use last stable of eugene commit 80be6d64b0b4ab8352d0111cfdcdf7b55ddf5bdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 09:16:33 2016 +0100 Ajout lengthWeightParameter.source (ui) commit 337f82ca37cb9e9bcd13368fc09fa724f9c277a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 09:16:17 2016 +0100 Ajout lengthWeightParameter.source (service) commit 644de4861d2dd3b27a12a9939483c75d49bc0cf0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 09:15:52 2016 +0100 Ajout lengthWeightParameter.source (persistence) commit eab0e116c63ffd4a4486daea29d359f2d1bbe101 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 3 08:42:38 2016 +0100 Introduce services-topia-binder module Summary of changes: ...nTargetLengthDto-ui-update-error-validation.xml | 12 +++++++ ...argetLengthDto-ui-update-warning-validation.xml | 9 +++++ .../application-swing-validation_en_GB.properties | 2 ++ .../application-swing-validation_es_ES.properties | 2 ++ .../application-swing-validation_fr_FR.properties | 2 ++ .../swing/ui/content/ContentUIHandler.java | 4 +-- .../content/ref/impl/LengthWeightParameterUI.jaxx | 10 ++++++ .../content/ref/impl/LengthWeightParameterUI.jcss | 9 +++++ .../ref/impl/LengthWeightParameterUIModel.java | 1 + .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 12 +++++++ .../table/impl/seine/NonTargetSampleUI.jcss | 10 ++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 16 ++++++++- .../table/impl/seine/NonTargetSampleUIModel.java | 1 + .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../DataSourceMigrationForVersion_5_1.java | 2 ++ ...ol_8196_lengthWeightParameter_add_source-H2.sql | 3 ++ ...ol_8196_lengthWeightParameter_add_source-PG.sql | 3 ++ ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 2 ++ ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 2 ++ .../fr/ird/observe/entities/seine/SetSeines.java | 13 +++++-- entities/src/main/xmi/observe-common.zargo | Bin 42038 -> 42084 bytes entities/src/main/xmi/observe-seine.zargo | Bin 86054 -> 86621 bytes entities/src/main/xmi/observe.ini | 1 + pom.xml | 3 +- .../request/ReferenceSetRequestDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 46091 -> 46149 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60028 -> 60479 bytes services-dto/src/main/xmi/observe-services-dto.ini | 2 ++ .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 39 +++++++++++++++++---- .../services/topia/binder/BinderEngine.java | 0 .../topia/binder/BinderEngineInitializer.java | 0 .../services/topia/binder/BinderSupport.java | 0 .../binder/ReferenceBinderEngineSupplierTopia.java | 0 .../topia/binder/data/ActivityLonglineBinder.java | 0 .../data/ActivityLonglineEncouterDtoBinder.java | 0 .../data/ActivityLonglineSensorUsedDtoBinder.java | 0 .../binder/data/ActivityLonglineStubDtoBinder.java | 0 .../topia/binder/data/ActivitySeineBinder.java | 0 .../binder/data/ActivitySeineStubDtoBinder.java | 0 .../topia/binder/data/BaitsCompositionBinder.java | 0 .../services/topia/binder/data/BasketBinder.java | 0 .../topia/binder/data/BranchlineBinder.java | 0 .../binder/data/BranchlinesCompositionBinder.java | 0 .../topia/binder/data/CatchLonglineBinder.java | 0 .../topia/binder/data/DataBinderSupport.java | 0 .../topia/binder/data/EncounterBinder.java | 0 .../topia/binder/data/FloatingObjectBinder.java | 0 .../FloatingObjectObservedSpeciesDtoBinder.java | 0 .../FloatingObjectSchoolEstimateDtoBinder.java | 0 .../FloatingObjectTransmittingBuoyDtoBinder.java | 0 .../binder/data/FloatlinesCompositionBinder.java | 0 .../binder/data/GearUseFeaturesLonglineBinder.java | 0 .../GearUseFeaturesMeasurementLonglineBinder.java | 0 .../GearUseFeaturesMeasurementSeineBinder.java | 0 .../binder/data/GearUseFeaturesSeineBinder.java | 0 .../topia/binder/data/HooksCompositionBinder.java | 0 .../topia/binder/data/NonTargetCatchBinder.java | 0 .../topia/binder/data/NonTargetLengthBinder.java | 4 +++ .../topia/binder/data/NonTargetSampleBinder.java | 0 .../binder/data/ObjectObservedSpeciesBinder.java | 0 .../binder/data/ObjectSchoolEstimateBinder.java | 0 .../services/topia/binder/data/RouteBinder.java | 0 .../topia/binder/data/RouteStubDtoBinder.java | 0 .../topia/binder/data/SchoolEstimateBinder.java | 0 .../services/topia/binder/data/SectionBinder.java | 0 .../topia/binder/data/SensorUsedBinder.java | 0 .../topia/binder/data/SetLonglineBinder.java | 0 .../binder/data/SetLonglineCatchDtoBinder.java | 0 .../SetLonglineDetailCompositionDtoBinder.java | 0 .../SetLonglineGlobalCompositionDtoBinder.java | 0 .../binder/data/SetLonglineStubDtoBinder.java | 0 .../topia/binder/data/SetLonglineTdrDtoBinder.java | 0 .../services/topia/binder/data/SetSeineBinder.java | 0 .../data/SetSeineNonTargetCatchDtoBinder.java | 0 .../data/SetSeineSchoolEstimateDtoBinder.java | 0 .../binder/data/SetSeineTargetCatchDtoBinder.java | 0 .../topia/binder/data/SizeMeasureBinder.java | 0 .../topia/binder/data/TargetCatchBinder.java | 0 .../topia/binder/data/TargetLengthBinder.java | 0 .../topia/binder/data/TargetSampleBinder.java | 0 .../services/topia/binder/data/TdrBinder.java | 0 .../topia/binder/data/TransmittingBuoyBinder.java | 0 .../binder/data/TripLonglineActivityDtoBinder.java | 0 .../topia/binder/data/TripLonglineBinder.java | 0 .../binder/data/TripLonglineGearUseDtoBinder.java | 0 .../topia/binder/data/TripSeineBinder.java | 0 .../binder/data/TripSeineGearUseDtoBinder.java | 0 .../topia/binder/data/WeightMeasureBinder.java | 0 .../referential/BaitHaulingStatusBinder.java | 0 .../referential/BaitSettingStatusBinder.java | 0 .../topia/binder/referential/BaitTypeBinder.java | 0 .../referential/CatchFateLonglineBinder.java | 0 .../topia/binder/referential/CountryBinder.java | 0 .../binder/referential/DetectionModeBinder.java | 0 .../binder/referential/EncounterTypeBinder.java | 0 .../topia/binder/referential/FpaZoneBinder.java | 0 .../topia/binder/referential/GearBinder.java | 0 .../referential/GearCaracteristicBinder.java | 0 .../referential/GearCaracteristicTypeBinder.java | 0 .../topia/binder/referential/HarbourBinder.java | 0 .../topia/binder/referential/HealthnessBinder.java | 0 .../binder/referential/HookPositionBinder.java | 0 .../topia/binder/referential/HookSizeBinder.java | 0 .../topia/binder/referential/HookTypeBinder.java | 0 .../referential/ItemHorizontalPositionBinder.java | 0 .../referential/ItemVerticalPositionBinder.java | 0 .../referential/LengthWeightParameterBinder.java | 2 ++ .../binder/referential/LightsticksColorBinder.java | 0 .../binder/referential/LightsticksTypeBinder.java | 0 .../topia/binder/referential/LineTypeBinder.java | 0 .../binder/referential/MaturityStatusBinder.java | 0 .../binder/referential/MitigationTypeBinder.java | 0 .../topia/binder/referential/ObjectFateBinder.java | 0 .../binder/referential/ObjectOperationBinder.java | 0 .../topia/binder/referential/ObjectTypeBinder.java | 0 .../binder/referential/ObservedSystemBinder.java | 0 .../topia/binder/referential/OceanBinder.java | 0 .../topia/binder/referential/OrganismBinder.java | 0 .../topia/binder/referential/PersonBinder.java | 0 .../topia/binder/referential/ProgramBinder.java | 0 .../binder/referential/ReasonForDiscardBinder.java | 0 .../referential/ReasonForNoFishingBinder.java | 0 .../binder/referential/ReasonForNullSetBinder.java | 0 .../referential/ReferentialBinderSupport.java | 0 .../binder/referential/SensorBrandBinder.java | 0 .../binder/referential/SensorDataFormatBinder.java | 0 .../topia/binder/referential/SensorTypeBinder.java | 0 .../binder/referential/SettingShapeBinder.java | 0 .../topia/binder/referential/SexBinder.java | 0 .../topia/binder/referential/ShipOwnerBinder.java | 0 .../binder/referential/SizeMeasureTypeBinder.java | 0 .../topia/binder/referential/SpeciesBinder.java | 0 .../binder/referential/SpeciesFateBinder.java | 0 .../binder/referential/SpeciesGroupBinder.java | 0 .../binder/referential/SpeciesListBinder.java | 0 .../binder/referential/SpeciesStatusBinder.java | 0 .../binder/referential/StomacFullnessBinder.java | 0 .../referential/SurroundingActivityBinder.java | 0 .../TransmittingBuoyOperationBinder.java | 0 .../referential/TransmittingBuoyTypeBinder.java | 0 .../topia/binder/referential/TripTypeBinder.java | 0 .../referential/VesselActivityLonglineBinder.java | 0 .../referential/VesselActivitySeineBinder.java | 0 .../topia/binder/referential/VesselBinder.java | 0 .../referential/VesselSizeCategoryBinder.java | 0 .../topia/binder/referential/VesselTypeBinder.java | 0 .../binder/referential/WeightCategoryBinder.java | 0 .../referential/WeightMeasureTypeBinder.java | 0 .../topia/binder/referential/WindBinder.java | 0 .../topia/binder/BinderEngineMetadataTest.java | 0 .../topia/binder/ReferenceBinderEngineTest.java | 0 .../NonTargetLength-service-error-validation.xml | 12 +++++++ .../NonTargetLength-service-warning-validation.xml | 9 +++++ .../services-topia-validation_en_GB.properties | 2 ++ .../services-topia-validation_es_ES.properties | 2 ++ .../services-topia-validation_fr_FR.properties | 2 ++ services-topia/pom.xml | 6 ++++ .../consolidate/ConsolidateDataServiceTopia.java | 7 +++- .../service/seine/NonTargetSampleServiceTopia.java | 18 +++++++++- .../services/topia/binder/BinderEngineTest.java | 2 ++ 165 files changed, 215 insertions(+), 17 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql copy {topia-templates-extension => services-topia-binder}/LICENSE.txt (100%) copy {services-topia => services-topia-binder}/README.md (100%) copy {services-configuration => services-topia-binder}/pom.xml (50%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java (90%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java (98%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java (100%) rename {services-topia => services-topia-binder}/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java (100%) rename {services-topia => services-topia-binder}/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java (100%) rename {services-topia => services-topia-binder}/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch develop updated (b96f52e -> c444cdc)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from b96f52e [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop new faa1bc3 Ajout du référentiel ShipOwner (persistence) new d9a9cf0 Ajout du référentiel ShipOwner (service) new 7e4e3b5 Ajout du référentiel Armateur (persistence) new de512a9 Ajout du référentiel Armateur (service) new 10c3c1b Ajout du référentiel Armateur (ui) new c444cdc Rajouter un champ Armateur (Fixes #7901) Merge branch 'feature/7901' into develop The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c444cdc596ab6e0d0c5ed3060b5e72fc01e3190f Merge: b96f52e 10c3c1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 21:15:32 2016 +0100 Rajouter un champ Armateur (Fixes #7901) Merge branch 'feature/7901' into develop commit 10c3c1bcde040a4d40abb7b948eabf84d724edde Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 21:15:16 2016 +0100 Ajout du référentiel Armateur (ui) commit de512a9596fc0e9d0759a77153afff94c679c7a2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 21:13:32 2016 +0100 Ajout du référentiel Armateur (service) commit 7e4e3b50a919995a92636b56c8a69c401c83a86b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 21:13:07 2016 +0100 Ajout du référentiel Armateur (persistence) commit d9a9cf0cee55880fc47755151009ee1acdca3f1e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 19:34:23 2016 +0100 Ajout du référentiel ShipOwner (service) commit faa1bc31c62c3d1c053242d82218f28cece8657d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 19:33:13 2016 +0100 Ajout du référentiel ShipOwner (persistence) Summary of changes: .../swing/decoration/DecoratorService.java | 121 +-------------------- .../application-swing-decoration_en_GB.properties | 2 + .../application-swing-decoration_es_ES.properties | 2 + .../application-swing-decoration_fr_FR.properties | 2 + .../ShipOwnerDto-ui-create-error-validation.xml | 57 ++++++++++ ... ShipOwnerDto-ui-create-warning-validation.xml} | 9 +- .../ShipOwnerDto-ui-update-error-validation.xml | 57 ++++++++++ ... ShipOwnerDto-ui-update-warning-validation.xml} | 9 +- .../VesselDto-ui-create-error-validation.xml | 10 ++ .../VesselDto-ui-update-error-validation.xml | 10 ++ .../application-swing-validation_en_GB.properties | 6 + .../application-swing-validation_es_ES.properties | 6 + .../application-swing-validation_fr_FR.properties | 6 + ...{VesselSizeCategoryUI.jaxx => ShipOwnerUI.jaxx} | 60 +++++----- .../ref/impl/{OrganismUI.jcss => ShipOwnerUI.jcss} | 12 +- .../ui/content/ref/impl/ShipOwnerUIModel.java | 23 ++++ .../swing/ui/content/ref/impl/VesselUI.jaxx | 11 ++ .../swing/ui/content/ref/impl/VesselUI.jcss | 10 ++ .../swing/ui/content/ref/impl/VesselUIModel.java | 6 +- .../i18n/application-swing_en_GB.properties | 2 + .../i18n/application-swing_es_ES.properties | 2 + .../i18n/application-swing_fr_FR.properties | 2 + .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 37 +++++++ .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 37 +++++++ .../java/fr/ird/observe/entities/Entities.java | 1 + entities/src/main/xmi/observe-common.zargo | Bin 38794 -> 42038 bytes .../ReferentialReferenceSetDefinitions.java | 4 + .../request/ReferenceSetRequestDefinitions.java | 6 + .../dto/referential/ReferentialHelper.java | 1 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 43074 -> 46091 bytes services-dto/src/main/xmi/observe-services-dto.ini | 4 + ....xml => ShipOwner-service-error-validation.xml} | 37 ++++--- ...ml => ShipOwner-service-warning-validation.xml} | 9 +- .../Vessel-service-error-validation.xml | 10 ++ .../services-topia-validation_en_GB.properties | 6 + .../services-topia-validation_es_ES.properties | 6 + .../services-topia-validation_fr_FR.properties | 6 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 9 ++ .../topia/binder/referential/ShipOwnerBinder.java | 56 ++++++++++ .../topia/binder/referential/VesselBinder.java | 4 + 42 files changed, 476 insertions(+), 187 deletions(-) create mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ShipOwnerDto-ui-create-error-validation.xml copy application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline/SensorBrandDto-ui-create-warning-validation.xml => ShipOwnerDto-ui-create-warning-validation.xml} (91%) create mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ShipOwnerDto-ui-update-error-validation.xml copy application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline/SensorBrandDto-ui-create-warning-validation.xml => ShipOwnerDto-ui-update-warning-validation.xml} (91%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{VesselSizeCategoryUI.jaxx => ShipOwnerUI.jaxx} (74%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{OrganismUI.jcss => ShipOwnerUI.jcss} (82%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIModel.java create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-PG.sql copy services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Harbour-service-error-validation.xml => ShipOwner-service-error-validation.xml} (78%) copy services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline/SensorBrand-service-warning-validation.xml => ShipOwner-service-warning-validation.xml} (91%) create mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (012ae4a -> b96f52e)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 012ae4a Fix code mapping (Fixes #8391) new 9dd2350 Ajout champs sur vessel (persistence) new e1dabcc Ajout champs sur vessel (service) new 438b00e Ajout champs sur vessel (ui) new b96f52e [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b96f52e5dd4c729464bb442aaac836874023657d Merge: 012ae4a 438b00e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:45 2016 +0100 [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop commit 438b00e74a5696a4d5ef9f1d6197a974a820532e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:42 2016 +0100 Ajout champs sur vessel (ui) commit e1dabcce66e2797f00b43ab49a7ffc4a6e3d9a7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:27 2016 +0100 Ajout champs sur vessel (service) commit 9dd23505c2a043f67c79d0f3669d30d60464d6c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:17 2016 +0100 Ajout champs sur vessel (persistence) Summary of changes: .../swing/ui/content/ref/impl/VesselUI.jaxx | 70 +++++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUI.jcss | 63 +++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUIModel.java | 40 ++++++++---- .../i18n/application-swing_en_GB.properties | 7 +++ .../i18n/application-swing_es_ES.properties | 7 +++ .../i18n/application-swing_fr_FR.properties | 7 +++ .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 7 +++ .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 7 +++ entities/src/main/xmi/observe-common.zargo | Bin 38441 -> 38794 bytes .../src/main/xmi/observe-services-dto-common.zargo | Bin 42688 -> 43074 bytes .../topia/binder/referential/VesselBinder.java | 15 ++++- 12 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (d1b0407 -> 012ae4a)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from d1b0407 i18n new 012ae4a Fix code mapping (Fixes #8391) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 012ae4abd2c4c3a6acb53f93eddd4a7b6e958b38 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:53:36 2016 +0100 Fix code mapping (Fixes #8391) Summary of changes: .../migration/versions/DataSourceMigrationForVersion_5_1.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ce5b988 -> d1b0407)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from ce5b988 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop new d1b0407 i18n The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d1b0407263f44ff3b9de48b0dafaca300b9ea2c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:46:08 2016 +0100 i18n Summary of changes: .../src/main/resources/i18n/application-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c6b0f1a -> ce5b988)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c6b0f1a [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) new 986452d Fix back migration new 1b266f6 Correction code new 1709445 Ajout length.tagNumber (persistence) new 3a1bbb5 Ajout length.tagNumber (service) new 5731c8b Ajout length.tagNumber (ui) new ce5b988 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ce5b98830fe1bdf0cd1f66fffe3f48f632476742 Merge: c6b0f1a 5731c8b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:59 2016 +0100 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop commit 5731c8b5e3234edc204e528b3f4a62360406aea0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:53 2016 +0100 Ajout length.tagNumber (ui) commit 3a1bbb557ec05f1c97132407b61c1ab44bb38d5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:41 2016 +0100 Ajout length.tagNumber (service) commit 17094452cd38c8e36d430a61afe683a7ce7bdb10 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:28 2016 +0100 Ajout length.tagNumber (persistence) commit 1b266f629b212c6ab21e0e894a8554cad783a43d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:06 2016 +0100 Correction code commit 986452d75fcd366f533b4cbd97b3353ca00c4a0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:47:26 2016 +0100 Fix back migration Summary of changes: .../table/impl/longline/CatchLonglineUI.jaxx | 15 ++++++++++++-- .../table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++ .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++---- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++++++++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++ .../table/impl/seine/TargetSampleUIModel.java | 3 ++- .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 23 ++++++++++----------- .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 21 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (8462307 -> c6b0f1a)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8462307 Ajout du champ Sexe sur les échantillons de cible (Fixes #8572) Merge branch 'feature/8572' into develop new 9ac4f43 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence) new bf37388 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (service) new 3b7c516 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (ui) new c6b0f1a [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c6b0f1a75336d90cd57e419b67bbd40de7224a98 Merge: 8462307 3b7c516 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:35:24 2016 +0100 [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) Merge branch 'feature/8391' into develop commit 3b7c516965f91fe8dee0549e06b8734f3132c9f4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:35:14 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (ui) commit bf37388f3470b899c6f5f8ddaf6aa8f9d484468c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:34:27 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (service) commit 9ac4f430ce124c64d7c97a9cf471a26d6e909efe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:30:07 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence) Summary of changes: .../SpeciesDto-ui-create-error-validation.xml | 11 +++ .../SpeciesDto-ui-update-error-validation.xml | 10 +++ .../application-swing-validation_en_GB.properties | 1 + .../application-swing-validation_es_ES.properties | 1 + .../application-swing-validation_fr_FR.properties | 1 + .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++-- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 22 +++-- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 5 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 1 + .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++-- .../DataSourceMigrationForVersion_5_1.java | 99 +++++++++++++++++++-- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 + entities/src/main/xmi/observe-common.zargo | Bin 37986 -> 38441 bytes .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42563 -> 42688 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../Species-service-error-validation.xml | 10 +++ .../services-topia-validation_en_GB.properties | 1 + .../services-topia-validation_es_ES.properties | 1 + .../services-topia-validation_fr_FR.properties | 1 + .../topia/binder/referential/SpeciesBinder.java | 10 ++- 22 files changed, 176 insertions(+), 43 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

01/04: Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9ac4f430ce124c64d7c97a9cf471a26d6e909efe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:30:07 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence) --- .../DataSourceMigrationForVersion_5_1.java | 99 +++++++++++++++++++-- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 + entities/src/main/xmi/observe-common.zargo | Bin 37986 -> 38441 bytes 4 files changed, 94 insertions(+), 9 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index ab82bfb..8945897 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -1,10 +1,15 @@ package fr.ird.observe.entities.migration.versions; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -12,7 +17,9 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; /** * Created on 27/10/16. @@ -22,6 +29,9 @@ import java.util.List; */ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationCallBack { + /** Logger */ + private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_5_1.class); + public DataSourceMigrationForVersion_5_1(AbstractDataSourceMigration callBack, String scriptSuffix) { super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_1.getVersion(), callBack, scriptSuffix); } @@ -32,16 +42,87 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC boolean showSql, boolean showProgression) { - addScript("01", "evol_8374_delete_sonarUsed", queries); - addScript("02", "evol_7886_catch_add_set_idx", queries); - addScript("03", "evol_6997_delete_supportVesselName", queries); - addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); - addScript("05", "evol_6999_nonTargetCatch_add_well", queries); - addScript("06", "evol_8375_setSeine_add_booleans", queries); - addScript("07", "evol_8389_rename_source_columns", queries); - addScript("08", "evol_8390_measure_type", queries); - addScript("09", "evol_7877_targetLength_add_sex", queries); +// addScript("01", "evol_8374_delete_sonarUsed", queries); +// addScript("02", "evol_7886_catch_add_set_idx", queries); +// addScript("03", "evol_6997_delete_supportVesselName", queries); +// addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); +// addScript("05", "evol_6999_nonTargetCatch_add_well", queries); +// addScript("06", "evol_8375_setSeine_add_booleans", queries); +// addScript("07", "evol_8389_rename_source_columns", queries); +// addScript("08", "evol_8390_measure_type", queries); +// addScript("09", "evol_7877_targetLength_add_sex", queries); +// evol7877(topiaSqlSupport, queries); + addScript("10", "evol_8391_species_add_sizeMeasureType", queries); + evol8391(topiaSqlSupport, queries); + } + + private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { + + ImmutableMap<String,String> missingCodesMapping = ImmutableMap.<String,String>builder() + . put("LT ?","TL") +// . put("TL","TL") +// .put("LF","LF") + .put("FL","LF") + .put("L1","TL") + .put("LC","TL") + .put("LT","TL") + .build(); + List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT DISTINCT(lengthmeasuretype) FROM observe_common.species WHERE lengthmeasuretype IS NOT NULL"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + + Set<String> invalidCodes = new LinkedHashSet<>(); + for (String lengthMeasureType : lengthMeasureTypes) { + + lengthMeasureType = lengthMeasureType.trim(); + if (missingCodesMapping.containsKey(lengthMeasureType)) { + lengthMeasureType = missingCodesMapping.get(lengthMeasureType); + } + + String finalLengthMeasureType = lengthMeasureType; + String sizeMeasureTypeId = topiaSqlSupport.findSingleResult(new TopiaSqlQuery<String>() { + + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '"+ finalLengthMeasureType +"'"); + return preparedStatement; + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + + if (sizeMeasureTypeId == null) { + if (log.isWarnEnabled()) { + log.warn("Impossible de trouver la type de mesure de taille pour le code: " + lengthMeasureType); + } + invalidCodes.add(lengthMeasureType); + } else { + queries.add(String.format("UPDATE observe_common.species SET sizeMeasureType = '%s' WHERE lengthMeasureType = '%s'", sizeMeasureTypeId, lengthMeasureType)); + } + } + + if (!invalidCodes.isEmpty()) { + + throw new IllegalStateException("Impossible de trouver la type de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(invalidCodes)); + } + + queries.add("ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype;"); + + } + private void evol7877(TopiaSqlSupport topiaSqlSupport, List<String> queries) { { List<String> oldIds = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql new file mode 100644 index 0000000..1ecc70a --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_common.species ADD COLUMN sizeMeasureType VARCHAR(255); +ALTER TABLE observe_common.species ADD CONSTRAINT FK_SPECIES_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); diff --git a/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql new file mode 100644 index 0000000..15bdd3e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_common.species ADD COLUMN sizeMeasureType character varying(255); +ALTER TABLE observe_common.species ADD CONSTRAINT FK_SPECIES_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); diff --git a/entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo index 94b7c59..395eb83 100644 Binary files a/entities/src/main/xmi/observe-common.zargo and b/entities/src/main/xmi/observe-common.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0