[tutti] branch develop updated (15cb38e -> 8c8c58d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 15cb38e fixes #5671: Revoir traitement #5174 Refactor TuttiEntities class (split to more specialized classes) f# Please enter the commit message for your changes. Lines starting new 8c8c58d fixes #5676: [IMPORT PUPITRI] Ne pas remonté le poids total non trié 0 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 8c8c58d433136e5017fc27684f3adaef0455f112 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 15:34:25 2014 +0200 fixes #5676: [IMPORT PUPITRI] Ne pas remonté le poids total non trié 0 Summary of changes: .../src/main/java/fr/ifremer/tutti/util/Weights.java | 12 ++++++++++++ .../tutti/service/pupitri/PupitriImportExportService.java | 10 ++++++++-- .../ifremer/tutti/service/pupitri/PupitriImportResult.java | 12 ++++++------ 3 files changed, 26 insertions(+), 8 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 http://git.codelutin.com/tutti.git commit 8c8c58d433136e5017fc27684f3adaef0455f112 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 26 15:34:25 2014 +0200 fixes #5676: [IMPORT PUPITRI] Ne pas remonté le poids total non trié 0 --- .../src/main/java/fr/ifremer/tutti/util/Weights.java | 12 ++++++++++++ .../tutti/service/pupitri/PupitriImportExportService.java | 10 ++++++++-- .../ifremer/tutti/service/pupitri/PupitriImportResult.java | 12 ++++++------ 3 files changed, 26 insertions(+), 8 deletions(-) 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 07e65c7..614f0fc 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 @@ -64,6 +64,18 @@ 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 roundNullableKiloGram(Float value) { + Float result = value==null?null: roundKiloGram(value); + return result; + } + + /** * Compare two weights with rounding them to kilograms. * * @param v0 first weight to compare diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java index 1b1be48..662d9c9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java @@ -32,7 +32,6 @@ import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; @@ -51,6 +50,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -256,7 +256,13 @@ public class PupitriImportExportService extends AbstractTuttiService { } result.setSortedWeight(Weights.roundKiloGram(sortedWeight)); - result.setRejectedWeight(Weights.roundKiloGram(rejectedWeight)); + + if (rejectedWeight > 0f) { + + // On set rejectweight when not zero, See http://forge.codelutin.com/issues/5676 + result.setRejectedWeight(Weights.roundKiloGram(rejectedWeight)); + } + } protected void importPupitriCarrousel(PupitriImportResult result, 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 733583a..39087ee 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 @@ -60,9 +60,9 @@ public class PupitriImportResult { int nbCarrousselNotImported; - private float sortedWeight; + private Float sortedWeight; - private float rejectedWeight; + private Float rejectedWeight; private Float carrouselSortedWeight; @@ -124,11 +124,11 @@ public class PupitriImportResult { return nbCarrousselNotImported; } - public float getSortedWeight() { + public Float getSortedWeight() { return sortedWeight; } - public float getRejectedWeight() { + public Float getRejectedWeight() { return rejectedWeight; } @@ -188,11 +188,11 @@ public class PupitriImportResult { this.nbCarrousselNotImported = nbCarrousselNotImported; } - void setSortedWeight(float sortedWeight) { + void setSortedWeight(Float sortedWeight) { this.sortedWeight = sortedWeight; } - void setRejectedWeight(float rejectedWeight) { + void setRejectedWeight(Float rejectedWeight) { this.rejectedWeight = rejectedWeight; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm