This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from da764ac Merge branch 'release/3.6' adds 13c8f6c [jgitflow-maven-plugin]updating poms for 3.7-SNAPSHOT development adds b71cc56 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f160188 Merge branch 'master' into develop adds 4cfd7b8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 2559339 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API adds 7de707e use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes adds af10d2f Merge branch 'feature/updatesLibs' into develop adds cb004aa updates libs (nuiton-converter) adds f4198e8 fixes #5656: Les engins d'une campagne ne sont plus remontés adds bbb6d03 fixes #5175: [EXPORT GENERIQUE] la numérotation des lots Hors vrac dans Num_Ordre_V_HV_H2 à partir de 1001 n'est pas active adds 0fc43c7 Merge branch 'feature/5175' into develop adds cf6871e fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti adds bb19a97 fixes #5624: [CAPTURE] import psion, il faut traiter MELA-NGE ou MELANGE comme du mélange, actuellement il importe correctementement que MELA-NGE adds d62adad fixes #5658: [CAPTURE] Perte du deuxième lot lors d'une catégorisation adds 9e36aaa fixes #5174: [CAPTURE] nb chiffres après la virgule avec élévation MELANGE : s'arrêter à 4 en kg adds ac95a90 fixes #5187: [AIDE] mises à jour adds edacaf3 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti adds 3639948 use nuiton-utils 3.0-rc-7 adds 2ae21e7 use last version of jaxx and adagio adds e9b2e58 fixes #5672: #5624 MELANGE pas importé comme du mélange adds 15cb38e fixes #5671: Revoir traitement #5174 Refactor TuttiEntities class (split to more specialized classes) f# Please enter the commit message for your changes. Lines starting adds 8c8c58d fixes #5676: [IMPORT PUPITRI] Ne pas remonté le poids total non trié 0 adds 2ff68c5 fixes #5673: [EXPORT] vérifier que pour la génération du rapport pdf que c'est bien les codes campagne qui sont remontés adds 0d2b668 use nuiton-updater 3.0-rc-1 adds bbe7ad9 fixes #5667: [REF] erreur synchro référentiel adds bb534b2 remove unused method adds fcf6589 clean code adds d465ced fixes #5698: [CAPTURE] ne garde plus le poids sous échantillon après élévation des poids adds 6c3237f fixes #5707: [TECHNIQUE] Changer l'url de mises à jour des livrables adds ed91683 fixes #5699: [CAPTURE] l'élévation des poids remet l'ordre des lignes selon l'ordre saisie mais ne remet pas le filtre à Tri/Saisie donc il y a une incohérence à l'écran adds fc62939 fixes #5699: [CAPTURE] l'élévation des poids remet l'ordre des lignes selon l'ordre saisie mais ne remet pas le filtre à Tri/Saisie donc il y a une incohérence à l'écran adds 8312ade fixes #5697: [CAPTURE] mauvais affichage de // adds 0bb341d fixes #5695: [IMPORT] psion blocage fenettre suite message erreur adds d58e188 fixes #5705: [TRAIT] je suis sur un écran mensuration avec des données, je clique sur créer un nouveau trait, quand je valide je reviens sur l'écran des mensuration du trait précédent, hors je devrait être sur Espèces adds 9e39300 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions adds f0cac9b add missing license headers adds fec7edc Merge branch 'release/3.7' No new revisions were added by this update. Summary of changes: pom.xml | 24 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 7 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../tutti/persistence/entities/TuttiEntities.java | 465 +------------------- .../data/SampleCategoryModelConverter.java | 7 +- .../entities/data/SpeciesAbleBatchs.java | 61 +++ .../CaracteristicQualitativeValues.java | 42 ++ .../entities/referential/Caracteristics.java | 67 +++ .../persistence/entities/referential/Gears.java | 31 +- .../persistence/entities/referential/Speciess.java | 99 +++++ .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/CruisePersistenceServiceImpl.java | 47 +-- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ProtocolPersistenceServiceImpl.java | 10 +- .../service/ReferentialPersistenceServiceImpl.java | 16 +- .../SpeciesBatchPersistenceServiceImpl.java | 42 +- .../service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../service/util/SamplePersistenceHelper.java | 6 +- .../tutti/persistence/test/DatabaseFixtures.java | 8 +- .../tutti/persistence/test/DatabaseResource.java | 15 +- .../main/java/fr/ifremer/tutti/util/Distances.java | 63 +++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 126 ++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 43 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 130 ++++++ ...verter => org.nuiton.converter.NuitonConverter} | 0 .../src/main/xmi/tutti-persistence.properties | 7 +- .../persistence/TuttiPersistenceWriteTest.java | 2 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../ReferentialPersistenceServiceReadTest.java | 6 +- tutti-service/pom.xml | 6 +- .../ifremer/tutti/service/PersistenceService.java | 7 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 13 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../service/catches/WeightCleaningService.java | 8 +- .../service/catches/WeightComputingService.java | 83 ++-- .../catches/multipost/MultiPostImportService.java | 6 +- .../tutti/service/export/ExportCatchContext.java | 26 +- .../service/export/generic/CatchExportModel.java | 92 ++-- .../service/export/generic/OperationExportRow.java | 77 ++-- .../service/export/generic/TuttiExportService.java | 7 +- .../export/pdf/CatchesPdfExportService.java | 32 +- .../service/export/pdf/PdfExportBatchEntry.java | 10 +- .../service/psionimport/PsionImportModel.java | 56 ++- .../service/psionimport/PsionImportService.java | 22 +- .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../pupitri/PupitriImportExportService.java | 26 +- .../tutti/service/pupitri/PupitriImportResult.java | 27 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 4 +- .../src/main/resources/ftl/catchesReport_fr.ftl | 4 +- .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 20 +- .../ifremer/tutti/service/AbstractServiceTest.java | 3 +- .../fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 13 +- tutti-ui-swing/src/main/help/fr/config.html | 4 + .../src/main/help/fr/editFishingOperation.html | 96 ++++- tutti-ui-swing/src/main/help/fr/faq.html | 5 + tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../ui/swing/action/ComputeBatchWeightsAction.java | 85 +++- .../ui/swing/action/CreateBenthosMelagAction.java | 7 +- .../ui/swing/action/CreateSpeciesMelagAction.java | 8 +- .../swing/action/EditFishingOperationAction.java | 22 +- .../swing/action/ExportCruiseForSumatraAction.java | 18 +- .../ExportFishingOperationForSumatraAction.java | 22 +- .../tutti/ui/swing/action/ImportDbAction.java | 2 +- .../ui/swing/action/ImportProtocolAction.java | 4 +- .../tutti/ui/swing/action/OpenDbAction.java | 2 +- .../swing/action/RemoveBenthosProtocolAction.java | 4 +- .../swing/action/RemoveSpeciesProtocolAction.java | 4 +- .../action/SelectSpeciesForBenthosBatchAction.java | 4 +- ...SpeciesForIndividualObservationBatchAction.java | 4 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 4 +- .../swing/content/cruise/EditCruiseUIHandler.java | 6 +- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 +- .../operation/EditFishingOperationUIHandler.java | 3 +- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/catches/EditCatchesUIHandler.java | 4 +- .../operation/catches/SampleCategoryComponent.java | 6 +- .../SpeciesBatchNaturalOrderComparator.java | 108 +++++ .../catches/benthos/BenthosBatchRowModel.java | 467 ++++++++++----------- .../catches/benthos/BenthosBatchUIHandler.java | 20 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../IndividualObservationBatchUIHandler.java | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 20 +- .../catches/species/SpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyUIHandler.java | 32 +- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../content/protocol/EditProtocolUIHandler.java | 5 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 4 +- .../computable/ComputableDataEditorHandler.java | 4 +- .../util/computable/ComputableDataTableCell.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 37 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 43 +- 105 files changed, 1833 insertions(+), 1229 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Caracteristics.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java (57%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/Distances.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/MessageTreeNode.java => tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java (51%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java rename tutti-persistence/src/main/resources/META-INF/services/{org.apache.commons.beanutils.Converter => org.nuiton.converter.NuitonConverter} (100%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchNaturalOrderComparator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.