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 18a9780 [PS] Limiter l'usage du formulaire DCP (Fixes #8376) Merge branch 'feature/8376' into develop new 63eb6c0 Ajout LengthLengthParameter et revue de LWParameter (persistence) new 0ecbc31 Ajout LengthLengthParameter et revue de LWParameter (service) new 30ae2b5 Ajout LengthLengthParameter et revue de LWParameter (ui) new 3b9e046 mise à jour validation new b10613f il se peut que la date max n'existe pas. new 3a0dca4 mise à jour des tests new 6ad0fd7 correction scripts de migration new 587b746 la date de début peut-être nulle new af93bf1 ajout d'un icon new aa8b3b3 Ajout sizeMeasureType sur nonTargetSample et mise en place type de mensuration par défaut new f6609dd Ajout validation de sizeMeasureType sur NonTargetLength new 5833257 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson new b9f1339 Utilisation de la conversion taille - taille quand requis new 4a38a22 Gestion plus perfectionnée des calculs taille-poids (Fixes #8404) Merge branch 'feature/8404' into develop The 14 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 4a38a2237880e4cfde839a607f7f91328fe61fc4 Merge: 18a9780 b9f1339 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 08:06:50 2016 +0100 Gestion plus perfectionnée des calculs taille-poids (Fixes #8404) Merge branch 'feature/8404' into develop commit b9f1339edaf1a4f82f44d8f21489a9cd4f36f642 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 15:48:25 2016 +0100 Utilisation de la conversion taille - taille quand requis commit 58332577f889bd7e2844fcfdc6757b02f534c2cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 12:39:47 2016 +0100 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson commit f6609dd61769b259529ed0ba0282a65117479549 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 12:03:03 2016 +0100 Ajout validation de sizeMeasureType sur NonTargetLength commit aa8b3b337dbd8957f9e15ee0fec0f511b56b93cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 12:02:43 2016 +0100 Ajout sizeMeasureType sur nonTargetSample et mise en place type de mensuration par défaut commit af93bf166e2c43b254aeae34b0c3bae3b79d1ad6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 6 12:01:44 2016 +0100 ajout d'un icon commit 587b746d6fef5efae1f9cc711fd623815e92ddae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:45:07 2016 +0100 la date de début peut-être nulle commit 6ad0fd792a750f9ee834aee4ed45d6f67efe69d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:44:50 2016 +0100 correction scripts de migration commit 3a0dca45be6215eb830a5e7702fb753f332e0460 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:43:52 2016 +0100 mise à jour des tests commit b10613f57eca0986bdea7ce9fcf5bc924e0397c4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:43:17 2016 +0100 il se peut que la date max n'existe pas. commit 3b9e046579fcbffe042908cdb8d45b64d788a621 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:46:01 2016 +0100 mise à jour validation commit 30ae2b5f97dd1da5007d387b404e508fa0dab75b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:30:32 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (ui) commit 0ecbc3191808377a593577ad538f277bc1d8e423 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:29:58 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (service) commit 63eb6c05c52a3fd8f43f7c44b65adad9a8b2da79 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:29:23 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (persistence) Summary of changes: .../swing/decoration/DecoratorService.java | 11 +- ...or.java => LengthLengthParameterDecorator.java} | 29 +- .../application-swing-decoration_en_GB.properties | 5 +- .../application-swing-decoration_es_ES.properties | 3 + .../application-swing-decoration_fr_FR.properties | 3 + ...ngthParameterDto-ui-create-error-validation.xml | 108 +++++++ ...hParameterDto-ui-create-warning-validation.xml} | 14 +- ...gthParameterDto-ui-update-error-validation.xml} | 58 ++-- ...hParameterDto-ui-update-warning-validation.xml} | 0 ...ightParameterDto-ui-create-error-validation.xml | 17 +- ...htParameterDto-ui-create-warning-validation.xml | 8 + ...nTargetLengthDto-ui-update-error-validation.xml | 17 ++ .../application-swing-validation_en_GB.properties | 16 + .../application-swing-validation_es_ES.properties | 16 + .../application-swing-validation_fr_FR.properties | 18 +- .../validation/BeanValidatorDetectorTest.java | 10 +- application-swing/pom.xml | 5 + .../src/main/filters/observe-ui.properties | 1 + ...rameterUI.jaxx => LengthLengthParameterUI.jaxx} | 139 ++------- ...rameterUI.jcss => LengthLengthParameterUI.jcss} | 100 ++----- ...er.java => LengthLengthParameterUIHandler.java} | 22 +- ...odel.java => LengthLengthParameterUIModel.java} | 55 ++-- .../content/ref/impl/LengthWeightParameterUI.jaxx | 38 +-- .../content/ref/impl/LengthWeightParameterUI.jcss | 17 ++ .../ref/impl/LengthWeightParameterUIModel.java | 3 + .../content/table/impl/seine/AbstractSampleUI.jcss | 49 +++ .../table/impl/seine/AbstractSampleUIHandler.java | 36 ++- .../table/impl/seine/NonTargetSampleUI.jaxx | 37 ++- .../table/impl/seine/NonTargetSampleUI.jcss | 25 -- .../table/impl/seine/NonTargetSampleUIHandler.java | 72 ++++- .../table/impl/seine/NonTargetSampleUIModel.java | 26 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 4 +- .../content/table/impl/seine/TargetSampleUI.jcss | 45 --- .../table/impl/seine/TargetSampleUIHandler.java | 100 +++++-- .../table/impl/seine/TargetSampleUIModel.java | 20 +- .../i18n/application-swing_en_GB.properties | 9 + .../i18n/application-swing_es_ES.properties | 9 + .../i18n/application-swing_fr_FR.properties | 9 + application-web/pom.xml | 5 + .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 2 +- .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 2 +- .../V5_1_18_evol_8404_lengthLengthParameter-H2.sql | 14 + .../V5_1_18_evol_8404_lengthLengthParameter-PG.sql | 14 + .../java/fr/ird/observe/entities/Entities.java | 1 + .../observe/entities/LengthWeightComputable.java | 5 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../entities/referentiel/FormulaHelper.java | 169 +++++++++++ .../entities/referentiel/FormulaSupportImpl.java | 88 ++++++ .../referentiel/LengthLengthParameterImpl.java | 55 ++++ .../referentiel/LengthLengthParameterTopiaDao.java | 16 + .../referentiel/LengthLengthParameters.java | 21 ++ .../referentiel/LengthWeightParameterImpl.java | 110 +------ .../referentiel/LengthWeightParameters.java | 260 +++------------- .../referentiel/LengthWeightParemeterHelper.java | 332 --------------------- .../observe/entities/seine/NonTargetCatchImpl.java | 6 + entities/src/main/xmi/observe-common.zargo | Bin 42084 -> 45678 bytes entities/src/main/xmi/observe-seine.zargo | Bin 86910 -> 87124 bytes entities/src/main/xmi/observe.ini | 9 +- .../entities/referentiel/FormulaHelperTest.java | 27 ++ .../LengthWeightParemeterHelperTest.java | 48 --- pom.xml | 2 + .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 48 +-- .../ird/observe/services/dto/gson/BlobAdapter.java | 0 .../observe/services/dto/gson/ClassAdapter.java | 0 .../ird/observe/services/dto/gson/DateAdapter.java | 0 .../ird/observe/services/dto/gson/FormAdapter.java | 0 .../services/dto/gson/ImmutableListAdapter.java | 0 .../services/dto/gson/ImmutableMapAdapter.java | 0 .../dto/gson/ImmutableMultimapAdapter.java | 0 .../services/dto/gson/ImmutableSetAdapter.java | 0 .../observe/services/dto/gson/IntegerAdapter.java | 0 .../services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../dto/gson/ReferentialMultimapAdapter.java | 0 .../services/dto/gson/ReportVariableAdapter.java | 0 .../observe/services/dto/gson/VersionAdapter.java | 0 .../gson/reference/AbstractReferenceAdapter.java | 0 .../reference/AbstractReferenceSetAdapter.java | 0 .../dto/gson/reference/DataReferenceAdapter.java | 0 .../gson/reference/DataReferenceSetAdapter.java | 0 .../reference/ReferentialReferenceAdapter.java | 0 .../reference/ReferentialReferenceSetAdapter.java | 0 .../gson/reference/UnknownReferenceAdapter.java | 0 .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 42 +-- .../dto/reference/DataReferenceSetDefinitions.java | 0 .../dto/reference/ReferenceBinderEngine.java | 0 .../reference/ReferenceBinderEngineSupplier.java | 0 .../dto/reference/ReferenceSetDefinition.java | 0 .../ReferentialReferenceSetDefinitions.java | 12 +- .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 11 +- .../request/ReferenceSetRequestKeyDefinition.java | 0 services-dto/pom.xml | 13 - .../services/dto/referential/FormulaHelper.java | 134 +++++++++ .../dto/referential/LengthLengthParameterDto.java | 48 +++ .../dto/referential/LengthWeightParameterDto.java | 48 +++ .../dto/referential/ReferentialHelper.java | 1 + .../dto/referential/SizeMeasureTypeHelper.java | 17 -- .../src/main/xmi/observe-services-dto-common.zargo | Bin 46149 -> 48945 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60743 -> 60919 bytes services-dto/src/main/xmi/observe-services-dto.ini | 12 +- services-rest/pom.xml | 11 + services-runner/pom.xml | 6 + services-topia-binder/pom.xml | 5 + .../topia/binder/BinderEngineInitializer.java | 17 +- .../services/topia/binder/BinderSupport.java | 10 + .../topia/binder/data/ActivityLonglineBinder.java | 4 +- .../topia/binder/data/ActivitySeineBinder.java | 4 +- .../topia/binder/data/NonTargetLengthBinder.java | 4 + .../topia/binder/data/TripLonglineBinder.java | 8 +- .../topia/binder/data/TripSeineBinder.java | 4 +- .../referential/LengthLengthParameterBinder.java | 92 ++++++ .../referential/LengthWeightParameterBinder.java | 2 + .../topia/binder/referential/SpeciesBinder.java | 4 +- .../topia/binder/BinderEngineMetadataTest.java | 4 +- ...thLengthParameter-service-error-validation.xml} | 61 ++-- ...LengthParameter-service-warning-validation.xml} | 0 ...gthWeightParameter-service-error-validation.xml | 10 +- .../services-topia-validation_en_GB.properties | 7 + .../services-topia-validation_es_ES.properties | 7 + .../services-topia-validation_fr_FR.properties | 7 + .../validation/BeanValidatorDetectorTest.java | 4 +- services-topia/pom.xml | 11 + .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 39 ++- .../topia/entity/LengthWeightParemetersTest.java | 26 +- .../UnidirectionalSynchronizeReferentialTest.java | 4 + services/pom.xml | 9 + .../java/fr/ird/observe/test/ObserveFixtures.java | 3 +- .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 1626691 -> 1626811 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 455040 -> 455518 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 6193 -> 6302 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 6188 -> 6293 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 181714 -> 182328 bytes 138 files changed, 1773 insertions(+), 1321 deletions(-) copy application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/{NonTargetCatchDecorator.java => LengthLengthParameterDecorator.java} (52%) create mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml copy application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{LengthWeightParameterDto-ui-update-warning-validation.xml => LengthLengthParameterDto-ui-create-warning-validation.xml} (82%) copy application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OrganismDto-ui-create-warning-validation.xml => LengthLengthParameterDto-ui-update-error-validation.xml} (54%) copy application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselSizeCategoryDto-ui-update-warning-validation.xml => LengthLengthParameterDto-ui-update-warning-validation.xml} (100%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{LengthWeightParameterUI.jaxx => LengthLengthParameterUI.jaxx} (55%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{LengthWeightParameterUI.jcss => LengthLengthParameterUI.jcss} (52%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{LengthWeightParameterUIHandler.java => LengthLengthParameterUIHandler.java} (84%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{LengthWeightParameterUIModel.java => LengthLengthParameterUIModel.java} (53%) create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java delete mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java create mode 100644 entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java delete mode 100644 entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java copy {topia-templates-extension => services-dto-gson}/LICENSE.txt (100%) copy {topia-templates-extension => services-dto-gson}/README.md (100%) copy {services-topia-validators => services-dto-gson}/pom.xml (62%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java (100%) rename {services-dto => services-dto-gson}/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java (100%) copy {topia-templates-extension => services-dto-reference}/LICENSE.txt (100%) copy {topia-templates-extension => services-dto-reference}/README.md (100%) copy {services-topia-validators => services-dto-reference}/pom.xml (65%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/ReferenceSetDefinition.java (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java (94%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java (97%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java (100%) create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/FormulaHelper.java create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java create mode 100644 services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthLengthParameterBinder.java copy services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Person-service-error-validation.xml => LengthLengthParameter-service-error-validation.xml} (57%) copy services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{VesselSizeCategory-service-warning-validation.xml => LengthLengthParameter-service-warning-validation.xml} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.