branch develop updated (c93db12 -> 8f4f316)
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 c93db12 fixes #6984: [ERGONOMIE] Problème sur l'écran de sélection des campagnes Merge branch 'feature/6984' into develop new 0a2a373 refs #6989 correction du test pour supprimer les lots especes ou benthos new 8f4f316 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' 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 8f4f316e2a3a46ca61f09b6f1991e7e44305b8f2 Merge: c93db12 0a2a373 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 17:00:41 2015 +0200 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' into develop commit 0a2a3734528cc060aa0257f1ac7be7585189fe81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 17:00:37 2015 +0200 refs #6989 correction du test pour supprimer les lots especes ou benthos Summary of changes: .../importactions/ImportCatchAction.java | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 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 0a2a3734528cc060aa0257f1ac7be7585189fe81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 17:00:37 2015 +0200 refs #6989 correction du test pour supprimer les lots especes ou benthos --- .../importactions/ImportCatchAction.java | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) 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 58bb2d2..c13debd 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 @@ -117,8 +117,13 @@ public class ImportCatchAction extends ImportActionSupport { } - persistSpeciesBatches(); - persistBenthosBatches(); + if (importContext.getImportRequest().isImportSpecies()) { + persistSpeciesBatches(); + } + + if(importContext.getImportRequest().isImportBenthos()) { + persistBenthosBatches(); + } } @@ -131,13 +136,15 @@ public class ImportCatchAction extends ImportActionSupport { for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { - boolean override = fishingOperationContext.isOverride(); +// boolean override = fishingOperationContext.isOverride(); +// +// if (override) { +// +// deleteSpeciesBatches(fishingOperationContext); +// +// } - if (override) { - - deleteSpeciesBatches(fishingOperationContext); - - } + deleteSpeciesBatches(fishingOperationContext); String cruiseStr = cruiseContext.getCruiseLabel(); String operationStr = fishingOperationContext.getFishingOperationLabel(); @@ -227,13 +234,15 @@ public class ImportCatchAction extends ImportActionSupport { for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { - boolean override = fishingOperationContext.isOverride(); - - if (override) { +// boolean override = fishingOperationContext.isOverride(); +// +// if (override) { +// +// deleteBenthosBatches(fishingOperationContext); +// +// } - deleteBenthosBatches(fishingOperationContext); - - } + deleteBenthosBatches(fishingOperationContext); String cruiseStr = cruiseContext.getCruiseLabel(); String operationStr = fishingOperationContext.getFishingOperationLabel(); -- 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 8f4f316e2a3a46ca61f09b6f1991e7e44305b8f2 Merge: c93db12 0a2a373 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 17:00:41 2015 +0200 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' into develop .../importactions/ImportCatchAction.java | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm