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 c1683e993a459bd37f0f5cbe4b9280ecb95d4e2f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 26 11:24:11 2016 +0200 fixes #8333: [CAPTURE] enrichir le commentaire du taxon dans le cas de la gestion d'un mélange --- .../species/edit/actions/CreateSpeciesMelagAction.java | 14 ++++++++++++-- .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/CreateSpeciesMelagAction.java index 02a9513..80b7d52 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/CreateSpeciesMelagAction.java @@ -32,6 +32,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesB import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; +import java.util.LinkedList; +import java.util.List; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; @@ -184,6 +186,8 @@ public class CreateSpeciesMelagAction extends LongActionSupport<SpeciesBatchUIMo String unitLabel = weightUnit.getShortLabel(); String melagComment = t("tutti.createSpeciesMelag.comment.part1") + "\n"; + List<Object[]> params = new LinkedList<Object[]>(); + float sampleWeightTotal = 0; // ecriture du commentaire a positionner sur chaque lot qui fait parti du melag // et calcul du poids de categorisation sur les lots qui ont un poids de sous-echantillon precedemment renseigne for (SpeciesBatchRowModel batch : selectedRows.keySet()) { @@ -202,9 +206,15 @@ public class CreateSpeciesMelagAction extends LongActionSupport<SpeciesBatchUIMo batch.getFinestCategory().setCategoryWeight(categoryWeight); } - melagComment += t("tutti.createSpeciesMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; - + sampleWeightTotal += sampleWeight; + params.add(new Object[]{sampleWeight, unitLabel, decorate(batch.getSpecies())}); + } + + for (Object[] p : params) { + float percent = ((float)p[0]) * 100.0f / sampleWeightTotal; + melagComment += t("tutti.createSpeciesMelag.comment.part2", p[0], p[1], p[2], percent) + "\n"; } + melagComment += t("tutti.createSpeciesMelag.comment.part3", melagWeight, unitLabel); // concatenation du commentaire sur chaque lot du melag diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 3d30729..3519009 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -277,7 +277,7 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot tutti.createBenthosMelag.comment.part1=Traitement issu d'un mélange composé de \: -tutti.createBenthosMelag.comment.part2=- %s%s de %s +tutti.createBenthosMelag.comment.part2=- %s%s de %s (%.3f%%) tutti.createBenthosMelag.comment.part3=avec un poids d'élévation de %s%s tutti.createBenthosMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids du sous-échantillon ni de poids dans les mensurations tutti.createBenthosMelag.error.title=Erreur @@ -369,7 +369,7 @@ tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG (mélange) tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \: -tutti.createSpeciesMelag.comment.part2=- %s%s de %s +tutti.createSpeciesMelag.comment.part2=- %s%s de %s (%.3f%%) tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %s%s tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids du sous-échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.