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

branch feature/8153 updated (0f1fbe5 -> 8748f39)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8153 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 0f1fbe5 on recharge les lignes ) partir du résultat de l'import (fixes #8153) omits 1f6be08 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) omits 343806d ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge adds 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop adds 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) adds 681dc4f livrable #8198 Merge branch 'feature/8198' into develop new bba4285 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) new e61c8c5 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) new 879dea2 on recharge les lignes ) partir du résultat de l'import (fixes #8153) new e64da66 Remove strange comment new 39cffa5 Do not import empty SamplingCode new 8748f39 Fix merge 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 (0f1fbe5) \ N -- N -- N refs/heads/feature/8153 (8748f39) 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. The 6 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 8748f3906dad4c65a91522bcd24cc85dd3d6b8d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 18:04:18 2016 +0200 Fix merge commit 39cffa5c7d6c047ffb34aa66a341362dc52ecaac Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 18:03:51 2016 +0200 Do not import empty SamplingCode commit e64da66aff821d872e38a36634b5aab16b5a4de0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 18:03:40 2016 +0200 Remove strange comment commit 879dea246c86caafc93e1401a3a76085e34829f9 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:34:17 2016 +0200 on recharge les lignes ) partir du résultat de l'import (fixes #8153) commit e61c8c5b5bccdfbc6d046295bba1fe25072e7bb9 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:09:47 2016 +0200 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) commit bba4285f37024437e7dbda1f4f1fb8123e923e0d Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:09:14 2016 +0200 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 - .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 - .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 - .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++- .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../catches/multipost/MultiPostImportService.java | 8 +- .../multipost/csv/IndividualObservationRow.java | 2 +- .../protocol/CalcifiedPiecesSamplingRow.java | 6 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 +- .../CruiseSamplingCache.java | 258 +++++++-- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 100 +++- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++ .../{samplingCache => sampling}/SamplingEvent.java | 37 +- .../SamplingListener.java | 3 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../IndividualObservationBatchRowModel.java | 43 +- .../IndividualObservationBatchTableModel.java | 39 +- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 179 +++++-- .../frequency/SpeciesFrequencyRowModel.java | 23 +- .../frequency/SpeciesFrequencyTableModel.java | 40 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 588 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 ++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- 38 files changed, 1108 insertions(+), 521 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (67%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (58%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (69%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (91%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (4ae7280 -> 681dc4f)
by codelutin.com scm March 31, 2016

March 31, 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 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop adds 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) new 681dc4f livrable #8198 Merge branch 'feature/8198' 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 681dc4f1c7c510f6f2c7567588fbc9442cffaea6 Merge: 4ae7280 35ae2c4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 17:00:49 2016 +0200 livrable #8198 Merge branch 'feature/8198' into develop Summary of changes: .../IndividualObservationBatchTableModel.java | 17 +++++++++++++++++ .../species/frequency/SpeciesFrequencyUIHandler.java | 1 + 2 files changed, 18 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8198 deleted (was 35ae2c4)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8198 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) 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/8198 updated (02a8941 -> 35ae2c4)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8198 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 02a8941 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge adds 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop new 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) 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 (02a8941) \ N -- N -- N refs/heads/feature/8198 (35ae2c4) 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. 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 35ae2c446227b301098b2c93c7ae80c61850dcc1 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 31 10:19:57 2016 +0200 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 - .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 - .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 - .../main/java/fr/ifremer/tutti/util/Weights.java | 72 +++++- .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../protocol/CalcifiedPiecesSamplingRow.java | 6 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 ++- .../CruiseSamplingCache.java | 258 ++++++++++++++++++--- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 100 ++++++-- .../tutti/service/sampling/SamplingCodePrefix.java | 54 +++++ .../{samplingCache => sampling}/SamplingEvent.java | 37 +-- .../SamplingListener.java | 3 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../IndividualObservationBatchRowModel.java | 43 +--- .../IndividualObservationBatchTableModel.java | 22 +- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 179 +++++++++++--- .../frequency/SpeciesFrequencyRowModel.java | 23 +- .../frequency/SpeciesFrequencyTableModel.java | 40 ++-- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 166 +++++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 7 +- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- 34 files changed, 810 insertions(+), 303 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (67%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (58%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (69%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (91%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (dbaf1ea -> 4ae7280)
by codelutin.com scm March 31, 2016

