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 8521235ff2f6fc8bb6a1a5926419137495f3acf5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 22 16:34:54 2016 +0100 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) --- .../tutti/service/genericformat/producer/CsvProducerForCatch.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index cd0e728..13501b2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -320,8 +320,6 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { } else { - int categoryIndex = currentRow.getSampleCategory().size(); - float sampleComputedWeight = 0f; for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { @@ -333,7 +331,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { childBatch, totalBatchWeight); - ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex); + ExportSampleCategory exportSampleCategory = childRow.getLastSampleCategoryFilled(); if (exportSampleCategory != null) { Float categoryWeight = Numbers.getValueOrComputedValue( exportSampleCategory.getCategoryWeight(), @@ -351,7 +349,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { sampleComputedWeight += categoryWeight; } } - currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight); + currentRow.getLastSampleCategoryFilled().setSampleComputedWeight(sampleComputedWeight); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.