This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 9e36aaa42701d53ae11b249938af803ec11e16e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 22:21:34 2014 +0200 fixes #5174: [CAPTURE] nb chiffres après la virgule avec élévation MELANGE : s'arrêter à 4 en kg --- .../fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java | 7 ++++--- .../fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java index 0ae30a9..bdf6143 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java @@ -23,6 +23,7 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.collect.Maps; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; @@ -147,8 +148,10 @@ public class CreateBenthosMelagAction extends AbstractTuttiAction<BenthosBatchUI for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { - Float weight = sampleMelagWeight * sampleWeight / sortedWeight; + Float weight = TuttiEntities.roundKiloGram(sampleMelagWeight * sampleWeight / sortedWeight); batch.getFinestCategory().setCategoryWeight(weight); + } else { + sampleWeight = batch.getFinestCategory().getNotNullWeight(); } melagComment += t("tutti.createBenthosMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; } @@ -171,8 +174,6 @@ public class CreateBenthosMelagAction extends AbstractTuttiAction<BenthosBatchUI @Override public void releaseAction() { super.releaseAction(); - //FIXME-TC No release action is not design to refresh ui... -// getHandler().getTable().repaint(); selectedRows.clear(); melagWeight = null; sortedWeight = null; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java index f2ffa59..a3cd216 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java @@ -23,6 +23,7 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.collect.Maps; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; @@ -147,8 +148,10 @@ public class CreateSpeciesMelagAction extends AbstractTuttiAction<SpeciesBatchUI for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { - Float weight = sampleMelagWeight * sampleWeight / sortedWeight; + Float weight = TuttiEntities.roundKiloGram(sampleMelagWeight * sampleWeight / sortedWeight); batch.getFinestCategory().setCategoryWeight(weight); + } else { + sampleWeight = batch.getFinestCategory().getNotNullWeight(); } melagComment += t("tutti.createSpeciesMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; } @@ -171,8 +174,6 @@ public class CreateSpeciesMelagAction extends AbstractTuttiAction<SpeciesBatchUI @Override public void releaseAction() { super.releaseAction(); - //FIXME-TC No release action is not design to refresh ui... -// getHandler().getTable().repaint(); selectedRows.clear(); melagWeight = null; sortedWeight = null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.