branch develop updated (75f9a99 -> 13263c3)
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 75f9a99 fixes #6091: [CAPTURE] poids 127 ou 254 ou 508 g etc dans le Benthos, modification de la valeur saisie au moment de l'élévation des poids ! new ecd9945 separation en deux du service d'import et d'export pupitri new cdea1ed enregistrement des ids des especes non importees new b91151b affichage des especes non importees new 13263c3 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop The 4 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 13263c398f23bd03c085d008faab0e9a106b63be Merge: 75f9a99 b91151b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:36:55 2014 +0100 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop commit b91151b6c8b1c372ff8b550353133fdee4a44c60 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:32:08 2014 +0100 affichage des especes non importees commit cdea1edd304af7ab74e3377fdffa34bb37c0933a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:31:47 2014 +0100 enregistrement des ids des especes non importees commit ecd99450526525904ac46db9fd5b786ffb9dc5b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 12:52:22 2014 +0100 separation en deux du service d'import et d'export pupitri Summary of changes: .../service/pupitri/PupitriExportService.java | 58 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriImportResult.java | 33 ++++++++---- ...xportService.java => PupitriImportService.java} | 42 ++-------------- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +-- ...viceTest.java => PupitriImportServiceTest.java} | 6 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 ++-- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 44 ++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 160 insertions(+), 82 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportService.java => PupitriImportService.java} (93%) rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportServiceTest.java => PupitriImportServiceTest.java} (96%) -- 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 ecd99450526525904ac46db9fd5b786ffb9dc5b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 12:52:22 2014 +0100 separation en deux du service d'import et d'export pupitri --- .../service/pupitri/PupitriExportService.java | 58 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriImportResult.java | 12 +++++ ...xportService.java => PupitriImportService.java} | 36 +------------- .../pupitri/PupitriImportServiceAno3898Test.java | 4 +- .../pupitri/PupitriImportServiceAno5032Test.java | 4 +- .../pupitri/PupitriImportServiceAno5079Test.java | 4 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 4 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 4 +- ...viceTest.java => PupitriImportServiceTest.java} | 6 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 ++-- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 15 +++--- 12 files changed, 104 insertions(+), 63 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java new file mode 100644 index 0000000..35fcdf1 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.service.pupitri; + +import com.google.common.base.Charsets; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.AbstractTuttiService; +import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.csv.Export; +import org.nuiton.jaxx.application.ApplicationTechnicalException; + +import java.io.File; +import java.util.List; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 11/20/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.10 + */ +public class PupitriExportService extends AbstractTuttiService { + + + public void exportSpecies(List<Species> species, File target) { + + SpeciesRowModel speciesCsvModel = new SpeciesRowModel(';'); + + List<SpeciesRow> rows = Lists.newArrayList(); + + if (CollectionUtils.isNotEmpty(species)) { + rows = Lists.transform(species, new Function<Species, SpeciesRow>() { + + @Override + public SpeciesRow apply(Species input) { + SpeciesRow row = new SpeciesRow(input); + return row; + } + }); + } + + try { + Export.exportToFile(speciesCsvModel, + rows, + target, + Charsets.UTF_8, + false); + + } catch (Exception e) { + throw new ApplicationTechnicalException( + t("tutti.service.pupitri.export.species.error", target), e); + } + + } +} + + 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 39087ee..13415ae 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 @@ -32,6 +32,7 @@ import java.io.File; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -89,11 +90,14 @@ public class PupitriImportResult { */ private final Set<Species> melagSpecies; + private final Set<String> notImportedSpeciesIds; + public PupitriImportResult(File trunkFile, File carrousselFile) { this.trunkFile = trunkFile; this.carrousselFile = carrousselFile; catches = new ArrayList<>(); melagSpecies = new HashSet<>(); + notImportedSpeciesIds = new LinkedHashSet<>(); } public boolean isFishingOperationFound() { @@ -152,6 +156,10 @@ public class PupitriImportResult { return melagSpecies; } + public Set<String> getNotImportedSpeciesIds() { + return notImportedSpeciesIds; + } + /** * @return {@code true} if there is a total melga weight defined (at least one species MELA-GNE found). * @since 3.4.2 @@ -206,6 +214,10 @@ public class PupitriImportResult { } } + void addNotImportedSpeciesId(String notImportedSpeciesId) { + notImportedSpeciesIds.add(notImportedSpeciesId); + } + void addCatch(PupitriCatch aCatch) { catches.add(aCatch); 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/PupitriImportService.java similarity index 94% rename from tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java rename to tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index fede336..74ccc11 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/PupitriImportService.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.service.pupitri; * #L% */ -import com.google.common.base.Charsets; -import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; @@ -58,7 +56,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.csv.Export; import org.nuiton.csv.Import; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.ApplicationIOUtil; @@ -81,10 +78,10 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 1.2 */ -public class PupitriImportExportService extends AbstractTuttiService { +public class PupitriImportService extends AbstractTuttiService { private static final Log log = - LogFactory.getLog(PupitriImportExportService.class); + LogFactory.getLog(PupitriImportService.class); protected DecoratorService decoratorService; @@ -162,35 +159,6 @@ public class PupitriImportExportService extends AbstractTuttiService { return result; } - public void exportSpecies(List<Species> species, File target) { - SpeciesRowModel speciesCsvModel = new SpeciesRowModel(';'); - - List<SpeciesRow> rows = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(species)) { - rows = Lists.transform(species, new Function<Species, SpeciesRow>() { - - @Override - public SpeciesRow apply(Species input) { - SpeciesRow row = new SpeciesRow(input); - return row; - } - }); - } - - try { - Export.exportToFile(speciesCsvModel, - rows, - target, - Charsets.UTF_8, - false); - - } catch (Exception e) { - throw new ApplicationTechnicalException( - t("tutti.service.pupitri.export.species.error", target), e); - } - } - protected void addFileAsAttachment(File f, CatchBatch catchBatch) { Attachment attachment = Attachments.newAttachment(); attachment.setObjectType(ObjectTypeCode.CATCH_BATCH); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java index 951f5ee..830271b 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java @@ -62,7 +62,7 @@ public class PupitriImportServiceAno3898Test { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -81,7 +81,7 @@ public class PupitriImportServiceAno3898Test { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java index 561c61f..f088049 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java @@ -69,7 +69,7 @@ public class PupitriImportServiceAno5032Test { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -88,7 +88,7 @@ public class PupitriImportServiceAno5032Test { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java index b51c1d8..ac14ef1 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java @@ -73,7 +73,7 @@ public class PupitriImportServiceAno5079Test { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -92,7 +92,7 @@ public class PupitriImportServiceAno5079Test { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java index 0c9cd7c..e361ac0 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java @@ -71,7 +71,7 @@ public class PupitriImportServiceEvo5060Test { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -90,7 +90,7 @@ public class PupitriImportServiceEvo5060Test { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java index 8b9c36e..4f54a76 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java @@ -72,7 +72,7 @@ public class PupitriImportServiceEvo5062Test { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -91,7 +91,7 @@ public class PupitriImportServiceEvo5062Test { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java similarity index 96% rename from tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java rename to tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java index 1070a5b..98eb187 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java @@ -44,7 +44,7 @@ import java.io.IOException; * @author tchemit <chemit@codelutin.com> * @since 2.4 */ -public class PupitriImportExportServiceTest { +public class PupitriImportServiceTest { @ClassRule public static final ServiceDbResource dbResource = @@ -60,7 +60,7 @@ public class PupitriImportExportServiceTest { public static final String OPERATION_3_ID = "100115"; - protected PupitriImportExportService service; + protected PupitriImportService service; protected PersistenceService persistenceService; @@ -79,7 +79,7 @@ public class PupitriImportExportServiceTest { dbResource.openDataContext(); - service = serviceContext.getService(PupitriImportExportService.class); + service = serviceContext.getService(PupitriImportService.class); dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 3a0e46b..01b117f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -44,7 +44,8 @@ import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService; import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; import fr.ifremer.tutti.service.psionimport.PsionImportService; -import fr.ifremer.tutti.service.pupitri.PupitriImportExportService; +import fr.ifremer.tutti.service.pupitri.PupitriExportService; +import fr.ifremer.tutti.service.pupitri.PupitriImportService; import fr.ifremer.tutti.service.referential.ReferentialTemporaryGearService; import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; import fr.ifremer.tutti.service.referential.ReferentialTemporarySpeciesService; @@ -667,8 +668,12 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage return serviceContext.getService(ProtocolImportExportService.class); } - public PupitriImportExportService getTuttiPupitriImportExportService() { - return serviceContext.getService(PupitriImportExportService.class); + public PupitriImportService getPupitriImportService() { + return serviceContext.getService(PupitriImportService.class); + } + + public PupitriExportService getPupitriExportService() { + return serviceContext.getService(PupitriExportService.class); } public PsionImportService getTuttiPsionImportService() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java index fc563a1..4910e9b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.pupitri.PupitriImportExportService; +import fr.ifremer.tutti.service.pupitri.PupitriExportService; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; @@ -101,11 +101,10 @@ public class ExportPupitriAction extends AbstractTuttiAction<EditProtocolUIModel } } - // import - PupitriImportExportService service = - getContext().getTuttiPupitriImportExportService(); - + // do Export + PupitriExportService service = getContext().getPupitriExportService(); service.exportSpecies(speciesList, file); + } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index 3f91d48..e2329d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -29,8 +29,8 @@ import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.pupitri.PupitriImportExportService; import fr.ifremer.tutti.service.pupitri.PupitriImportResult; +import fr.ifremer.tutti.service.pupitri.PupitriImportService; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -137,9 +137,7 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel @Override public void doAction() throws Exception { - PupitriImportExportService importExportService = - getContext().getTuttiPupitriImportExportService(); - + EditCatchesUI parentContainer = handler.getParentContainer(EditCatchesUI.class); EditCatchesUIModel model = parentContainer.getModel(); @@ -147,10 +145,11 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel CatchBatch catchBatch = model.toEntity(); // import - importResult = importExportService.importPupitri(importedTrunkFile, - importedCarrouselFile, - operation, - catchBatch); + PupitriImportService service = getContext().getPupitriImportService(); + importResult = service.importPupitri(importedTrunkFile, + importedCarrouselFile, + operation, + catchBatch); if (importResult.isFishingOperationFound()) { -- 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 cdea1edd304af7ab74e3377fdffa34bb37c0933a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:31:47 2014 +0100 enregistrement des ids des especes non importees --- .../tutti/service/pupitri/PupitriImportResult.java | 23 +++++++++++----------- .../service/pupitri/PupitriImportService.java | 6 +++--- .../pupitri/PupitriImportServiceAno3898Test.java | 3 ++- .../pupitri/PupitriImportServiceAno5032Test.java | 3 ++- .../pupitri/PupitriImportServiceAno5079Test.java | 3 ++- .../pupitri/PupitriImportServiceEvo5060Test.java | 3 ++- .../pupitri/PupitriImportServiceEvo5062Test.java | 3 ++- 7 files changed, 25 insertions(+), 19 deletions(-) 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 13415ae..04a2d4f 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 @@ -22,8 +22,9 @@ package fr.ifremer.tutti.service.pupitri; * #L% */ -import fr.ifremer.tutti.util.Weights; +import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.lang3.mutable.MutableFloat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,7 +60,7 @@ public class PupitriImportResult { int nbCarrousselImported; - int nbCarrousselNotImported; +// int nbCarrousselNotImported; private Float sortedWeight; @@ -125,7 +126,7 @@ public class PupitriImportResult { } public int getNbCarrousselNotImported() { - return nbCarrousselNotImported; + return notImportedSpeciesIds.size(); } public Float getSortedWeight() { @@ -157,7 +158,7 @@ public class PupitriImportResult { } public Set<String> getNotImportedSpeciesIds() { - return notImportedSpeciesIds; + return ImmutableSet.copyOf(notImportedSpeciesIds); } /** @@ -188,13 +189,13 @@ public class PupitriImportResult { this.nbCarrousselImported++; } - void incrementNbCarrousselNotImported() { - this.nbCarrousselNotImported++; - } +// void incrementNbCarrousselNotImported() { +// this.nbCarrousselNotImported++; +// } - void setNbCarrousselNotImported(int nbCarrousselNotImported) { - this.nbCarrousselNotImported = nbCarrousselNotImported; - } +// void setNbCarrousselNotImported(int nbCarrousselNotImported) { +// this.nbCarrousselNotImported = nbCarrousselNotImported; +// } void setSortedWeight(Float sortedWeight) { this.sortedWeight = sortedWeight; @@ -225,7 +226,7 @@ public class PupitriImportResult { if (aCatch.isMelagMetaSpecies()) { if (log.isInfoEnabled()) { - log.info("Found a MELAG catch: "+aCatch); + log.info("Found a MELAG catch: " + aCatch); } // add weight to melag addMelagTotalWeight(aCatch.getWeight(Signs.DEFAULT)); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index 74ccc11..8d35c6d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -254,7 +254,7 @@ public class PupitriImportService extends AbstractTuttiService { Float carrouselSortedWeight = 0f; List<PupitriCatch> catches = Lists.newArrayList(); - Set<String> notFoundSpecies = Sets.newHashSet(); +// Set<String> notFoundSpecies = Sets.newHashSet(); Import<CarrouselRow> importer = null; @@ -299,7 +299,7 @@ public class PupitriImportService extends AbstractTuttiService { } pupitriCatch.addToSign(bean.getSign(), beanWeight); } else { - notFoundSpecies.add(speciesId); + result.addNotImportedSpeciesId(speciesId); } } } @@ -318,7 +318,7 @@ public class PupitriImportService extends AbstractTuttiService { FileUtils.deleteQuietly(fileWithHeaders); } - result.setNbCarrousselNotImported(notFoundSpecies.size()); +// result.setNbCarrousselNotImported(notFoundSpecies.size()); result.setCarrouselSortedWeight(Weights.roundKiloGram(carrouselSortedWeight)); result.setCatches(catches); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java index 830271b..2eb0b28 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java @@ -105,7 +105,8 @@ public class PupitriImportServiceAno3898Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(31, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java index f088049..dc17050 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java @@ -112,7 +112,8 @@ public class PupitriImportServiceAno5032Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(4, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(4, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java index ac14ef1..4294b67 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java @@ -122,7 +122,8 @@ public class PupitriImportServiceAno5079Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(5, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java index e361ac0..7cacb22 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java @@ -115,7 +115,8 @@ public class PupitriImportServiceEvo5060Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java index 4f54a76..430a8ca 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java @@ -116,7 +116,8 @@ public class PupitriImportServiceEvo5062Test { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(3, rootSpeciesBatch.sizeChildren()); - int nbNotAdded = service.importPupitri(trunk, carroussel, operation, catchBatch).getNbCarrousselNotImported(); + PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); + int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); Assert.assertEquals(0, nbNotAdded); BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(9, rootSpeciesBatchAfter.sizeChildren()); -- 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 b91151b6c8b1c372ff8b550353133fdee4a44c60 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:32:08 2014 +0100 affichage des especes non importees --- .../tutti/ui/swing/action/ImportPupitriAction.java | 33 ++++++++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index e2329d3..5937bd3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -42,8 +42,10 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import javax.swing.JOptionPane; import javax.swing.UIManager; +import java.awt.Component; import java.io.File; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -112,7 +114,8 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel t("tutti.editSpeciesBatch.action.importPupitri.existingData.message"), t("tutti.editSpeciesBatch.action.importPupitri.existingData.help")); - int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + Component dialogParentComponent = getDialogParentComponent(); + int answer = JOptionPane.showConfirmDialog(dialogParentComponent, htmlMessage, t("tutti.editSpeciesBatch.action.importPupitri.existingData.title"), JOptionPane.OK_CANCEL_OPTION, @@ -137,7 +140,7 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel @Override public void doAction() throws Exception { - + EditCatchesUI parentContainer = handler.getParentContainer(EditCatchesUI.class); EditCatchesUIModel model = parentContainer.getModel(); @@ -170,10 +173,34 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel super.postSuccessAction(); if (importResult.isFishingOperationFound()) { - int rejectedSpeciesNb = importResult.getNbCarrousselNotImported(); + + Set<String> notImportedSpeciesIds = importResult.getNotImportedSpeciesIds(); + + int rejectedSpeciesNb = notImportedSpeciesIds.size(); sendMessage(t("tutti.editSpeciesBatch.action.importPupitri.success", getModel().getRootNumber(), rejectedSpeciesNb)); + + if (!notImportedSpeciesIds.isEmpty()) { + + // on affiche la liste des especes non importees + + StringBuilder content = new StringBuilder(); + + for (String notImportedSpeciesId : notImportedSpeciesIds) { + content.append("<li>").append(notImportedSpeciesId).append("</li>"); + } + + String text = + "<html><body>" + + t("tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.message", + rejectedSpeciesNb, content.toString()) + + "</body></html>"; + + displayWarningMessage(t("tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.title"), text); + + } + } else { displayWarningMessage( diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 19c52a5..6eabf35 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1067,6 +1067,8 @@ tutti.editSpeciesBatch.action.importPupitri.mnemonic= tutti.editSpeciesBatch.action.importPupitri.no.matching.data= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title= +tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.message= +tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.title= tutti.editSpeciesBatch.action.importPupitri.success= tutti.editSpeciesBatch.action.importPupitri.tip= tutti.editSpeciesBatch.action.removeBatch= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 6733bda..4848047 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1039,6 +1039,8 @@ tutti.editSpeciesBatch.action.importPupitri.mnemonic=u tutti.editSpeciesBatch.action.importPupitri.no.matching.data=Import pupitri non réalisé (Les identifiants de Station et/ ou de Date du trait ne correspondent pas) tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation=L'application n'a pas trouvé dans les fichiers Trunk et Carrousel les identifiants de Station et/ou de Date du trait en cours de saisie.<br/>Aucun lot n'a donc été importé. tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title=Import Pupitri +tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.message=%s espèces n'ont pas été importées lors de l'import Pupitri, en voici la liste \: <ul>%s</ul> +tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.title=Import Pupitri (espèces non importées) tutti.editSpeciesBatch.action.importPupitri.success=Import Pupitri réussi \: %1s espèces importées, %2s espèces rejetées tutti.editSpeciesBatch.action.importPupitri.tip=Import Pupitri tutti.editSpeciesBatch.action.removeBatch=Supprimer le lot -- 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 13263c398f23bd03c085d008faab0e9a106b63be Merge: 75f9a99 b91151b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 13:36:55 2014 +0100 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop .../service/pupitri/PupitriExportService.java | 58 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriImportResult.java | 33 ++++++++---- ...xportService.java => PupitriImportService.java} | 42 ++-------------- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +-- ...viceTest.java => PupitriImportServiceTest.java} | 6 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 ++-- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 44 ++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 160 insertions(+), 82 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm