branch develop updated (8c45c58 -> 1544456)
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 8c45c58 fixes #8661: [ALGORITHME DE PRELEVEMENTS] mauvais fonctionnement des compteurs quand on décoche l'option "maturité" et/ou "sexe" si dans le protocole on ne coche pas sexe, alors le compte est fait pour l'ensemble des sexes (si on change le protocole en cours de saisie cela peut poser des problemes pour maturite, car on a alors dans la base des valeurs alors qu'il est impossible par exemple dans saisir avec la modification de protocole, et donc les comptes ne sont pas bon). new 1544456 fixes #8674: Méthodes de mesures du protocole benthos non actives à la saisie dans l'onglet benthos 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 154445661b7e19c7c789e1313e843dea3e34017f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Dec 30 20:29:43 2016 +0100 fixes #8674: Méthodes de mesures du protocole benthos non actives à la saisie dans l'onglet benthos Summary of changes: .../catches/species/create/CreateSpeciesBatchUIHandler.java | 5 +++-- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 154445661b7e19c7c789e1313e843dea3e34017f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Dec 30 20:29:43 2016 +0100 fixes #8674: Méthodes de mesures du protocole benthos non actives à la saisie dans l'onglet benthos --- .../catches/species/create/CreateSpeciesBatchUIHandler.java | 5 +++-- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 5f6e09a..8521f73 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -160,8 +160,9 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl source.setSelectedCategory(selectedCategory); // get species protocol to check the measurement method - SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesProtocol(getDataContext().getProtocol(), - newValue.getReferenceTaxonId()); + // poussin 20161230 fixes bug #8674 getSpeciesOrBenthosProtocol and not getSpeciesProtocol + SpeciesProtocol speciesProtocol = TuttiProtocols.getSpeciesOrBenthosProtocol(getDataContext().getProtocol(), + newValue.getReferenceTaxonId()); CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode frequencyMode = null; if (speciesProtocol != null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index e377c33..33f00b9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -437,7 +437,12 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyUIModel model = getModel(); - taxonCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + // poussin 20161230 fixes bug #8674, add if to get right cache + if (SpeciesOrBenthosBatchUISupport.SPECIES.equals(ui.getSpeciesOrBenthosContext())) { + taxonCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + } else { + taxonCache = TaxonCaches.createBenthosCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); + } Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); initBeanFilterableComboBox(this.ui.getLengthStepCaracteristicComboBox(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm