Author: kmorin Date: 2013-02-01 15:22:46 +0100 (Fri, 01 Feb 2013) New Revision: 290 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/290 Log: fixes #1964 [CAPTURE - ESPECES] Cat?\195?\169gorisation impossible si un poids sous-?\195?\169chantillonn?\195?\169 a ?\195?\169t?\195?\169 saisi Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-01 11:46:34 UTC (rev 289) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-01 14:22:46 UTC (rev 290) @@ -78,10 +78,12 @@ import java.util.EnumMap; import java.util.List; import java.util.Set; +import javax.swing.JOptionPane; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; /** * @author tchemit <chemit@codelutin.com> @@ -674,7 +676,7 @@ } public void splitSpeciesBatch() { - + JXTable table = getTable(); // get selected row @@ -687,15 +689,33 @@ SpeciesBatchRowModel parentBatch = tableModel.getEntry(rowIndex); - if (log.isInfoEnabled()) { - log.info("Open split batch ui for row [" + rowIndex + ']'); + boolean split = true; + if (parentBatch.getWeight() != null) { + int i = JOptionPane.showConfirmDialog( + ui, + _("tutti.dialog.catches.species.split.weightNotNull.message"), + _("tutti.dialog.catches.species.split.weightNotNull.title"), + JOptionPane.OK_CANCEL_OPTION); + + if (i == JOptionPane.OK_OPTION) { + parentBatch.setWeight(null); + + } else { + split = false; + } } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); - SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch(); + if (split) { + if (log.isInfoEnabled()) { + log.info("Open split batch ui for row [" + rowIndex + ']'); + } - splitBatchEditor.getHandler().editBatch(parentBatch); - parent.getHandler().setSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch(); + + splitBatchEditor.getHandler().editBatch(parentBatch); + parent.getHandler().setSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + } } public void splitBatch(SplitSpeciesBatchUIModel splitModel) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-01 11:46:34 UTC (rev 289) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-01 14:22:46 UTC (rev 290) @@ -115,6 +115,8 @@ tutti.config.ui.useSexagecimalEditor=Utiliser l'éditeur sexagécimal pour entrer des coordonnées tutti.dialog.askSaveBeforeLeaving.message=Vous avez fait des modifications qu vous n'avez pas enregistrées. Voulez-vous les enregistrer ? tutti.dialog.askSaveBeforeLeaving.title=Modifications non enregistrées +tutti.dialog.catches.species.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné. Catégoriser le lot mettra le poids sous-échantillonné à nul. +tutti.dialog.catches.species.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.duration.format=dj Hh m'm' tutti.errorTable.title=Rapport de contrôles tutti.file.csv=Extension d'un fichier csv