branch develop updated (573e649 -> bd34b7e)
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 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation new 9522217 Permettre d'arrondir à partir d'une unité new b031235 Ajout de nouvelles méthodes sur Weights new 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids new d5c4c44 Correction de l'arrondi (See #8128) new bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop The 5 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 bd34b7e778f9829297cbf04fa331aff99d5edf2b Merge: 573e649 d5c4c44 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 10:42:31 2016 +0100 Fixes #8128 Merge branch 'feature/8128' into develop commit d5c4c44618be214c099c047d562117a70688a5e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 10:38:11 2016 +0100 Correction de l'arrondi (See #8128) commit 5868576a294d4f93da4c9cc4805c5258ba1a0b7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:34:44 2016 +0100 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids commit b031235d7f391dc1849b5b101631ac5bcc20a3f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:34:08 2016 +0100 Ajout de nouvelles méthodes sur Weights commit 95222172d0b008cd3e7176b874e34b583c4cc43d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:33:27 2016 +0100 Permettre d'arrondir à partir d'une unité Summary of changes: .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +++++++++- .../main/java/fr/ifremer/tutti/util/Weights.java | 29 ++++++--------- .../tutti/service/bigfin/BigfinImportService.java | 5 ++- .../service/catches/WeightComputingService.java | 43 +++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 ++- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +-- .../service/pupitri/PupitriImportService.java | 7 ++-- .../pupitri/report/PupitriImportReportModel.java | 14 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 10 ++--- 14 files changed, 84 insertions(+), 68 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 95222172d0b008cd3e7176b874e34b583c4cc43d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:33:27 2016 +0100 Permettre d'arrondir à partir d'une unité --- .../java/fr/ifremer/tutti/type/WeightUnit.java | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java index f56b5cb..9649279 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.type; * #L% */ +import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Objects; @@ -49,6 +50,20 @@ public enum WeightUnit { public Float toEntity(Float weight) { return weight == null ? null : weight / 1000.0f; } + + @Override + public Float round(Float weight) { + Float result; + if (weight == null) { + result = null; + } else { + BigDecimal sumB = new BigDecimal(String.valueOf(weight)) + .setScale(2, BigDecimal.ROUND_HALF_UP) + .abs(); + result = sumB.floatValue(); + } + return result; + } }, KG(n("application.common.unit.kg"), n("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { @Override @@ -60,6 +75,21 @@ public enum WeightUnit { public Float toEntity(Float weight) { return weight; } + + @Override + public Float round(Float weight) { + Float result; + if (weight == null) { + result = null; + } else { + + BigDecimal sumB = new BigDecimal(String.valueOf(weight)) + .setScale(3, BigDecimal.ROUND_HALF_UP) + .abs(); + result = sumB.floatValue(); + } + return result; + } }; private final String i18nShortKey; @@ -130,9 +160,11 @@ public enum WeightUnit { */ public abstract Float toEntity(Float weight); + public abstract Float round(Float weight); + public Float convertWeight(Float weight, WeightUnit weightUnit) { Objects.requireNonNull(weightUnit); - return fromEntity(weightUnit.toEntity(weight)); + return round(fromEntity(weightUnit.toEntity(weight))); } public String decorateLabel(String label) { -- 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 b031235d7f391dc1849b5b101631ac5bcc20a3f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:34:08 2016 +0100 Ajout de nouvelles méthodes sur Weights --- .../src/main/java/fr/ifremer/tutti/util/Weights.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java index f71edbe..aa05f09 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java @@ -26,7 +26,7 @@ package fr.ifremer.tutti.util; import fr.ifremer.tutti.persistence.entities.protocol.Rtp; -import java.math.BigDecimal; +import fr.ifremer.tutti.type.WeightUnit; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -137,6 +137,14 @@ public class Weights { return weight == null || compareRawWeights(weight, 0.0f) == 0; } + public static boolean isNotZero(float weight) { + return compareRawWeights(weight, 0.0f) != 0; + } + + public static boolean isNotNullNorZero(Float number) { + return number!=null && Weights.isNotZero(number); + } + /** * Formule Poids (gramme) = a Taille (cm) ^ b * -- 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 5868576a294d4f93da4c9cc4805c5258ba1a0b7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:34:44 2016 +0100 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids --- .../catches/species/frequency/SpeciesFrequencyRowModel.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index 51976ae..004e70d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -230,7 +230,7 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa public boolean withWeight() { Float weight = getWeight(); - return weight != null && weight > 0; + return Weights.isNotNullNorZero(weight); } /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 08a16e2..41995d7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -571,7 +571,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public void setTotalWeight(Float totalWeight) { Object oldValue = getTotalWeight(); - this.totalComputedOrNotWeight.setData(totalWeight); + this.totalComputedOrNotWeight.setData(weightUnit.round(totalWeight)); firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } @@ -581,16 +581,16 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public void setTotalComputedWeight(Float totalComputedWeight) { Object oldValue = getTotalComputedWeight(); - this.totalComputedOrNotWeight.setComputedData(totalComputedWeight); + this.totalComputedOrNotWeight.setComputedData(weightUnit.round(totalComputedWeight)); firePropertyChange(PROPERTY_TOTAL_COMPUTED_WEIGHT, oldValue, totalComputedWeight); } // Utilisé dans un validateur, ne pas supprimer public boolean isTotalWeightSameAsComputedWeight() { Float totalWeight = getTotalWeight(); - Float computedWeight = getTotalComputedWeight(); - return totalWeight != null && computedWeight != null - && Weights.isEqualWeight(totalWeight, computedWeight); + Float totalComputedWeight = getTotalComputedWeight(); + return totalWeight != null && totalComputedWeight != null + && Weights.isEqualWeight(totalWeight, totalComputedWeight); } public Rtp getRtp() { -- 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 d5c4c44618be214c099c047d562117a70688a5e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 10:38:11 2016 +0100 Correction de l'arrondi (See #8128) --- .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 41 +++++++-------------- .../main/java/fr/ifremer/tutti/util/Weights.java | 19 ++-------- .../tutti/service/bigfin/BigfinImportService.java | 5 ++- .../service/catches/WeightComputingService.java | 43 +++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 ++- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +-- .../service/pupitri/PupitriImportService.java | 7 ++-- .../pupitri/report/PupitriImportReportModel.java | 14 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- 12 files changed, 64 insertions(+), 88 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java index b50f139..dca84b2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java @@ -39,8 +39,8 @@ import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.BatchTreeHelper; import fr.ifremer.tutti.persistence.service.util.MeasurementPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Numbers; -import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -680,7 +680,7 @@ public class CatchBatchPersistenceServiceImpl } - return Weights.roundKiloGram(result.floatValue()); + return WeightUnit.KG.round(result.floatValue()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java index 9649279..f54c051 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java @@ -51,19 +51,6 @@ public enum WeightUnit { return weight == null ? null : weight / 1000.0f; } - @Override - public Float round(Float weight) { - Float result; - if (weight == null) { - result = null; - } else { - BigDecimal sumB = new BigDecimal(String.valueOf(weight)) - .setScale(2, BigDecimal.ROUND_HALF_UP) - .abs(); - result = sumB.floatValue(); - } - return result; - } }, KG(n("application.common.unit.kg"), n("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { @Override @@ -76,20 +63,6 @@ public enum WeightUnit { return weight; } - @Override - public Float round(Float weight) { - Float result; - if (weight == null) { - result = null; - } else { - - BigDecimal sumB = new BigDecimal(String.valueOf(weight)) - .setScale(3, BigDecimal.ROUND_HALF_UP) - .abs(); - result = sumB.floatValue(); - } - return result; - } }; private final String i18nShortKey; @@ -160,7 +133,19 @@ public enum WeightUnit { */ public abstract Float toEntity(Float weight); - public abstract Float round(Float weight); + public Float round(Float weight) { + Float result; + if (weight == null) { + result = null; + } else { + + BigDecimal sumB = new BigDecimal(String.valueOf(weight)) + .setScale(getNumberDigits()+1, BigDecimal.ROUND_HALF_UP) + .abs(); + result = sumB.floatValue(); + } + return result; + } public Float convertWeight(Float weight, WeightUnit weightUnit) { Objects.requireNonNull(weightUnit); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java index aa05f09..7f90e63 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java @@ -27,6 +27,7 @@ package fr.ifremer.tutti.util; import fr.ifremer.tutti.persistence.entities.protocol.Rtp; import fr.ifremer.tutti.type.WeightUnit; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -75,20 +76,6 @@ public class Weights { } /** - * Round the given value to max 4 digits. - * - * @param value the float to round. - * @return the rounded value - * @since 1.0.1 - */ - public static float roundKiloGram(float value) { - BigDecimal sumB = new BigDecimal(String.valueOf(value)) - .setScale(3, BigDecimal.ROUND_HALF_UP) - .abs(); - return sumB.floatValue(); - } - - /** * Compare two weights with rounding them to kilograms. * * @param v0 first weight to compare @@ -96,8 +83,8 @@ public class Weights { * @return 1 if v0 > v1, -1 if v0 < v1, 0 if v0 == v1 */ public static int compareWeights(float v0, float v1) { - v0 = roundKiloGram(v0); - v1 = roundKiloGram(v1); + v0 = WeightUnit.KG.round(v0); + v1 = WeightUnit.KG.round(v1); return compareRawWeights(v0, v1); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 083af05..f3178d9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -61,6 +61,7 @@ import fr.ifremer.tutti.service.bigfin.signs.Sex; import fr.ifremer.tutti.service.bigfin.signs.Sign; import fr.ifremer.tutti.service.bigfin.signs.Size; import fr.ifremer.tutti.service.bigfin.signs.VracHorsVrac; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; @@ -517,7 +518,7 @@ public class BigfinImportService extends AbstractTuttiService { // si présence d'une seule valeur, mettre cette valeur dans le champ "Poids sous échantillon" if (notNullWeightsSize == 1) { float weight = IterableUtils.get(notNullWeights, 0); - weight = Weights.roundKiloGram(weight / 1000); + weight = WeightUnit.KG.round(weight / 1000); batch.setWeight(weight); persistenceService.saveSpeciesBatch(batch); } @@ -545,7 +546,7 @@ public class BigfinImportService extends AbstractTuttiService { } if (totalWeight > 0f) { // convert grams to kilograms - totalWeight = Weights.roundKiloGram(totalWeight / 1000); + totalWeight = WeightUnit.KG.round(totalWeight / 1000); frequency.setWeight(totalWeight); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index a286255..29c6063 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -36,6 +36,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Numbers; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; @@ -121,13 +122,13 @@ public class WeightComputingService extends AbstractTuttiService { if (speciesTotalSortedWeight == null) { speciesTotalSortedWeight = speciesTotalComputedSortedWeight; catchBatch.setSpeciesTotalSortedComputedWeight( - Weights.roundKiloGram(speciesTotalSortedWeight)); + WeightUnit.KG.round(speciesTotalSortedWeight)); } else if (speciesTotalSortedWeight < speciesTotalComputedSortedWeight) { throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.species.incoherentTotalSorted")); } catchBatch.setSpeciesTotalUnsortedComputedWeight( - Weights.roundKiloGram(speciesTotalComputedUnsortedWeight)); + WeightUnit.KG.round(speciesTotalComputedUnsortedWeight)); if (speciesTotalSortedWeight == null) { speciesTotalSortedWeight = catchBatch.getSpeciesTotalSortedComputedWeight(); @@ -171,19 +172,19 @@ public class WeightComputingService extends AbstractTuttiService { } catchBatch.setBenthosTotalSampleSortedComputedWeight( - Weights.roundKiloGram(benthosTotalComputedSortedWeight)); + WeightUnit.KG.round(benthosTotalComputedSortedWeight)); Float benthosTotalSortedWeight = catchBatch.getBenthosTotalSortedWeight(); if (benthosTotalSortedWeight == null) { benthosTotalSortedWeight = benthosTotalComputedSortedWeight; catchBatch.setBenthosTotalSortedComputedWeight( - Weights.roundKiloGram(benthosTotalSortedWeight)); + WeightUnit.KG.round(benthosTotalSortedWeight)); } else if (benthosTotalSortedWeight < benthosTotalComputedSortedWeight) { throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted")); } catchBatch.setBenthosTotalUnsortedComputedWeight( - Weights.roundKiloGram(benthosTotalComputedUnsortedWeight)); + WeightUnit.KG.round(benthosTotalComputedUnsortedWeight)); if (benthosTotalSortedWeight == null) { benthosTotalSortedWeight = catchBatch.getBenthosTotalSortedComputedWeight(); @@ -205,7 +206,7 @@ public class WeightComputingService extends AbstractTuttiService { } if (marineLitterTotalComputedWeight != null) { catchBatch.setMarineLitterTotalComputedWeight( - Weights.roundKiloGram(marineLitterTotalComputedWeight)); + WeightUnit.KG.round(marineLitterTotalComputedWeight)); } Float marineLitterTotalWeight = catchBatch.getMarineLitterTotalWeight(); @@ -223,8 +224,8 @@ public class WeightComputingService extends AbstractTuttiService { Float totalSortedSortedWeight = speciesTotalSortedWeight + benthosTotalSortedWeight; - catchBatch.setCatchTotalSortedSortedComputedWeight(Weights.roundKiloGram(totalSortedSortedWeight)); - catchBatch.setCatchTotalUnsortedComputedWeight(Weights.roundKiloGram(totalUnsortedWeight)); + catchBatch.setCatchTotalSortedSortedComputedWeight(WeightUnit.KG.round(totalSortedSortedWeight)); + catchBatch.setCatchTotalUnsortedComputedWeight(WeightUnit.KG.round(totalUnsortedWeight)); Float totalWeight = catchBatch.getCatchTotalWeight(); Float rejectedWeight = catchBatch.getCatchTotalRejectedWeight(); @@ -237,7 +238,7 @@ public class WeightComputingService extends AbstractTuttiService { //FIXME voir avec Vincent si on calcule le poids rejeté catchBatch.setCatchTotalRejectedComputedWeight( - Weights.roundKiloGram(totalWeight + WeightUnit.KG.round(totalWeight - totalUnsortedWeight - totalSortedSortedWeight)); @@ -247,7 +248,7 @@ public class WeightComputingService extends AbstractTuttiService { catchBatch.setCatchTotalRejectedComputedWeight(0f); } catchBatch.setCatchTotalComputedWeight( - Weights.roundKiloGram(totalUnsortedWeight + WeightUnit.KG.round(totalUnsortedWeight + totalSortedSortedWeight + rejectedWeight)); @@ -259,7 +260,7 @@ public class WeightComputingService extends AbstractTuttiService { if (rejectedWeight != null) { totalSortedWeight += rejectedWeight; } - catchBatch.setCatchTotalSortedComputedWeight(Weights.roundKiloGram(totalSortedWeight)); + catchBatch.setCatchTotalSortedComputedWeight(WeightUnit.KG.round(totalSortedWeight)); Float catchRate; @@ -270,10 +271,10 @@ public class WeightComputingService extends AbstractTuttiService { } Float speciesTotalWeight = speciesTotalSortedWeight * catchRate + speciesTotalComputedUnsortedWeight; - catchBatch.setSpeciesTotalComputedWeight(Weights.roundKiloGram(speciesTotalWeight)); + catchBatch.setSpeciesTotalComputedWeight(WeightUnit.KG.round(speciesTotalWeight)); Float benthosTotalWeight = benthosTotalSortedWeight * catchRate + benthosTotalComputedUnsortedWeight; - catchBatch.setBenthosTotalComputedWeight(Weights.roundKiloGram(benthosTotalWeight)); + catchBatch.setBenthosTotalComputedWeight(WeightUnit.KG.round(benthosTotalWeight)); } private int currentSpeciesRowIndex; @@ -343,7 +344,7 @@ public class WeightComputingService extends AbstractTuttiService { if (sum != null) { if (categoryWeight == null) { - batch.setSampleCategoryComputedWeight(Weights.roundKiloGram(sum)); + batch.setSampleCategoryComputedWeight(WeightUnit.KG.round(sum)); } else if (Weights.isSmallerWeight(categoryWeight, sum)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -408,7 +409,7 @@ public class WeightComputingService extends AbstractTuttiService { } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, // then this weight is the result - batch.setSampleCategoryComputedWeight(Weights.roundKiloGram(frequencyWeight)); + batch.setSampleCategoryComputedWeight(WeightUnit.KG.round(frequencyWeight)); result = frequencyWeight; } else if (frequencyWeight != null @@ -431,7 +432,7 @@ public class WeightComputingService extends AbstractTuttiService { thisIndex); } else if (rowWeight == null) { - batch.setComputedWeight(Weights.roundKiloGram(frequencyWeight)); + batch.setComputedWeight(WeightUnit.KG.round(frequencyWeight)); } result = categoryWeight; @@ -465,7 +466,7 @@ public class WeightComputingService extends AbstractTuttiService { thisIndex); } - return Weights.roundKiloGram(result); + return WeightUnit.KG.round(result); } private int currentBenthosRowIndex; @@ -530,7 +531,7 @@ public class WeightComputingService extends AbstractTuttiService { if (sum != null) { if (categoryWeight == null) { - batch.setSampleCategoryComputedWeight(Weights.roundKiloGram(sum)); + batch.setSampleCategoryComputedWeight(WeightUnit.KG.round(sum)); } else if (Weights.isSmallerWeight(categoryWeight, sum)) { String categoryLabel = @@ -599,7 +600,7 @@ public class WeightComputingService extends AbstractTuttiService { } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, // then this weight is the result - batch.setSampleCategoryComputedWeight(Weights.roundKiloGram(frequencyWeight)); + batch.setSampleCategoryComputedWeight(WeightUnit.KG.round(frequencyWeight)); result = frequencyWeight; } else if (frequencyWeight != null @@ -623,7 +624,7 @@ public class WeightComputingService extends AbstractTuttiService { thisIndex); } else if (rowWeight == null) { - batch.setComputedWeight(Weights.roundKiloGram(frequencyWeight)); + batch.setComputedWeight(WeightUnit.KG.round(frequencyWeight)); } result = categoryWeight; @@ -657,7 +658,7 @@ public class WeightComputingService extends AbstractTuttiService { thisIndex); } - return Weights.roundKiloGram(result); + return WeightUnit.KG.round(result); } public BatchContainer<MarineLitterBatch> getComputedMarineLitterBatches(Integer fishingOperationId, diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java index 189a10e..c4365db 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Weights; import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; @@ -135,7 +136,7 @@ public class TuttiCsvUtil extends Common { @Override public String format(Float value) { if (value != null) { - value = Weights.roundKiloGram(value); + value = WeightUnit.KG.round(value); } return super.format(value); } @@ -143,7 +144,7 @@ public class TuttiCsvUtil extends Common { @Override protected Float parseNoneEmptyValue(String value) { Float aFloat = super.parseNoneEmptyValue(value); - return Weights.roundKiloGram(aFloat); + return WeightUnit.KG.round(aFloat); } }; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java index 5f16b2b..a5f45b2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java @@ -815,12 +815,12 @@ public class PsionImportService extends AbstractTuttiService { batch.setSpecies(species); if (catchWeight != null) { - catchWeight = Weights.roundKiloGram(WeightUnit.G.toEntity(catchWeight)); + catchWeight = WeightUnit.KG.round(WeightUnit.G.toEntity(catchWeight)); batch.setSampleCategoryWeight(catchWeight); } if (sampleWeight != null) { - sampleWeight = Weights.roundKiloGram(WeightUnit.G.toEntity(sampleWeight)); + sampleWeight = WeightUnit.KG.round(WeightUnit.G.toEntity(sampleWeight)); batch.setWeight(sampleWeight); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java index 8db9991..e71f539 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java @@ -268,8 +268,8 @@ public class PupitriImportResult { void flushCarrouselResult(CarrouselImportRequestResult carrouselImportRequestResult) { // set carrousel sorted weight - this.carrouselSortedWeight = Weights.roundKiloGram(carrouselImportRequestResult.getCarrouselSortedWeight()); - this.carrouselUnsortedWeight = Weights.roundKiloGram(carrouselImportRequestResult.getCarrouselUnsortedWeight()); + this.carrouselSortedWeight = WeightUnit.KG.round(carrouselImportRequestResult.getCarrouselSortedWeight()); + this.carrouselUnsortedWeight = WeightUnit.KG.round(carrouselImportRequestResult.getCarrouselUnsortedWeight()); // set nb carrousel imported batches this.nbCarrousselImported = carrouselImportRequestResult.getNbCarrousselImported(); @@ -321,7 +321,7 @@ public class PupitriImportResult { // compute the weight from melag Float sampleWeight = aCatch.getWeight(Signs.MELAG); - Float weight = Weights.roundKiloGram(sampleWeight / melagRatio); + Float weight = WeightUnit.KG.round(sampleWeight / melagRatio); if (!aCatch.containsSign(Signs.BIG)) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index bab1c34..7464ef8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -58,6 +58,7 @@ import fr.ifremer.tutti.service.pupitri.csv.TrunkRow; import fr.ifremer.tutti.service.pupitri.csv.TrunkRowModel; import fr.ifremer.tutti.service.pupitri.report.PupitriImportReportModel; import fr.ifremer.tutti.service.pupitri.report.PupitriImportReportRow; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -357,12 +358,12 @@ public class PupitriImportService extends AbstractTuttiService { FileUtils.deleteQuietly(fileWithHeaders); } - result.setSortedWeight(Weights.roundKiloGram(sortedWeight)); + result.setSortedWeight(WeightUnit.KG.round(sortedWeight)); if (rejectedWeight > 0f) { // On set rejectweight when not zero, See http://forge.codelutin.com/issues/5676 - result.setRejectedWeight(Weights.roundKiloGram(rejectedWeight)); + result.setRejectedWeight(WeightUnit.KG.round(rejectedWeight)); } } @@ -655,7 +656,7 @@ public class PupitriImportService extends AbstractTuttiService { batch.setSampleCategoryValue(cqv); batch.setSpecies(species); batch.setSampleCategoryWeight( - catchWeight == null ? null : Weights.roundKiloGram(catchWeight)); + catchWeight == null ? null : WeightUnit.KG.round(catchWeight)); return batch; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java index eb3d2a0..0e55d25 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java @@ -29,8 +29,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.pupitri.PupitriImportResult; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.Numbers; -import fr.ifremer.tutti.util.Weights; import java.util.ArrayList; import java.util.Collections; @@ -82,36 +82,36 @@ public class PupitriImportReportModel { public Float getTrunkSortedWeight() { Float sortedWeight = importResult.getSortedWeight(); - return sortedWeight == null ? null : Weights.roundKiloGram(sortedWeight); + return sortedWeight == null ? null : WeightUnit.KG.round(sortedWeight); } public Float getTrunkRejectedWeight() { Float rejectedWeight = importResult.getRejectedWeight(); - return rejectedWeight == null ? null : Weights.roundKiloGram(rejectedWeight); + return rejectedWeight == null ? null : WeightUnit.KG.round(rejectedWeight); } public Float getTrunkTotalWeight() { float trunkSortedWeight = Numbers.getValueOrComputedValue(importResult.getSortedWeight(), 0f); float trunkRejectedWeight = Numbers.getValueOrComputedValue(importResult.getRejectedWeight(), 0f); - return Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); + return WeightUnit.KG.round(trunkSortedWeight + trunkRejectedWeight); } public Float getCarrouselSortedWeight() { Float carrouselSortedWeight = importResult.getCarrouselSortedWeight(); - return carrouselSortedWeight == null ? null : Weights.roundKiloGram(carrouselSortedWeight); + return carrouselSortedWeight == null ? null : WeightUnit.KG.round(carrouselSortedWeight); } public Float getCarrouselUnsortedWeight() { Float carrouselUnsortedWeight = importResult.getCarrouselUnsortedWeight(); - return carrouselUnsortedWeight == null ? null : Weights.roundKiloGram(carrouselUnsortedWeight); + return carrouselUnsortedWeight == null ? null : WeightUnit.KG.round(carrouselUnsortedWeight); } public Float getCarrouselTotalWeight() { float trunkSortedWeight = Numbers.getValueOrComputedValue(importResult.getCarrouselSortedWeight(), 0f); float trunkRejectedWeight = Numbers.getValueOrComputedValue(importResult.getCarrouselUnsortedWeight(), 0f); - return Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); + return WeightUnit.KG.round(trunkSortedWeight + trunkRejectedWeight); } public Set<String> getNotImportedSpeciesIds() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java index b72e6d9..ba5dead 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java @@ -205,7 +205,7 @@ public class CreateBenthosMelagAction extends LongActionSupport<BenthosBatchUIMo // ce lot possede un poids d'echantillonage mais pas de poids de categorisation // on calcul ce poids de categorisation et on lui affecte - float categoryWeight = Weights.roundKiloGram(sampleMelagWeight * sampleWeight / sortedWeight); + float categoryWeight = WeightUnit.KG.round(sampleMelagWeight * sampleWeight / sortedWeight); batch.getFinestCategory().setCategoryWeight(categoryWeight); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java index 580c3db..e3d0f96 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java @@ -199,7 +199,7 @@ public class CreateSpeciesMelagAction extends LongActionSupport<SpeciesBatchUIMo // ce lot possede un poids d'echantillonage mais pas de poids de categorisation // on calcul ce poids de categorisation et on lui affecte - float categoryWeight = Weights.roundKiloGram(sampleMelagWeight * sampleWeight / sortedWeight); + float categoryWeight = WeightUnit.KG.round(sampleMelagWeight * sampleWeight / sortedWeight); batch.getFinestCategory().setCategoryWeight(categoryWeight); } -- 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 bd34b7e778f9829297cbf04fa331aff99d5edf2b Merge: 573e649 d5c4c44 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 10:42:31 2016 +0100 Fixes #8128 Merge branch 'feature/8128' into develop .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +++++++++- .../main/java/fr/ifremer/tutti/util/Weights.java | 29 ++++++--------- .../tutti/service/bigfin/BigfinImportService.java | 5 ++- .../service/catches/WeightComputingService.java | 43 +++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 ++- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +-- .../service/pupitri/PupitriImportService.java | 7 ++-- .../pupitri/report/PupitriImportReportModel.java | 14 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 10 ++--- 14 files changed, 84 insertions(+), 68 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm