This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 885b189 fixes #8109' adds 7d64f6c ajout de la conf du code de prélèvement (refs #8147) adds 5bdf9de ajout du champ et de la colonne du code de prelevement (refs #8066) adds 5a79663 ajout dans la conf du separateur de code de prelevement (refs #8066) adds aae0482 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 1724fd1 amélioration de l'editeur de code de prélèvement (refs #8066) adds ce6a6dc sauvegarde des code prélèvement (refs #8066) adds 072878c fix NPE si une observation n'a pas de taille (refs #8066) adds aa32bbb extraction de l'id du code de prélèvement (refs #8066) adds 6668249 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds fc6ba26 ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds 166911d correction suite aux modif du cache (refs #8066) adds 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) new 79d610e fixes #8066 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 79d610ec697ce560f4d95ff018eae1755ff1cb69 Merge: 885b189 1a8cd88 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 24 12:01:56 2016 +0100 fixes #8066 Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 ++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 ++++ .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ ...dualObservationBatchPersistenceServiceImpl.java | 10 ++- .../CaracteristicPersistenceService.java | 3 + .../CaracteristicPersistenceServiceImpl.java | 5 ++ .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/xmi/tutti-persistence.zargo | Bin 59646 -> 59750 bytes .../fr/ifremer/tutti/service/DecoratorService.java | 11 ++- .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 1 - .../service/samplingCache/CruiseSamplingCache.java | 22 +++++ .../filtered-resources/tutti-help-fr.properties | 4 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 ++ .../IndividualObservationBatchRowModel.java | 78 +++++++++++++++++ .../IndividualObservationBatchTableModel.java | 22 +++++ .../SampleCodeEditionPopupUI.jaxx} | 27 +++--- .../SampleCodeEditionPopupUI.jcss} | 22 +++-- .../SampleCodeEditionPopupUIHandler.java} | 34 +++----- .../SampleCodeEditionPopupUIModel.java | 75 +++++++++++++++++ .../SamplingCodeCellEditor.java} | 93 ++++++++++++--------- .../SamplingCodeCellRenderer.java | 51 +++++++++++ .../species/frequency/SpeciesFrequencyUI.jaxx | 2 + .../species/frequency/SpeciesFrequencyUI.jcss | 18 ++++ .../frequency/SpeciesFrequencyUIHandler.java | 34 +++++++- .../frequency/actions/DeleteSampleCodeAction.java | 42 ++++++++++ .../frequency/actions/EditSampleCodeAction.java | 60 +++++++++++++ ...pleCodeEditionPopupUIModel-error-validation.xml | 18 ++-- ...ualObservationBatchUIModel-error-validation.xml | 83 ------------------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 21 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 ++++- 33 files changed, 620 insertions(+), 188 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jaxx => operation/catches/individualobservation/SampleCodeEditionPopupUI.jaxx} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jcss => operation/catches/individualobservation/SampleCodeEditionPopupUI.jcss} (76%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java => operation/catches/individualobservation/SampleCodeEditionPopupUIHandler.java} (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/attachment/AttachmentCellEditor.java => content/operation/catches/individualobservation/SamplingCodeCellEditor.java} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/EditSampleCodeAction.java copy tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-validate-fatal-validation.xml => tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel-error-validation.xml (81%) delete mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.