March 31, 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 dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge new 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' 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 4ae72803b3d9775eb30f10d13aea7d7c6031be51 Merge: dbaf1ea 3be764d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 16:44:06 2016 +0200 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop Summary of changes: .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../service/sampling/CruiseSamplingCache.java | 249 ++++++++++++++++++--- .../sampling/CruiseSamplingInternalCache.java | 98 ++++++-- .../tutti/service/sampling/SamplingEvent.java | 35 +-- .../tutti/service/sampling/SamplingListener.java | 1 + .../frequency/IndividualObservationUICache.java | 173 +++++++++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 37 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- 10 files changed, 498 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8177 deleted (was 3be764d)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8177 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 3be764d fix merge 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/8177 updated (10c294f -> 3be764d)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8177 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 10c294f augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) omits 39b64fd décoration pour le résumé (refs #8152) omits c14178f gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) omits c9cd250 gestion des prélèvements dans le cache (refs #8152 refs #8177) omits debfb6e on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) omits c5d0c17 on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop new 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) new cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) new 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) new 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) new 6611c70 décoration pour le résumé (refs #8152) new 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) new 3be764d fix merge 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 (10c294f) \ N -- N -- N refs/heads/feature/8177 (3be764d) 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. The 7 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 3be764dd2ea8cf0764d90c6454f151db5732c4b9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 16:43:43 2016 +0200 fix merge commit 10d8c6a7e13ce1398ea090d16acd5587a7cd1d31 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 16:56:35 2016 +0200 augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) commit 6611c706e2efa2c8a6276474f09917f3ae5d215d Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 15:07:16 2016 +0200 décoration pour le résumé (refs #8152) commit 3e3c3fa5d27373760c73cecc119dced198f95e74 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 11:56:16 2016 +0200 gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) commit 179a761747c0411cc1347023a41ecf0e71e0b52e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 11:55:10 2016 +0200 gestion des prélèvements dans le cache (refs #8152 refs #8177) commit cff4876ae75df7f95ff8993a977ad55ab7e9f9bf Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 11:53:53 2016 +0200 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) commit 8246fab8dfb68a238973b20a4109d94675948d99 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 11:52:16 2016 +0200 on déclenche un évènement quand le résumé est mis à jour (refs #8152) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 -- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 --- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++++++++++++++++++---- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../protocol/CalcifiedPiecesSamplingRow.java | 6 ++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 ++++++++- .../CruiseSamplingCache.java | 11 +++- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 2 +- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++ .../{samplingCache => sampling}/SamplingEvent.java | 2 +- .../SamplingListener.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../IndividualObservationBatchRowModel.java | 43 ++----------- .../IndividualObservationBatchTableModel.java | 22 +++++-- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 ++- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 6 +- .../frequency/SpeciesFrequencyRowModel.java | 23 ++++++- .../frequency/SpeciesFrequencyTableModel.java | 40 ++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +++--- .../frequency/SpeciesFrequencyUIHandler.java | 46 +++++++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 +++++++++++++++ 32 files changed, 344 insertions(+), 151 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (99%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (95%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch develop updated (ff2ad98 -> dbaf1ea)
by codelutin.com scm March 31, 2016

March 31, 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 ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) new dbaf1ea livrable #8194 Merge branch 'feature/8194' 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 dbaf1ea9086313bc771695c84cc8a1b3a67f4b34 Merge: ff2ad98 9fb2cd5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 16:04:17 2016 +0200 livrable #8194 Merge branch 'feature/8194' into develop Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 112 +++++++++------------ 1 file changed, 50 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8194 deleted (was 9fb2cd5)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8194 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) 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/8194 updated (3a92557 -> 9fb2cd5)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8194 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 3a92557 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop new 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) 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 (3a92557) \ N -- N -- N refs/heads/feature/8194 (9fb2cd5) 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. 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 9fb2cd515f531386f01e87fb48679264fdb0db90 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 17:02:52 2016 +0100 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 -- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 --- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++++++++++++++++++---- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../protocol/CalcifiedPiecesSamplingRow.java | 6 ++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 ++++++++- .../CruiseSamplingCache.java | 9 ++- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 2 +- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++ .../{samplingCache => sampling}/SamplingEvent.java | 2 +- .../SamplingListener.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../IndividualObservationBatchRowModel.java | 43 ++----------- .../IndividualObservationBatchTableModel.java | 22 +++++-- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 ++- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 6 +- .../frequency/SpeciesFrequencyRowModel.java | 23 ++++++- .../frequency/SpeciesFrequencyTableModel.java | 40 ++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +++--- .../frequency/SpeciesFrequencyUIHandler.java | 41 +++++++++--- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 +++++++++++++++ 32 files changed, 339 insertions(+), 149 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (99%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (95%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1