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 1a76326 livrable #8219 Merge branch 'feature/8219' into develop adds 23db1ec Amélioration du cache des codes de prélèvements (ne pas utiliser des Integer en valeurs d'une map) adds 27b822c Ajout d'une méthode sur la persistence pour tester qu'on peut utiliser un code de prélèvement (See #8204) adds 16b60e9 Ajout d'un cache de code de prélèvement viables ou non + blocage si code de prélèvement pas possible (See #8204) adds f5aaca3 Add more logs + display error if code is not available (Fixes #8204) adds e8523b6 On decremente uniquement si le code matché est le plus haut + amélioration code adds b83f3ca we show the popup until the user enters a valid sample code (refs #8204) adds cd3f1b6 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) adds 4fe32d1 Merge branch 'feature/8204' into 'develop' No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + ...dividualObservationBatchPersistenceService.java | 10 ++ ...dualObservationBatchPersistenceServiceImpl.java | 49 +++++++++ .../service/util/SamplePersistenceHelper.java | 82 +++++++++++---- .../src/main/resources/queries-failsafe.hbm.xml | 36 +++++++ .../ifremer/tutti/service/PersistenceService.java | 5 + .../service/sampling/CruiseSamplingCache.java | 68 +++++++++---- .../tutti/service/sampling/SamplingCodePrefix.java | 4 + .../frequency/IndividualObservationUICache.java | 113 ++++++++++++++++----- .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 102 +++++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 14 files changed, 412 insertions(+), 71 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.