branch develop updated (877fac9 -> bc11306)
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 877fac9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5111388 refs #6958 On ne supprime jamais le nombre sur un lot (le fait qu'il soit calculé veut juste dire que ce n'est pas une mensuration) new 73fb2a6 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop new fa42d9b refs #6959 calculer le numéro d'ordre à l'import des lots new 5bd47d9 refs #6941 Sauvegarde du poids de sous-échantillon new bc11306 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' 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 bc11306cdd27cf7249695590911fef765a91aafc Merge: 73fb2a6 5bd47d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:32:06 2015 +0200 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop commit 5bd47d984de0279bf98e7834fb48f06680bf678d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:32:01 2015 +0200 refs #6941 Sauvegarde du poids de sous-échantillon commit fa42d9bcb075322daa4c51bd36ab8242e023285a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:12:54 2015 +0200 refs #6959 calculer le numéro d'ordre à l'import des lots commit 73fb2a65fa5556a7e24347b931b1a074d245549e Merge: 877fac9 5111388 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:12:00 2015 +0200 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop commit 511138811a33bc985c17c3e60eac3b0c98b6d7a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:11:37 2015 +0200 refs #6958 On ne supprime jamais le nombre sur un lot (le fait qu'il soit calculé veut juste dire que ce n'est pas une mensuration) Summary of changes: .../service/genericformat/consumer/CsvConsumerForCatch.java | 10 +--------- .../service/genericformat/importactions/ImportCatchAction.java | 8 ++++++++ 2 files changed, 9 insertions(+), 9 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 511138811a33bc985c17c3e60eac3b0c98b6d7a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:11:37 2015 +0200 refs #6958 On ne supprime jamais le nombre sur un lot (le fait qu'il soit calculé veut juste dire que ce n'est pas une mensuration) --- .../service/genericformat/consumer/CsvConsumerForCatch.java | 9 --------- 1 file changed, 9 deletions(-) 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 d7a8ced..b5a1342 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 @@ -46,7 +46,6 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatImportOperationContex import fr.ifremer.tutti.service.genericformat.csv.CatchModel; import fr.ifremer.tutti.service.genericformat.csv.CatchRow; import fr.ifremer.tutti.service.genericformat.csv.ExportSampleCategory; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.ImportRow; @@ -116,14 +115,6 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { boolean withFrequency = bean.withFrequency(); - if (!withFrequency) { - - if (BooleanUtils.toBooleanDefaultIfNull(bean.getBatchNumberComputed(), false)) { - bean.setBatchNumber(null); - } - - } - if (bean.isBenthos()) { prepareBenthosRowForPersist(operationContext, bean, withFrequency); -- 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 73fb2a65fa5556a7e24347b931b1a074d245549e Merge: 877fac9 5111388 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:12:00 2015 +0200 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop .../service/genericformat/consumer/CsvConsumerForCatch.java | 9 --------- 1 file changed, 9 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 fa42d9bcb075322daa4c51bd36ab8242e023285a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:12:54 2015 +0200 refs #6959 calculer le numéro d'ordre à l'import des lots --- .../service/genericformat/importactions/ImportCatchAction.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java index e919f66..58bb2d2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java @@ -170,8 +170,12 @@ public class ImportCatchAction extends ImportActionSupport { private void persistSpeciesBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<SpeciesBatch> batches, String parentId) { + int rankOrder = 1; + for (SpeciesBatch batch : batches) { + batch.setRankOrder(rankOrder++); + Integer batchObjectId = fishingOperationContext.getBatchObjectId(batch.getIdAsInt()); List<SpeciesBatchFrequency> frequencies = fishingOperationContext.getSpeciesFrequencies(batch); @@ -261,8 +265,12 @@ public class ImportCatchAction extends ImportActionSupport { private void persistBenthosBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<BenthosBatch> batches, String parentId) { + int rankOrder = 1; + for (BenthosBatch batch : batches) { + batch.setRankOrder(rankOrder++); + Integer batchObjectId = fishingOperationContext.getBatchObjectId(batch.getIdAsInt()); List<BenthosBatchFrequency> frequencies = fishingOperationContext.getBenthosFrequencies(batch); -- 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 5bd47d984de0279bf98e7834fb48f06680bf678d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:32:01 2015 +0200 refs #6941 Sauvegarde du poids de sous-échantillon --- .../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 b5a1342..999344b 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 @@ -246,6 +246,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { batch.setSampleCategoryId(sampleCategory.getCategoryId()); batch.setSampleCategoryValue(sampleCategory.getCategoryValue()); batch.setSampleCategoryWeight(sampleCategory.getCategoryWeight()); + batch.setWeight(sampleCategory.getSampleWeight()); batch.setRankOrder(sampleCategory.getRankOrder()); batch.setComment(sampleCategory.getComment()); result = batch; -- 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 bc11306cdd27cf7249695590911fef765a91aafc Merge: 73fb2a6 5bd47d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 19:32:06 2015 +0200 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 1 + .../service/genericformat/importactions/ImportCatchAction.java | 8 ++++++++ 2 files changed, 9 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm