branch develop updated (e3700e2 -> 00d3274)
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 e3700e2 fixes #7201: [IMPORT GENERIQUE] NPE lors de la validation du fichier à importer Merge branch 'feature/7201' into develop new 67d8194 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) new 00d3274 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop The 2 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 00d3274fc344a2a20845f14cb50acdc26c4de061 Merge: e3700e2 67d8194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 16:11:12 2015 +0200 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop commit 67d81944915f3004f02d4152b3af91e1c52b0c21 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 16:11:08 2015 +0200 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) Summary of changes: .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 1 + 1 file changed, 1 insertion(+) -- 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 67d81944915f3004f02d4152b3af91e1c52b0c21 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 16:11:08 2015 +0200 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) --- .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index 7258ca9..f0d7487 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -303,6 +303,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { result.setSampleCategoryId(sampleCategory.getCategoryId()); result.setSampleCategoryValue(sampleCategory.getCategoryValue()); result.setSampleCategoryWeight(sampleCategory.getCategoryWeight()); + result.setWeight(sampleCategory.getSampleWeight()); result.setComment(sampleCategory.getComment()); operationContext.registerBatchObjectId(batch.getIdAsInt(), sampleCategory.getBatchId()); if (log.isInfoEnabled()) { -- 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 00d3274fc344a2a20845f14cb50acdc26c4de061 Merge: e3700e2 67d8194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 16:11:12 2015 +0200 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm