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

branch develop updated (4fe32d1 -> 4cdee6d)
by codelutin.com scm 04 Apr '16

04 Apr '16

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 4fe32d1 Merge branch 'feature/8204' into 'develop' new bac8951 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) new 4cdee6d testable-client #8210 Merge branch 'feature/8210' into develop The 2 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 4cdee6d981541baa3cabc3708ae4ad3d287616d6 Merge: 4fe32d1 bac8951 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 16:32:48 2016 +0200 testable-client #8210 Merge branch 'feature/8210' into develop commit bac89516ba3972d2a1e86a1256dda190c7a5adb3 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 12:07:57 2016 +0200 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 1 + .../species/frequency/SpeciesFrequencyUIModel.java | 26 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8210 deleted (was a288736)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8210 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was a288736 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) 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/8204 deleted (was cd3f1b6)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8204 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was cd3f1b6 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) 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 develop updated (1a76326 -> 4fe32d1)
by codelutin.com scm 04 Apr '16

04 Apr '16

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

1 0

branch feature/8204 updated (1b68887 -> cd3f1b6)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8204 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 1b68887 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) omits 1f6c3a9 we show the popup until the user enters a valid sample code (refs #8204) omits fb7af9a On decremente uniquement si le code matché est le plus haut + amélioration code omits 14f33e2 Add more logs + display error if code is not available (Fixes #8204) omits 572e4a5 Ajout d'un cache de code de prélèvement viables ou non + blocage si code de prélèvement pas possible (See #8204) omits 2c0517b Ajout d'une méthode sur la persistence pour tester qu'on peut utiliser un code de prélèvement (See #8204) omits db0df76 Amélioration du cache des codes de prélèvements (ne pas utiliser des Integer en valeurs d'une map) adds a32347d Utilisation de la bonne liste de taxons (See #8200) adds efd0d34 Merge branch 'feature/8200' into 'develop' adds f56397f lecture de la mesure venant de l'ichtyometre, qu'importe le mode de copie (fixes #8206) adds 4365ccc livrable #8206 Merge branch 'feature/8206' into develop adds ff7f247 l'ui qui permet d'avoir la popup plus large doit etre mise sur la combo à la création, sinon ça a l'air de virer des listeners (fixes #8209) adds 827b53a livrable #8209 Merge branch 'feature/8209' into develop adds 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) adds 1a76326 livrable #8219 Merge branch 'feature/8219' into develop new 23db1ec Amélioration du cache des codes de prélèvements (ne pas utiliser des Integer en valeurs d'une map) new 27b822c Ajout d'une méthode sur la persistence pour tester qu'on peut utiliser un code de prélèvement (See #8204) new 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) new f5aaca3 Add more logs + display error if code is not available (Fixes #8204) new e8523b6 On decremente uniquement si le code matché est le plus haut + amélioration code new b83f3ca we show the popup until the user enters a valid sample code (refs #8204) new cd3f1b6 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) 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 (1b68887) \ N -- N -- N refs/heads/feature/8204 (cd3f1b6) 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 cd3f1b6a8c53d233f5d50e15386ce87a523f62a2 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 16:24:32 2016 +0200 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) commit b83f3ca26d12277b07f1c820c0a9bc463ee51e09 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 16:22:38 2016 +0200 we show the popup until the user enters a valid sample code (refs #8204) commit e8523b6831cbf9ae5b14ddc42b619639681b3dc7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 15:45:53 2016 +0200 On decremente uniquement si le code matché est le plus haut + amélioration code commit f5aaca37e68726ab61194479ad63e5bf3504a708 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 15:02:13 2016 +0200 Add more logs + display error if code is not available (Fixes #8204) commit 16b60e9f488abb48ab118eb5b3622b0d3e0fb89f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 14:48:38 2016 +0200 Ajout d'un cache de code de prélèvement viables ou non + blocage si code de prélèvement pas possible (See #8204) commit 27b822c7bc9aaa205a1cf2b081c9f8f1224e33fb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 14:48:23 2016 +0200 Ajout d'une méthode sur la persistence pour tester qu'on peut utiliser un code de prélèvement (See #8204) commit 23db1ec992a8b2b38a0f7ba8e03372b2f5289eb8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 10:23:53 2016 +0200 Amélioration du cache des codes de prélèvements (ne pas utiliser des Integer en valeurs d'une map) Summary of changes: .../IndividualObservationBatchTableModel.java | 10 ++++- .../create/CreateSpeciesBatchUIHandler.java | 3 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 7 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 6 --- .../actions/ApplySpeciesFrequencyRafaleAction.java | 17 ++++---- .../swing/util/WideDataBeanFilterableComboBox.java | 26 ++++++++++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 ++++++++++++++++------ 7 files changed, 84 insertions(+), 33 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataBeanFilterableComboBox.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/8204 updated (fb7af9a -> 1b68887)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8204 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from fb7af9a On decremente uniquement si le code matché est le plus haut + amélioration code new 1f6c3a9 we show the popup until the user enters a valid sample code (refs #8204) new 1b68887 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) The 2 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 1b688874ee5f478e245dff4760439078e19a6d97 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 16:24:32 2016 +0200 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) commit 1f6c3a9a8b77b2ae102256dee0e1bb76274e1cc7 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 16:22:38 2016 +0200 we show the popup until the user enters a valid sample code (refs #8204) Summary of changes: .../service/sampling/CruiseSamplingCache.java | 9 ++-- .../frequency/actions/EditSampleCodeAction.java | 50 +++++++++++++--------- 2 files changed, 34 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8210 updated (db76296 -> a288736)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8210 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits db76296 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) adds f56397f lecture de la mesure venant de l'ichtyometre, qu'importe le mode de copie (fixes #8206) adds 4365ccc livrable #8206 Merge branch 'feature/8206' into develop adds ff7f247 l'ui qui permet d'avoir la popup plus large doit etre mise sur la combo à la création, sinon ça a l'air de virer des listeners (fixes #8209) adds 827b53a livrable #8209 Merge branch 'feature/8209' into develop adds 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) adds 1a76326 livrable #8219 Merge branch 'feature/8219' into develop new a288736 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) 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 (db76296) \ N -- N -- N refs/heads/feature/8210 (a288736) 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 a2887363752e16c8c432edbef583d9c6fb5624c7 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 12:07:57 2016 +0200 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) Summary of changes: .../IndividualObservationBatchTableModel.java | 10 ++++- .../species/frequency/SpeciesFrequencyUI.jaxx | 7 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 6 --- .../actions/ApplySpeciesFrequencyRafaleAction.java | 17 ++++---- .../swing/util/WideDataBeanFilterableComboBox.java | 26 ++++++++++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 ++++++++++++++++------ 6 files changed, 83 insertions(+), 31 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataBeanFilterableComboBox.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (827b53a -> 1a76326)
by codelutin.com scm 04 Apr '16

04 Apr '16

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 827b53a livrable #8209 Merge branch 'feature/8209' into develop adds 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) new 1a76326 livrable #8219 Merge branch 'feature/8219' 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 1a76326fccd7d96af3da25a266a867d48c7d50fa Merge: 827b53a 9d0beb9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 16:14:39 2016 +0200 livrable #8219 Merge branch 'feature/8219' into develop Summary of changes: .../IndividualObservationBatchTableModel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8219 deleted (was 9d0beb9)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8219 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) 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/8219 updated (ce022f7 -> 9d0beb9)
by codelutin.com scm 04 Apr '16

04 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8219 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits ce022f7 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) adds f56397f lecture de la mesure venant de l'ichtyometre, qu'importe le mode de copie (fixes #8206) adds 4365ccc livrable #8206 Merge branch 'feature/8206' into develop adds ff7f247 l'ui qui permet d'avoir la popup plus large doit etre mise sur la combo à la création, sinon ça a l'air de virer des listeners (fixes #8209) adds 827b53a livrable #8209 Merge branch 'feature/8209' into develop new 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) 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 (ce022f7) \ N -- N -- N refs/heads/feature/8219 (9d0beb9) 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 9d0beb97a5f0f539dcfc347bf53e5a157bc5fdc3 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 11:58:30 2016 +0200 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) Summary of changes: .../species/frequency/SpeciesFrequencyUI.jaxx | 7 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 6 --- .../actions/ApplySpeciesFrequencyRafaleAction.java | 17 ++++---- .../swing/util/WideDataBeanFilterableComboBox.java | 26 ++++++++++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 ++++++++++++++++------ 5 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataBeanFilterableComboBox.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1