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>.