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

branch develop updated (88fdffc -> e54cb1f)
by codelutin.com scm 07 Nov '16

07 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 88fdffc Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes (Fixes #7994) Merge branch 'feature/7994' into develop new e54cb1f remove old test bases 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 e54cb1f8a43d2d143ae67135361a3ca82bce3223 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 14:26:21 2016 +0100 remove old test bases Summary of changes: .../services/topia/DataSourcesForTestManager.java | 2 ++ .../topia/service/sql/MigrateTestsDatabases.java | 4 ++-- services-topia/src/test/resources/log4j.properties | 2 +- .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin 1520436 -> 0 bytes .../main/resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 430080 -> 0 bytes test/src/main/resources/db/4.0.1/empty_h2.sql.gz | Bin 5992 -> 0 bytes test/src/main/resources/db/4.0.1/empty_pg.sql.gz | Bin 5983 -> 0 bytes test/src/main/resources/db/4.0.1/referentiel.sql.gz | Bin 137641 -> 0 bytes test/src/main/resources/db/4.0/referentiel.sql.gz | Bin 138262 -> 0 bytes .../resources/db/4.902/dataForTestLongline.sql.gz | Bin 1621369 -> 0 bytes .../main/resources/db/4.902/dataForTestSeine.sql.gz | Bin 440282 -> 0 bytes test/src/main/resources/db/4.902/empty_h2.sql.gz | Bin 6020 -> 0 bytes test/src/main/resources/db/4.902/empty_pg.sql.gz | Bin 5994 -> 0 bytes test/src/main/resources/db/4.902/referentiel.sql.gz | Bin 162596 -> 0 bytes .../resources/db/4.903/dataForTestLongline.sql.gz | Bin 1627285 -> 0 bytes .../main/resources/db/4.903/dataForTestSeine.sql.gz | Bin 441224 -> 0 bytes ...dataForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441247 -> 0 bytes test/src/main/resources/db/4.903/empty_h2.sql.gz | Bin 6020 -> 0 bytes test/src/main/resources/db/4.903/empty_pg.sql.gz | Bin 5994 -> 0 bytes test/src/main/resources/db/4.903/referentiel.sql.gz | Bin 162763 -> 0 bytes .../resources/db/4.904/dataForTestLongline.sql.gz | Bin 1626934 -> 0 bytes .../main/resources/db/4.904/dataForTestSeine.sql.gz | Bin 451066 -> 0 bytes ...dataForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441263 -> 0 bytes test/src/main/resources/db/4.904/empty_h2.sql.gz | Bin 6018 -> 0 bytes test/src/main/resources/db/4.904/empty_pg.sql.gz | Bin 6003 -> 0 bytes test/src/main/resources/db/4.904/referentiel.sql.gz | Bin 140244 -> 0 bytes .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 1622096 -> 0 bytes .../main/resources/db/4.905/dataForTestSeine.sql.gz | Bin 451016 -> 0 bytes ...dataForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441248 -> 0 bytes test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 6006 -> 0 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 6004 -> 0 bytes test/src/main/resources/db/4.905/referentiel.sql.gz | Bin 140214 -> 0 bytes .../resources/db/4.906/dataForTestLongline.sql.gz | Bin 1622154 -> 0 bytes .../main/resources/db/4.906/dataForTestSeine.sql.gz | Bin 451054 -> 0 bytes ...dataForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441255 -> 0 bytes test/src/main/resources/db/4.906/empty_h2.sql.gz | Bin 6012 -> 0 bytes test/src/main/resources/db/4.906/empty_pg.sql.gz | Bin 6006 -> 0 bytes test/src/main/resources/db/4.906/referentiel.sql.gz | Bin 140211 -> 0 bytes 38 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 test/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.0.1/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.0.1/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.0.1/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.0/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.902/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.902/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.902/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.902/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.902/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.903/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.903/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz delete mode 100644 test/src/main/resources/db/4.903/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.903/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.903/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.904/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.904/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz delete mode 100644 test/src/main/resources/db/4.904/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.904/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.904/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.905/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.905/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.905/dataForTestUnidirectionalReferentialSynchro.sql.gz delete mode 100644 test/src/main/resources/db/4.905/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.905/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.905/referentiel.sql.gz delete mode 100644 test/src/main/resources/db/4.906/dataForTestLongline.sql.gz delete mode 100644 test/src/main/resources/db/4.906/dataForTestSeine.sql.gz delete mode 100644 test/src/main/resources/db/4.906/dataForTestUnidirectionalReferentialSynchro.sql.gz delete mode 100644 test/src/main/resources/db/4.906/empty_h2.sql.gz delete mode 100644 test/src/main/resources/db/4.906/empty_pg.sql.gz delete mode 100644 test/src/main/resources/db/4.906/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6f970c0 -> 88fdffc)
by codelutin.com scm 07 Nov '16

07 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 6f970c0 [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) Merge branch 'feature/7008' into develop new 1d5a09c Ajout d'un objet pour détecter les référentiels manquants new 438ed9c Permettre de produire des requêtes d'insertion de référentiels new 97d4780 Ajout de la possibilité d'inserer les référentiels manquants lors d'un import en base centrale new a4a1358 improve code new 2d78293 change modules order new 481f140 Récupérer le résultat de l'insertion des référentiels manquants et l'afficher à l'utilisateur lors de l'export new a43675f amélioration des paquetages de services new c938eca Afficher les références insérées dans la base centrale new 88fdffc Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes (Fixes #7994) Merge branch 'feature/7994' into develop The 9 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 88fdffcffee03b94f6ac856cd18b44481c4638b0 Merge: 6f970c0 c938eca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 13:27:30 2016 +0100 Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes (Fixes #7994) Merge branch 'feature/7994' into develop commit c938eca80c8f93af3307f6342e6e7152fa45564f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 13:27:22 2016 +0100 Afficher les références insérées dans la base centrale commit a43675fec9c9805e725d2a3e8220185e7a35430d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 13:18:08 2016 +0100 amélioration des paquetages de services commit 481f140cd9e8c7a8d99fddf8bd0bdadaf66bcb79 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 12:48:30 2016 +0100 Récupérer le résultat de l'insertion des référentiels manquants et l'afficher à l'utilisateur lors de l'export commit 2d7829358e31aae401723a81e4114bf67d87a0d2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 12:47:56 2016 +0100 change modules order commit a4a135849b4446087f26a1f23f4105d106b6cb2e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 12:45:12 2016 +0100 improve code commit 97d47806defd6973595b2a0ee6c793e83af99c6e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 12:01:16 2016 +0100 Ajout de la possibilité d'inserer les référentiels manquants lors d'un import en base centrale commit 438ed9c536e496042523442b2eaace5ed717566e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 12:00:43 2016 +0100 Permettre de produire des requêtes d'insertion de référentiels commit 1d5a09cfb674c05f1c9f0c92a2f39ccf56ae5101 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 11:59:03 2016 +0100 Ajout d'un objet pour détecter les référentiels manquants Summary of changes: .../swing/db/ObserveSwingDataSource.java | 74 +++--- .../shared/MoveActivityLonglinesUIAction.java | 2 +- .../actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../actions/shared/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 6 +- .../application/swing/ui/admin/AdminUIModel.java | 4 +- .../swing/ui/admin/export/ExportModel.java | 10 + .../swing/ui/admin/export/ExportUI.jaxx | 3 + .../swing/ui/admin/export/ExportUI.jcss | 5 + .../swing/ui/admin/export/ExportUIHandler.java | 105 +++++++- .../swing/ui/admin/save/SaveLocalUIHandler.java | 4 +- .../synchronize/data/DataSynchroUIHandler.java | 14 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 6 +- .../table/impl/longline/EncounterUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 4 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 8 +- .../swing/ui/storage/StorageUIHandler.java | 4 +- .../swing/ui/storage/StorageUIModel.java | 4 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 4 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 4 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 2 +- .../swing/ui/tree/node/ActivityLonglineNode.java | 2 +- .../swing/ui/tree/node/ActivitySeineNode.java | 2 +- .../ui/tree/node/FloatingObjectSeineNode.java | 2 +- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 +- .../swing/ui/tree/node/ProgramSeineNode.java | 2 +- .../swing/ui/tree/node/RouteSeineNode.java | 2 +- .../swing/ui/tree/node/SetLonglineNode.java | 2 +- .../swing/ui/tree/node/SetSeineNode.java | 2 +- .../swing/ui/tree/node/TripLonglineNode.java | 2 +- .../swing/ui/tree/node/TripSeineNode.java | 2 +- .../swing/validation/ValidationContext.java | 18 +- .../i18n/application-swing_en_GB.properties | 14 +- .../i18n/application-swing_es_ES.properties | 14 +- .../i18n/application-swing_fr_FR.properties | 14 +- .../TripManagementServiceController.java | 16 +- ...ActivityLongLineEncounterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 4 +- .../longline/BranchlineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../longline/SetLonglineServiceController.java | 4 +- .../{ => data}/longline/TdrServiceController.java | 4 +- .../TripLonglineGearUseServiceController.java | 4 +- .../longline/TripLonglineServiceController.java | 4 +- .../seine/ActivitySeineServiceController.java | 4 +- .../seine/FloatingObjectServiceController.java | 4 +- .../seine/NonTargetCatchServiceController.java | 4 +- .../seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../{ => data}/seine/RouteServiceController.java | 4 +- .../seine/SchoolEstimateServiceController.java | 4 +- .../seine/SetSeineServiceController.java | 4 +- .../seine/TargetCatchServiceController.java | 4 +- .../seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../seine/TripSeineGearUseServiceController.java | 4 +- .../seine/TripSeineServiceController.java | 4 +- .../ReferentialServiceController.java | 24 +- .../SqlScriptProducerServiceController.java | 11 +- .../ObserveReferenceSetRequestInjector.java | 2 +- .../injector/SqlScriptProducerRequestInjector.java | 2 +- application-web/src/main/resources/mapping | 287 +++++++++++---------- .../observe/ObserveTopiaApplicationContext.java | 6 + pom.xml | 6 +- .../service/ReferenceValuesSetServiceRestTest.java | 4 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 4 +- .../service/seine/TripSeineServiceRestTest.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../{ => data}/ImportTripScriptTopiaSqlWork.java | 4 +- .../{ => data}/TripManagementServiceTopia.java | 26 +- .../ActivityLongLineEncounterServiceTopia.java | 4 +- .../ActivityLongLineSensorUsedServiceTopia.java | 4 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../longline/BranchlineServiceTopia.java | 4 +- .../longline/LonglinePositionSetDtoHelper.java | 2 +- .../longline/SetLonglineCatchServiceTopia.java | 4 +- .../SetLonglineDetailCompositionServiceTopia.java | 4 +- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../longline/SetLonglineServiceTopia.java | 4 +- .../{ => data}/longline/TdrServiceTopia.java | 4 +- .../longline/TripLonglineGearUseServiceTopia.java | 4 +- .../longline/TripLonglineServiceTopia.java | 4 +- .../seine/ActivitySeineServiceTopia.java | 4 +- .../seine/FloatingObjectServiceTopia.java | 4 +- .../seine/NonTargetCatchServiceTopia.java | 4 +- .../seine/NonTargetSampleServiceTopia.java | 5 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 4 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/RouteServiceTopia.java | 4 +- .../seine/SchoolEstimateServiceTopia.java | 4 +- .../{ => data}/seine/SetSeineServiceTopia.java | 4 +- .../{ => data}/seine/TargetCatchServiceTopia.java | 4 +- .../{ => data}/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../seine/TripSeineGearUseServiceTopia.java | 4 +- .../{ => data}/seine/TripSeineServiceTopia.java | 4 +- .../{ => referential}/ReferentialServiceTopia.java | 85 +++++- .../referential/ReferentialsShellBuilder.java | 116 +++++++++ .../{ => sql}/SqlScriptProducerServiceTopia.java | 49 +++- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 3 +- .../observe/services/topia/service/RigthTest.java | 4 +- .../service/TripManagementServiceTopiaTest.java | 16 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 2 +- .../topia/service/seine/RouteServiceTopiaTest.java | 2 +- .../seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 4 +- .../service/{ => sql}/MigrateTestsDatabases.java | 9 +- .../SqlScriptProducerServiceTopiaTest.java} | 21 +- .../observe/services/ObserveServicesProvider.java | 56 ++-- .../service/{trip => data}/DeleteTripRequest.java | 2 +- .../service/{trip => data}/DeleteTripResult.java | 2 +- .../service/{trip => data}/ExportTripRequest.java | 2 +- .../service/{trip => data}/ExportTripResult.java | 4 +- .../service/{trip => data}/ImportTripRequest.java | 4 +- .../service/{trip => data}/ImportTripResult.java | 2 +- .../{trip => data}/TripManagementService.java | 2 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../longline/ActivityLonglineService.java | 2 +- .../{ => data}/longline/BranchlineService.java | 2 +- .../longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../{ => data}/longline/SetLonglineService.java | 2 +- .../service/{ => data}/longline/TdrService.java | 2 +- .../longline/TripLonglineGearUseService.java | 2 +- .../{ => data}/longline/TripLonglineService.java | 2 +- .../{ => data}/seine/ActivitySeineService.java | 2 +- .../{ => data}/seine/FloatingObjectService.java | 2 +- .../{ => data}/seine/NonTargetCatchService.java | 2 +- .../{ => data}/seine/NonTargetSampleService.java | 2 +- .../seine/ObjectObservedSpeciesService.java | 2 +- .../seine/ObjectSchoolEstimateService.java | 2 +- .../service/{ => data}/seine/RouteService.java | 2 +- .../{ => data}/seine/SchoolEstimateService.java | 2 +- .../service/{ => data}/seine/SetSeineService.java | 2 +- .../{ => data}/seine/TargetCatchService.java | 2 +- .../{ => data}/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../{ => data}/seine/TripSeineGearUseService.java | 2 +- .../service/{ => data}/seine/TripSeineService.java | 2 +- .../referential/MissingReferentialResult.java | 33 +++ .../{ => referential}/ObserveReferentialCache.java | 2 +- .../{ => referential}/ReferenceSetsRequest.java | 2 +- .../{ => referential}/ReferentialService.java | 19 +- .../{ => sql}/AddSqlScriptProducerRequest.java | 37 ++- .../{ => sql}/AddSqlScriptProducerResult.java | 2 +- .../{ => sql}/DeleteSqlScriptProducerRequest.java | 2 +- .../service/{ => sql}/ObserveBlobsContainer.java | 2 +- .../{ => sql}/SqlScriptProducerService.java | 2 +- 198 files changed, 1035 insertions(+), 564 deletions(-) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{trip => data}/TripManagementServiceController.java (76%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/ActivityLongLineEncounterServiceController.java (91%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/ActivityLongLineSensorUsedServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/ActivityLonglineServiceController.java (95%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/BranchlineServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/SetLonglineCatchServiceController.java (91%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/SetLonglineDetailCompositionServiceController.java (93%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/SetLonglineGlobalCompositionServiceController.java (91%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/SetLonglineServiceController.java (94%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/TdrServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/TripLonglineGearUseServiceController.java (91%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/longline/TripLonglineServiceController.java (96%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/ActivitySeineServiceController.java (95%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/FloatingObjectServiceController.java (95%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/NonTargetCatchServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/NonTargetSampleServiceController.java (93%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/ObjectObservedSpeciesServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/ObjectSchoolEstimateServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/RouteServiceController.java (95%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/SchoolEstimateServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/SetSeineServiceController.java (94%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/TargetCatchServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/TargetSampleServiceController.java (94%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/TransmittingBuoyOperationServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/TripSeineGearUseServiceController.java (92%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => data}/seine/TripSeineServiceController.java (96%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => referential}/ReferentialServiceController.java (78%) rename application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{ => sql}/SqlScriptProducerServiceController.java (76%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/ImportTripScriptTopiaSqlWork.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/TripManagementServiceTopia.java (88%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/ActivityLongLineEncounterServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/ActivityLongLineSensorUsedServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/ActivityLonglineServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/BranchlineServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/LonglinePositionSetDtoHelper.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/SetLonglineCatchServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/SetLonglineDetailCompositionServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/SetLonglineGlobalCompositionServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/SetLonglineServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/TdrServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/TripLonglineGearUseServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/longline/TripLonglineServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/ActivitySeineServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/FloatingObjectServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/NonTargetCatchServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/NonTargetSampleServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/ObjectObservedSpeciesServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/ObjectSchoolEstimateServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/RouteServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/SchoolEstimateServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/SetSeineServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/TargetCatchServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/TargetSampleServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/TransmittingBuoyOperationServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/TripSeineGearUseServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => data}/seine/TripSeineServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => referential}/ReferentialServiceTopia.java (73%) create mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java rename services-topia/src/main/java/fr/ird/observe/services/topia/service/{ => sql}/SqlScriptProducerServiceTopia.java (81%) rename services-topia/src/test/java/fr/ird/observe/services/topia/service/{ => sql}/MigrateTestsDatabases.java (95%) rename services-topia/src/test/java/fr/ird/observe/services/topia/service/{AddSqlScriptProducerServiceTopiaTest.java => sql/SqlScriptProducerServiceTopiaTest.java} (79%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/DeleteTripRequest.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/DeleteTripResult.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/ExportTripRequest.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/ExportTripResult.java (94%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/ImportTripRequest.java (94%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/ImportTripResult.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{trip => data}/TripManagementService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/ActivityLongLineEncounterService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/ActivityLongLineSensorUsedService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/ActivityLonglineService.java (98%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/BranchlineService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/SetLonglineCatchService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/SetLonglineDetailCompositionService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/SetLonglineGlobalCompositionService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/SetLonglineService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/TdrService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/TripLonglineGearUseService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/longline/TripLonglineService.java (98%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/ActivitySeineService.java (98%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/FloatingObjectService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/NonTargetCatchService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/NonTargetSampleService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/ObjectObservedSpeciesService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/ObjectSchoolEstimateService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/RouteService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/SchoolEstimateService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/SetSeineService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/TargetCatchService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/TargetSampleService.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/TransmittingBuoyOperationService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/TripSeineGearUseService.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => data}/seine/TripSeineService.java (98%) create mode 100644 services/src/main/java/fr/ird/observe/services/service/referential/MissingReferentialResult.java rename services/src/main/java/fr/ird/observe/services/service/{ => referential}/ObserveReferentialCache.java (99%) rename services/src/main/java/fr/ird/observe/services/service/{ => referential}/ReferenceSetsRequest.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => referential}/ReferentialService.java (84%) rename services/src/main/java/fr/ird/observe/services/service/{ => sql}/AddSqlScriptProducerRequest.java (61%) rename services/src/main/java/fr/ird/observe/services/service/{ => sql}/AddSqlScriptProducerResult.java (96%) rename services/src/main/java/fr/ird/observe/services/service/{ => sql}/DeleteSqlScriptProducerRequest.java (98%) rename services/src/main/java/fr/ird/observe/services/service/{ => sql}/ObserveBlobsContainer.java (97%) rename services/src/main/java/fr/ird/observe/services/service/{ => sql}/SqlScriptProducerService.java (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 9

branch develop updated (10ee9e9 -> 6f970c0)
by codelutin.com scm 07 Nov '16

07 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 10ee9e9 Réglage par défaut des proportions des volets de la fenêtre (Fixes #2841) Merge branch 'feature/2841' into develop new a910daa Ajout d'une option dans la configuration pour forcer la validation des bornes min/max sur les espèces new b58a525 Ajout des nouvelles dans l'écran de configuration new 95e8124 Mise en place du switch de validation selon la nouvelle option new 1b36d11 Amélioration code new 5eff1fa Bien recharger le context de validation dans les validateurs au redémarrage applicatif new 6f970c0 [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) Merge branch 'feature/7008' 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 6f970c0665f9c90d35b6006f617e472a35545494 Merge: 10ee9e9 5eff1fa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:25:10 2016 +0100 [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) Merge branch 'feature/7008' into develop commit 5eff1fae5e37585274e30cf5540f418915364e80 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:25:07 2016 +0100 Bien recharger le context de validation dans les validateurs au redémarrage applicatif commit 1b36d11b7a6b1ff0a4354e898061b4592f995890 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:24:34 2016 +0100 Amélioration code commit 95e81243d4d9482f131824f1e58e10d42fb0ea8d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:07:45 2016 +0100 Mise en place du switch de validation selon la nouvelle option commit b58a525bee357dd842aab5eb8e913ba9b68de3ce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:07:32 2016 +0100 Ajout des nouvelles dans l'écran de configuration commit a910daabe134ec112bd44b655fba2cefdfa8fa97 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 09:07:16 2016 +0100 Ajout d'une option dans la configuration pour forcer la validation des bornes min/max sur les espèces Summary of changes: .../src/main/config/ObserveSwingApplication.ini | 6 ++++ ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + ...nTargetLengthDto-ui-update-error-validation.xml | 17 +++++++++ ...argetLengthDto-ui-update-warning-validation.xml | 3 +- .../AbstractSpeciesFieldDtoValidator.java | 42 ++++++++++++++-------- .../observe/application/swing/ObserveRunner.java | 9 +++-- .../swing/ui/actions/ShowConfigAction.java | 2 ++ .../swing/validation/ObserveSwingValidator.java | 11 ++---- .../swing/validation/ValidationContext.java | 4 +++ 11 files changed, 71 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (4a38a22 -> 10ee9e9)
by codelutin.com scm 07 Nov '16

07 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 4a38a22 Gestion plus perfectionnée des calculs taille-poids (Fixes #8404) Merge branch 'feature/8404' into develop new ab2e912 Ajout d'une nouvelle option à la configuration pour le fichier de sauvegarde des états des ui new 831f205 Mise en place de SwingSession dans ObServe new 10ee9e9 Réglage par défaut des proportions des volets de la fenêtre (Fixes #2841) Merge branch 'feature/2841' into develop The 3 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 10ee9e9a4311b6a10a8653d6ab847164a9fd384d Merge: 4a38a22 831f205 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 08:34:16 2016 +0100 Réglage par défaut des proportions des volets de la fenêtre (Fixes #2841) Merge branch 'feature/2841' into develop commit 831f2050ffa6fcdcd17651ad22105c9d8e64f21f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 08:34:14 2016 +0100 Mise en place de SwingSession dans ObServe commit ab2e9125f3fd5c53f160b8f4bbfda8dfaec9c1ad Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 7 08:34:01 2016 +0100 Ajout d'une nouvelle option à la configuration pour le fichier de sauvegarde des états des ui Summary of changes: .../src/main/config/ObserveSwingApplication.ini | 8 ++++ ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + .../observe/application/swing/ObserveRunner.java | 2 + .../swing/ObserveSwingApplicationContext.java | 9 ++++ .../swing/ObserveSwingSessionHelper.java | 52 ++++++++++++++++++++++ .../swing/ui/content/ContentUIManager.java | 7 ++- 8 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingSessionHelper.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (18a9780 -> 4a38a22)
by codelutin.com scm 07 Nov '16

07 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 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(a)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(a)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(a)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(a)codelutin.com> Date: Sun Nov 6 12:03:03 2016 +0100 Ajout validation de sizeMeasureType sur NonTargetLength commit aa8b3b337dbd8957f9e15ee0fec0f511b56b93cf Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sun Nov 6 12:01:44 2016 +0100 ajout d'un icon commit 587b746d6fef5efae1f9cc711fd623815e92ddae Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sat Nov 5 16:44:50 2016 +0100 correction scripts de migration commit 3a0dca45be6215eb830a5e7702fb753f332e0460 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 16:43:52 2016 +0100 mise à jour des tests commit b10613f57eca0986bdea7ce9fcf5bc924e0397c4 Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sat Nov 5 15:46:01 2016 +0100 mise à jour validation commit 30ae2b5f97dd1da5007d387b404e508fa0dab75b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 15:30:32 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (ui) commit 0ecbc3191808377a593577ad538f277bc1d8e423 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 15:29:58 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (service) commit 63eb6c05c52a3fd8f43f7c44b65adad9a8b2da79 Author: Tony CHEMIT <chemit(a)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(a)codelutin.com>.

1 7

branch feature/8404 deleted (was b9f1339)
by codelutin.com scm 07 Nov '16

07 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was b9f1339 Utilisation de la conversion taille - taille quand requis This change permanently discards the following revisions: discards b9f1339 Utilisation de la conversion taille - taille quand requis discards 5833257 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson discards f6609dd Ajout validation de sizeMeasureType sur NonTargetLength discards aa8b3b3 Ajout sizeMeasureType sur nonTargetSample et mise en place type de mensuration par défaut discards af93bf1 ajout d'un icon discards 587b746 la date de début peut-être nulle discards 6ad0fd7 correction scripts de migration discards 3a0dca4 mise à jour des tests discards b10613f il se peut que la date max n'existe pas. discards 3b9e046 mise à jour validation discards 30ae2b5 Ajout LengthLengthParameter et revue de LWParameter (ui) discards 0ecbc31 Ajout LengthLengthParameter et revue de LWParameter (service) discards 63eb6c0 Ajout LengthLengthParameter et revue de LWParameter (persistence) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8404 updated (5833257 -> b9f1339)
by codelutin.com scm 06 Nov '16

06 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 5833257 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson new b9f1339 Utilisation de la conversion taille - taille quand requis 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 b9f1339edaf1a4f82f44d8f21489a9cd4f36f642 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 6 15:48:25 2016 +0100 Utilisation de la conversion taille - taille quand requis Summary of changes: .../observe/entities/LengthWeightComputable.java | 5 +- .../referentiel/LengthLengthParameterTopiaDao.java | 16 ++++++ .../referentiel/LengthLengthParameters.java | 9 ++++ .../referentiel/LengthWeightParameters.java | 63 ++++++++++------------ .../observe/entities/seine/NonTargetCatchImpl.java | 6 +++ .../consolidate/ConsolidateDataServiceTopia.java | 31 +++++++++-- .../topia/entity/LengthWeightParemetersTest.java | 4 +- 7 files changed, 92 insertions(+), 42 deletions(-) create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8404 updated (f6609dd -> 5833257)
by codelutin.com scm 06 Nov '16

06 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from f6609dd Ajout validation de sizeMeasureType sur NonTargetLength new 5833257 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson 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 58332577f889bd7e2844fcfdc6757b02f534c2cb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 6 12:39:47 2016 +0100 Introduction de deux nouveaux modules services-dto-reference et services-dto-gson Summary of changes: .../application-swing-validation_fr_FR.properties | 1 + application-swing/pom.xml | 5 +++ application-web/pom.xml | 5 +++ 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 | 0 .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 0 .../request/ReferenceSetRequestKeyDefinition.java | 0 services-dto/pom.xml | 13 ------ services-rest/pom.xml | 11 +++++ services-runner/pom.xml | 6 +++ services-topia-binder/pom.xml | 5 +++ services-topia/pom.xml | 11 +++++ services/pom.xml | 9 ++++ 44 files changed, 82 insertions(+), 76 deletions(-) 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 (100%) 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 (100%) rename {services-dto => services-dto-reference}/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8404 updated (587b746 -> f6609dd)
by codelutin.com scm 06 Nov '16

06 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 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 The 3 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 f6609dd61769b259529ed0ba0282a65117479549 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 6 12:03:03 2016 +0100 Ajout validation de sizeMeasureType sur NonTargetLength commit aa8b3b337dbd8957f9e15ee0fec0f511b56b93cf Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sun Nov 6 12:01:44 2016 +0100 ajout d'un icon Summary of changes: ...nTargetLengthDto-ui-update-error-validation.xml | 17 ++++ .../application-swing-validation_en_GB.properties | 2 + .../application-swing-validation_es_ES.properties | 2 + .../application-swing-validation_fr_FR.properties | 3 +- .../src/main/filters/observe-ui.properties | 1 + .../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 | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../ReferentialReferenceSetDefinitions.java | 4 +- .../dto/referential/SizeMeasureTypeHelper.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 +- .../topia/binder/referential/SpeciesBinder.java | 4 +- 27 files changed, 327 insertions(+), 174 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8404 created (now 587b746)
by codelutin.com scm 05 Nov '16

05 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 587b746 la date de début peut-être nulle This branch includes the following new commits: 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 The 8 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 587b746d6fef5efae1f9cc711fd623815e92ddae Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sat Nov 5 16:44:50 2016 +0100 correction scripts de migration commit 3a0dca45be6215eb830a5e7702fb753f332e0460 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 16:43:52 2016 +0100 mise à jour des tests commit b10613f57eca0986bdea7ce9fcf5bc924e0397c4 Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Sat Nov 5 15:46:01 2016 +0100 mise à jour validation commit 30ae2b5f97dd1da5007d387b404e508fa0dab75b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 15:30:32 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (ui) commit 0ecbc3191808377a593577ad538f277bc1d8e423 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 15:29:58 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (service) commit 63eb6c05c52a3fd8f43f7c44b65adad9a8b2da79 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 5 15:29:23 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (persistence) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8