March 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/8140 created (now db357c6)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8140 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at db357c6 Ajout de deux titres (See #8140) This branch includes the following new commits: new db357c6 Ajout de deux titres (See #8140) 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 db357c622d3a15e0c3d67986908a1200fbd73fa1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 18:47:34 2016 +0100 Ajout de deux titres (See #8140) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8043 updated (0451472 -> 6d30910)
by codelutin.com scm March 16, 2016

March 16, 2016

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 from 0451472 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) adds 6d30910 - ajout du résumé des prélèvements - un peu de réagencement de l'écran refs #8043 No new revisions were added by this update. Summary of changes: .../service/samplingCache/CruiseSamplingCache.java | 45 ++--- .../tutti/service/samplingCache/SamplingEvent.java | 39 +++- .../service/samplingCache/SamplingListener.java | 6 - .../species/frequency/SpeciesFrequencyUI.jaxx | 196 ++++++++++----------- .../species/frequency/SpeciesFrequencyUI.jcss | 8 +- .../frequency/SpeciesFrequencyUIHandler.java | 57 +++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 8 files changed, 187 insertions(+), 170 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (d79fd88 -> 20bf658)
by codelutin.com scm March 16, 2016

March 16, 2016

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 d79fd88 Fixes #8116 Merge branch 'feature/8116' into develop new 20bf658 Java 8 party \o/ 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 20bf658c7e671aca787f31531ab930f73c6be26a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 18:35:38 2016 +0100 Java 8 party \o/ Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ac8ec7d -> d79fd88)
by codelutin.com scm March 16, 2016

March 16, 2016

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 ac8ec7d Merge branch 'feature/8130' into 'develop' adds 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 adds 734d29c extraction du calcul du poids par rtp dans la classe weights adds 2801687 reformat code + fix return type (float is not Float) adds d0af96b Gérer le cas où l'on a pas de rtp ou de classe de taille de renseignée, on ne peut pas effectuer le calcul rtp (See #8116) new d79fd88 Fixes #8116 Merge branch 'feature/8116' into develop 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 d79fd8892973d24eb009bcc961e5faf4f830f6c5 Merge: ac8ec7d d0af96b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 18:24:10 2016 +0100 Fixes #8116 Merge branch 'feature/8116' into develop Summary of changes: .../main/java/fr/ifremer/tutti/util/Weights.java | 19 ++++++ .../filtered-resources/tutti-help-fr.properties | 26 +------- .../frequency/SpeciesFrequencyRowModel.java | 46 +++++++------- .../frequency/SpeciesFrequencyTableModel.java | 23 ++++--- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.jcss | 11 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 72 +++++++++++++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 54 ++++++++-------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 10 files changed, 147 insertions(+), 112 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8116 deleted (was d0af96b)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was d0af96b Gérer le cas où l'on a pas de rtp ou de classe de taille de renseignée, on ne peut pas effectuer le calcul rtp (See #8116) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8116 updated (734d29c -> d0af96b)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 734d29c extraction du calcul du poids par rtp dans la classe weights adds 2801687 reformat code + fix return type (float is not Float) adds d0af96b Gérer le cas où l'on a pas de rtp ou de classe de taille de renseignée, on ne peut pas effectuer le calcul rtp (See #8116) No new revisions were added by this update. Summary of changes: tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java | 7 ++++--- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8128 created (now 9b77752)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8128 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 9b77752 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids This branch includes the following new commits: new a8428a8 Permettre d'arrondir à partir d'une unité new 90d8ec1 Ajout de nouvelles méthodes sur Weights new 9b77752 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids 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 9b777527beaf2daac2981aec1c837c11a08b31aa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 17:34:44 2016 +0100 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids commit 90d8ec1df5e4e39377f82d20202e9e5c6b6c7ae0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 17:34:08 2016 +0100 Ajout de nouvelles méthodes sur Weights commit a8428a8d458bdcf66c2a5d72f9a0e0420291aa40 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 17:33:27 2016 +0100 Permettre d'arrondir à partir d'une unité -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8116 updated (9479b97 -> 734d29c)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 adds 734d29c extraction du calcul du poids par rtp dans la classe weights No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/util/Weights.java | 18 ++++++++++++++++++ .../species/frequency/SpeciesFrequencyUIModel.java | 14 ++------------ 2 files changed, 20 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8043 updated (5790b23 -> 0451472)
by codelutin.com scm March 16, 2016

March 16, 2016

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(a)codelutin.com>.

1 0

branch feature/8116 created (now 9479b97)
by codelutin.com scm March 16, 2016

March 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 This branch includes the following new commits: new 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 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 9479b97233bf40172168d169399a5f7ad31462a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 16 16:33:23 2016 +0100 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1