This is an automated email from the git hooks/post-receive script. New change to branch feature/8043 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 5790b23 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) discards 4968716 création du cache des prélèvements (refs #8043) adds d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) adds d14913d modele modifié quand on supprime une ligne d'observation individuelle (fixes #8133) adds 48911a4 Merge branch 'feature/8133' into 'develop' adds 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) adds 17feb63 Merge branch 'feature/8135' into 'develop' adds 1033b95 ajout de méthodes sympas pour éviter les cast adds edeba5d Réusinage du modèle des échantillons adds 0b453b4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) adds 61e3c16 Récupération de la valeur qualitative mise en cache adds e7e9719 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans adds 22d3bf9 fix api adds 5c4d5c5 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample adds 64e0a57 Recopie du mode dans chaque ligne adds 8edce14 Ajout méthode de recopie adds d08a3f6 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible adds c47df44 Amélioration du chargement de l'écran (et intégration du mode de recopie) adds 8082660 Revue de la sauvegarde et intégration du mode de recopie adds ac8ec7d Merge branch 'feature/8130' into 'develop' adds 780656e création du cache des prélèvements (refs #8043) adds 0451472 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5790b23) \ N -- N -- N refs/heads/feature/8043 (0451472) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 59 +++- .../data/CopyIndividualObservationMode.java | 41 +++ .../AccidentalBatchPersistenceServiceImpl.java | 56 +--- ...dualObservationBatchPersistenceServiceImpl.java | 149 ++++----- .../CaracteristicPersistenceService.java | 9 + .../CaracteristicPersistenceServiceImpl.java | 18 +- .../service/util/SamplePersistenceHelper.java | 51 +++- .../src/main/xmi/tutti-persistence.zargo | Bin 64820 -> 65155 bytes .../ifremer/tutti/service/PersistenceService.java | 5 + .../catches/multipost/MultiPostImportService.java | 6 +- .../CopyIndividualObservationMode.java | 34 --- .../IndividualObservationBatchRowModel.java | 14 +- .../frequency/SpeciesFrequencyCellComponent.java | 91 +++--- .../frequency/SpeciesFrequencyRowModel.java | 7 + .../frequency/SpeciesFrequencyTableModel.java | 6 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 4 +- .../species/frequency/SpeciesFrequencyUI.jcss | 13 +- .../frequency/SpeciesFrequencyUIHandler.java | 334 ++++++++++++--------- .../species/frequency/SpeciesFrequencyUIModel.java | 103 +++---- .../actions/CancelEditSpeciesFrequencyAction.java | 60 +++- .../frequency/actions/RemoveObservationAction.java | 2 + .../actions/ResetSpeciesFrequencyAction.java | 62 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 + 26 files changed, 699 insertions(+), 455 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/CopyIndividualObservationMode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/CopyIndividualObservationMode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.