Author: tchemit Date: 2013-09-17 23:21:22 +0200 (Tue, 17 Sep 2013) New Revision: 1179 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1179 Log: fixes #3267: [ESPECE] Ajout du contexte d'un lot sur l'?\195?\169cran de cat?\195?\169gorisation Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 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/frequency/SpeciesFrequencyCellComponent.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -32,9 +32,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -313,6 +315,30 @@ ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString()); } + public void splitSpeciesBatch(SpeciesBatchRowModel editRow, + SplitSpeciesBatchUI splitBatchEditor) { + + splitBatchEditor.getHandler().editBatch(editRow); + + // open split editor + setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.splitSpeciesBatch.title")); + ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title.toString()); + } + public void setSpeciesSelectedCard(String card) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -337,13 +363,9 @@ } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); - titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); - title = n_("tutti.splitSpeciesBatch.title"); } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); -// titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); -// title = _("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { @@ -382,6 +404,31 @@ ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString()); } + public void splitBenthosBAtch(BenthosBatchRowModel editRow, + SplitBenthosBatchUI splitBatchEditor) { + + + splitBatchEditor.getHandler().editBatch(editRow); + + // open split editor + setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.splitBenthosBatch.title")); + ui.getBenthosTabSplitBatchReminderLabel().setTitle(title.toString()); + } + public void setBenthosSelectedCard(String card) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -406,13 +453,10 @@ } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabSplitBatch(); - titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); - title = n_("tutti.splitBenthosBatch.title"); } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); -// titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); -// title = n_("tutti.editBenthosFrequencies.title"); + } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -720,8 +720,9 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); SplitBenthosBatchUI splitBatchEditor = parent.getBenthosTabSplitBatch(); - splitBatchEditor.getHandler().editBatch(parentBatch); - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); +// splitBatchEditor.getHandler().editBatch(parentBatch); +// parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + parent.getHandler().splitBenthosBAtch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -158,13 +158,6 @@ SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().editBenthosFrequencies(editRow, this); - -// BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor(); -// -// frequencyEditor.getHandler().editBatch(editRow, this); -// -// // open frequency editor -// parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(BenthosFrequencyUIModel frequencyModel) { 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-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -722,8 +722,9 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch(); - splitBatchEditor.getHandler().editBatch(parentBatch); - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); +// splitBatchEditor.getHandler().editBatch(parentBatch); +// parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + parent.getHandler().splitSpeciesBatch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -158,13 +158,6 @@ SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().editSpeciesFrequencies(editRow, this); - -// SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor(); -// -// frequencyEditor.getHandler().editBatch(editRow, this); -// -// // open frequency editor -// parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) {