September 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1186 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create resources/i18n
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 14:11:34 +0200 (Wed, 18 Sep 2013) New Revision: 1186 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1186 Log: fixes #3270: [ESPECES] pouvoir saisir plusieurs lots p?\195?\168res sans refermer le formulaire Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-18 12:11:34 UTC (rev 1186) @@ -1,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Aug 23 16:40:22 CEST 2013 +#Wed Sep 18 13:39:38 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -35,9 +12,11 @@ tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.save.help= +tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help= +tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos @@ -57,9 +36,11 @@ tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.save.help= +tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help= +tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-18 12:11:34 UTC (rev 1186) @@ -1,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Aug 23 16:40:22 CEST 2013 +#Wed Sep 18 13:39:38 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -36,6 +13,8 @@ tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions tutti.createBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndClose.help= +tutti.createBenthosBatch.action.saveAndContinue.help= tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields tutti.createBenthosBatch.field.sampleCategory.help= tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields @@ -57,9 +36,11 @@ tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.save.help= +tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help= +tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-18 12:11:34 UTC (rev 1186) @@ -86,15 +86,24 @@ _help: {"tutti.createBenthosBatch.action.addSpecies.help"}; } -#saveButton { +#saveAndContinueButton { actionIcon: save; - text: "tutti.createBenthosBatch.action.save"; - toolTipText: "tutti.createBenthosBatch.action.save.tip"; - i18nMnemonic: "tutti.createBenthosBatch.action.save.mnemonic"; + text: "tutti.createBenthosBatch.action.saveAndContinue"; + toolTipText: "tutti.createBenthosBatch.action.saveAndContinue.tip"; + i18nMnemonic: "tutti.createBenthosBatch.action.saveAndContinue.mnemonic"; enabled: {model.isValid()}; - _help: {"tutti.createBenthosBatch.action.save.help"}; + _help: {"tutti.createBenthosBatch.action.saveAndContinue.help"}; } +#saveAndCloseButton { + actionIcon: save; + text: "tutti.createBenthosBatch.action.saveAndClose"; + toolTipText: "tutti.createBenthosBatch.action.saveAndClose.tip"; + i18nMnemonic: "tutti.createBenthosBatch.action.saveAndClose.mnemonic"; + enabled: {model.isValid()}; + _help: {"tutti.createBenthosBatch.action.saveAndClose.help"}; +} + #cancelButton { actionIcon: cancel; text: "tutti.createBenthosBatch.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-09-18 12:11:34 UTC (rev 1186) @@ -116,6 +116,7 @@  <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='saveButton' onActionPerformed='handler.save()'/> + <JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/> + <JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/> </JPanel> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-18 12:11:34 UTC (rev 1186) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; @@ -239,10 +240,10 @@ model.setAvailableSpecies(speciesToUse); } - public void save() { + public void saveAndClose() { if (log.isDebugEnabled()) { - log.debug("Save UI " + ui); + log.debug("Save and close UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -252,6 +253,20 @@ closeUI(ui); } + public void saveAndContinue() { + + if (log.isDebugEnabled()) { + log.debug("Save and continue UI " + ui); + } + + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + BenthosBatchUI benthosTabContent = parent.getBenthosTabContent(); + benthosTabContent.getHandler().addBatch(getModel()); + + // re-open this screen + openUI(benthosTabContent.getModel()); + } + public Species openAddSpeciesDialog(String title, List<Species> species) { SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); SelectSpeciesUIModel model = dialogContent.getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-18 12:11:34 UTC (rev 1186) @@ -86,15 +86,24 @@ _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; } -#saveButton { +#saveAndContinueButton { actionIcon: save; - text: "tutti.createSpeciesBatch.action.save"; - toolTipText: "tutti.createSpeciesBatch.action.save.tip"; - i18nMnemonic: "tutti.createSpeciesBatch.action.save.mnemonic"; + text: "tutti.createSpeciesBatch.action.saveAndContinue"; + toolTipText: "tutti.createSpeciesBatch.action.saveAndContinue.tip"; + i18nMnemonic: "tutti.createSpeciesBatch.action.saveAndContinue.mnemonic"; enabled: {model.isValid()}; - _help: {"tutti.createSpeciesBatch.action.save.help"}; + _help: {"tutti.createSpeciesBatch.action.saveAndContinue.help"}; } +#saveAndCloseButton { + actionIcon: save; + text: "tutti.createSpeciesBatch.action.saveAndClose"; + toolTipText: "tutti.createSpeciesBatch.action.saveAndClose.tip"; + i18nMnemonic: "tutti.createSpeciesBatch.action.saveAndClose.mnemonic"; + enabled: {model.isValid()}; + _help: {"tutti.createSpeciesBatch.action.saveAndClose.help"}; +} + #cancelButton { actionIcon: cancel; text: "tutti.createSpeciesBatch.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-09-18 12:11:34 UTC (rev 1186) @@ -116,6 +116,7 @@  <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='saveButton' onActionPerformed='handler.save()'/> + <JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/> + <JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/> </JPanel> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-18 12:11:34 UTC (rev 1186) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; @@ -238,13 +239,27 @@ model.setAvailableSpecies(speciesToUse); } - public void save() { + public void saveAndContinue() { if (log.isDebugEnabled()) { log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + SpeciesBatchUI speciesTabContent = parent.getSpeciesTabContent(); + speciesTabContent.getHandler().addBatch(getModel()); + + // re-open this screen + openUI(speciesTabContent.getModel()); + } + + public void saveAndClose() { + + if (log.isDebugEnabled()) { + log.debug("Save and Close UI " + ui); + } + + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getSpeciesTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-18 12:11:34 UTC (rev 1186) @@ -171,6 +171,12 @@ tutti.createBenthosBatch.action.save= tutti.createBenthosBatch.action.save.mnemonic= tutti.createBenthosBatch.action.save.tip= +tutti.createBenthosBatch.action.saveAndClose= +tutti.createBenthosBatch.action.saveAndClose.mnemonic= +tutti.createBenthosBatch.action.saveAndClose.tip= +tutti.createBenthosBatch.action.saveAndContinue= +tutti.createBenthosBatch.action.saveAndContinue.mnemonic= +tutti.createBenthosBatch.action.saveAndContinue.tip= tutti.createBenthosBatch.field.batchWeight= tutti.createBenthosBatch.field.batchWeight.tip= tutti.createBenthosBatch.field.sampleCategory= @@ -223,6 +229,11 @@ tutti.createSpeciesBatch.action.save= tutti.createSpeciesBatch.action.save.mnemonic= tutti.createSpeciesBatch.action.save.tip= +tutti.createSpeciesBatch.action.saveAndClose= +tutti.createSpeciesBatch.action.saveAndClose.mnemonic= +tutti.createSpeciesBatch.action.saveAndClose.tip= +tutti.createSpeciesBatch.action.saveAndContinue.mnemonic= +tutti.createSpeciesBatch.action.saveAndContinue.tip= tutti.createSpeciesBatch.field.batchWeight= tutti.createSpeciesBatch.field.batchWeight.tip= tutti.createSpeciesBatch.field.sampleCategory= 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-09-18 06:10:16 UTC (rev 1185) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-18 12:11:34 UTC (rev 1186) @@ -158,9 +158,12 @@ tutti.createBenthosBatch.action.cancel=Annuler tutti.createBenthosBatch.action.cancel.mnemonic=A tutti.createBenthosBatch.action.cancel.tip=Annuler la création du lot espèce -tutti.createBenthosBatch.action.save=Enregistrer -tutti.createBenthosBatch.action.save.mnemonic=E -tutti.createBenthosBatch.action.save.tip=Enregistrer la création du lot espèce +tutti.createBenthosBatch.action.saveAndClose=Créer et fermer +tutti.createBenthosBatch.action.saveAndClose.mnemonic=F +tutti.createBenthosBatch.action.saveAndClose.tip=Enregistrer la création du lot espèce et quitter l'écran +tutti.createBenthosBatch.action.saveAndContinue=Créer +tutti.createBenthosBatch.action.saveAndContinue.mnemonic=C +tutti.createBenthosBatch.action.saveAndContinue.tip=Enregistrer la création du lot espèce tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg) tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot (kg) tutti.createBenthosBatch.field.sampleCategory=V / HV @@ -210,9 +213,12 @@ tutti.createSpeciesBatch.action.cancel=Annuler tutti.createSpeciesBatch.action.cancel.mnemonic=A tutti.createSpeciesBatch.action.cancel.tip=Annuler la création du lot espèce -tutti.createSpeciesBatch.action.save=Enregistrer -tutti.createSpeciesBatch.action.save.mnemonic=E -tutti.createSpeciesBatch.action.save.tip=Enregistrer la création du lot espèce +tutti.createSpeciesBatch.action.saveAndClose=Créer et Fermer +tutti.createSpeciesBatch.action.saveAndClose.mnemonic=F +tutti.createSpeciesBatch.action.saveAndClose.tip=Enregistrer la création du lot espèce et fermer l'écran +tutti.createSpeciesBatch.action.saveAndContinue=Créer +tutti.createSpeciesBatch.action.saveAndContinue.mnemonic=C +tutti.createSpeciesBatch.action.saveAndContinue.tip=Enregistrer la création du lot espèce tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) tutti.createSpeciesBatch.field.batchWeight.tip=Poids du lot (non obligatoire à ce stade) tutti.createSpeciesBatch.field.sampleCategory=V / HV

1 0

r1185 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch tutti-persistence/src/main/resources/i18n tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 08:10:16 +0200 (Wed, 18 Sep 2013) New Revision: 1185 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1185 Log: fixes #3265: [TRAIT] V?\195?\169rifier que l'ordre de saisie des captures est bien celui de la configuration de cat?\195?\169gorisation Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2013-09-18 05:20:33 UTC (rev 1184) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2013-09-18 06:10:16 UTC (rev 1185) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.service.CatchBatchPersistenceService; @@ -94,12 +95,31 @@ List<CatchBatchValidationError> errors = Lists.newArrayList(); + Integer[] categoryIds = + sampleCategoryModel.getSamplingOrder().toArray(new Integer[sampleCategoryModel.getSamplingOrder().size()]); + for (SpeciesBatch speciesBatch : species.getChildren()) { - validateBatch(sampleCategoryModel, - errors, - speciesBatch, - n_("tutti.persistence.batch.validation.invalid.species.sampleCategoryId")); + // check all sample categories are accepted + validateSampleCategoriesUniverse( + sampleCategoryModel, + errors, + speciesBatch, + n_("tutti.persistence.batch.validation.invalid.species.sampleCategoryId")); + + + if (errors.isEmpty()) { + + // check sample categories order is ok + + validateSampleCategoriesOrder( + sampleCategoryModel, + errors, + speciesBatch, + categoryIds, + 0, + n_("tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order")); + } } return errors; } @@ -110,12 +130,30 @@ List<CatchBatchValidationError> errors = Lists.newArrayList(); + Integer[] categoryIds = + sampleCategoryModel.getSamplingOrder().toArray(new Integer[sampleCategoryModel.getSamplingOrder().size()]); + for (BenthosBatch benthosBatch : benthos.getChildren()) { - validateBatch(sampleCategoryModel, - errors, - benthosBatch, - n_("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId")); + // check all sample categories are accepted + validateSampleCategoriesUniverse( + sampleCategoryModel, + errors, + benthosBatch, + n_("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId")); + + if (errors.isEmpty()) { + + // check sample categories order is ok + + validateSampleCategoriesOrder( + sampleCategoryModel, + errors, + benthosBatch, + categoryIds, + 0, + n_("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order")); + } } return errors; } @@ -287,16 +325,17 @@ } } - protected void validateBatch(SampleCategoryModel sampleCategoryModel, - List<CatchBatchValidationError> errors, - SpeciesAbleBatch aBatch, - String messageKey) { + protected void validateSampleCategoriesUniverse(SampleCategoryModel sampleCategoryModel, + List<CatchBatchValidationError> errors, + SpeciesAbleBatch aBatch, + String messageKey) { Integer sampleCategoryId = aBatch.getSampleCategoryId(); if (!sampleCategoryModel.containsCategoryId(sampleCategoryId)) { // invalid sample category id + addError(errors, messageKey, aBatch.getId(), @@ -308,14 +347,59 @@ for (SpeciesAbleBatch speciesAbleBatch : aBatch.getChildBatchs()) { - validateBatch(sampleCategoryModel, - errors, - speciesAbleBatch, - messageKey); + validateSampleCategoriesUniverse(sampleCategoryModel, + errors, + speciesAbleBatch, + messageKey); } } } + protected void validateSampleCategoriesOrder(SampleCategoryModel sampleCategoryModel, + List<CatchBatchValidationError> errors, + SpeciesAbleBatch aBatch, + Integer[] categoryIds, + int level, + String messageKey) { + + Integer sampleCategoryId = aBatch.getSampleCategoryId(); + + Integer exceptedCategoryId = categoryIds[level]; + + + if (!exceptedCategoryId.equals(sampleCategoryId)) { + + // bad sample category id + + SampleCategoryModelEntry actualCategory = sampleCategoryModel.getCategoryById(sampleCategoryId); + SampleCategoryModelEntry exceptedCategory = sampleCategoryModel.getCategoryById(exceptedCategoryId); + + addError(errors, + messageKey, + aBatch.getId(), + aBatch.getSpecies().getName(), + actualCategory.getLabel(), + exceptedCategory.getLabel()); + + // no need to continue, we got a bad order + return; + } + + if (!aBatch.isChildBatchsEmpty()) { + + for (SpeciesAbleBatch speciesAbleBatch : aBatch.getChildBatchs()) { + + validateSampleCategoriesOrder( + sampleCategoryModel, + errors, + speciesAbleBatch, + categoryIds, + level + 1, + messageKey); + } + } + } + protected void addError(List<CatchBatchValidationError> errors, String messageKey) { CatchBatchValidationError error = new CatchBatchValidationError( Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-09-18 05:20:33 UTC (rev 1184) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-09-18 06:10:16 UTC (rev 1185) @@ -27,7 +27,9 @@ tutti.persistence.batch.validation.horsVracNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound= tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId= +tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order= tutti.persistence.batch.validation.invalid.species.sampleCategoryId= +tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order= tutti.persistence.batch.validation.unkonwn.taxon= tutti.persistence.batch.validation.unsortedNotFound= tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-09-18 05:20:33 UTC (rev 1184) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-09-18 06:10:16 UTC (rev 1185) @@ -26,8 +26,10 @@ tutti.persistence.batch.validation.horsVracMarineLitterNotFound=Lot 'Hors Vrac > Macro-déchet' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracNotFound=Lot 'Hors Vrac' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracSpeciesNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. -tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId=Le lot benthos %s (espèce %s) utilise une caractéristique (id %s) de catégorisation non reconnue -tutti.persistence.batch.validation.invalid.species.sampleCategoryId=Le lot espèce %s (espèce %s) utilise une caractéristique (id %s) de catégorisation non reconnue +tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId=Le lot benthos %s (espèce %s) utilise une catégorie (id %s) non reconnue +tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order=Le lot benthos %s (espèce %s) ne respecte pas l'ordre des catégories, utilisation de la catégorie %s au lieu de %s +tutti.persistence.batch.validation.invalid.species.sampleCategoryId=Le lot espèce %s (espèce %s) utilise une catégorise (id %s) non reconnue +tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order=Le lot espèce %s (espèce %s) ne respecte pas l'ordre des catégories, utilisation de la catégorie %s au lieu de %s tutti.persistence.batch.validation.unkonwn.taxon=Le lot (%s) utilise une espèce de code inconnu (%s). tutti.persistence.batch.validation.unsortedNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound=Lot 'Vrac > Benthos > Vivant Trié' non trouvé, ou configuré avec d'autres critères de classement. 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-09-18 05:20:33 UTC (rev 1184) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-18 06:10:16 UTC (rev 1185) @@ -989,7 +989,7 @@ tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s) tutti.fishingOperations.title.validate.operations=Validation des opérations de pêches (%s) -tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel=L'arbre d’échantillonnage n'est pas compatible (utilisation de catégories non configurées). Les captures ne seront pas visibles. +tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel=L'arbre d’échantillonnage n'est pas compatible (utilisation de catégories non configurées ou dans un mauvais ordre). Les captures ne seront pas visibles. tutti.fishingOperations.warn.catchBatch.notFound=Pas d'arbre d’échantillonnage associé à l'opération de pêche. tutti.fishingOperations.warn.invalid.batch.model=L'arbre d’échantillonnage n'est pas compatible. Les captures ne seront pas visibles. tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier %s.

1 0

r1184 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/split species/split
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 07:20:33 +0200 (Wed, 18 Sep 2013) New Revision: 1184 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1184 Log: refs #3266: [MENSURATION] Ne pas conserver les id des cat?\195?\169gories dans la barre de rappel 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/split/SplitBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.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-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -300,19 +300,11 @@ setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_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.editSpeciesFrequencies.title")); - ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), + _("tutti.editSpeciesFrequencies.title")); + ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title); } public void splitSpeciesBatch(SpeciesBatchRowModel editRow, @@ -324,19 +316,11 @@ 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()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), + _("tutti.splitSpeciesBatch.title")); + ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title); } public void setSpeciesSelectedCard(String card) { @@ -389,22 +373,14 @@ setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_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.editBenthosFrequencies.title")); - ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getBenthosTabFishingOperationReminderLabel().getTitle(), + _("tutti.editBenthosFrequencies.title")); + ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title); } - public void splitBenthosBAtch(BenthosBatchRowModel editRow, + public void splitBenthosBatch(BenthosBatchRowModel editRow, SplitBenthosBatchUI splitBatchEditor) { @@ -414,19 +390,11 @@ 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()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getBenthosTabFishingOperationReminderLabel().getTitle(), + _("tutti.splitBenthosBatch.title")); + ui.getBenthosTabSplitBatchReminderLabel().setTitle(title); } public void setBenthosSelectedCard(String card) { @@ -456,7 +424,7 @@ } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); - + } if (tuttiUi != null) { @@ -585,4 +553,22 @@ } } + protected String buildReminderLabelTitle(Species species, + Iterable<SampleCategory<?>> categories, + String prefix, + String suffix) { + StringBuilder title = new StringBuilder(prefix); + + title.append(" - [").append(decorate(species)).append("]"); + + for (SampleCategory<?> sampleCategory : categories) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(suffix); + return title.toString(); + } } \ No newline at end of file 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-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -722,7 +722,7 @@ // splitBatchEditor.getHandler().editBatch(parentBatch); // parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); - parent.getHandler().splitBenthosBAtch(parentBatch, splitBatchEditor); + parent.getHandler().splitBenthosBatch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-09-18 05:20:33 UTC (rev 1184) @@ -41,19 +41,6 @@ selectedItem: {model.getSelectedCategory()}; } -#speciesLabel { - text: "tutti.splitBenthosBatch.field.species"; - toolTipText: "tutti.splitBenthosBatch.field.speciesField.tip"; - labelFor: {speciesField}; - _help: {"tutti.splitBenthosBatch.field.speciesField.help"}; -} - -#speciesField { - editable: false; - enabled: false; - text: {handler.decorateSpecies(model.getSpecies())}; -} - #batchWeightLabel { text: "tutti.splitBenthosBatch.field.batchWeight"; toolTipText: "tutti.splitBenthosBatch.field.batchWeightField.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-09-18 05:20:33 UTC (rev 1184) @@ -88,16 +88,6 @@ </cell> </row> -  - <row> - <cell anchor='west'> - <JLabel id='speciesLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesField'/> - </cell> - </row> -  <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -245,11 +245,6 @@ //-- Public methods --// //------------------------------------------------------------------------// - public String decorateSpecies(Species object) { - String result = object == null ? "" : super.decorate(object); - return result; - } - public void editBatch(BenthosBatchRowModel batch) { // get possible the last used Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -26,7 +26,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -45,8 +44,6 @@ public static final String PROPERTY_CATEGORY = "category"; - public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SELECTED_CATEGORY = "selectedCategory"; public static final String PROPERTY_BATCH_WEIGHT = "batchWeight"; @@ -93,17 +90,12 @@ } public void setBatch(BenthosBatchRowModel batch) { - Object oldSpecies = getSpecies(); + Object oldWeight = getBatchWeight(); this.batch = batch; - firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); - firePropertyChange(PROPERTY_BATCH_WEIGHT, null, getBatchWeight()); + firePropertyChange(PROPERTY_BATCH_WEIGHT, oldWeight, getBatchWeight()); } - public Species getSpecies() { - return batch == null ? null : batch.getSpecies(); - } - public List<SampleCategoryModelEntry> getCategory() { return category; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-09-18 05:20:33 UTC (rev 1184) @@ -41,19 +41,6 @@ selectedItem: {model.getSelectedCategory()}; } -#speciesLabel { - text: "tutti.splitSpeciesBatch.field.species"; - toolTipText: "tutti.splitSpeciesBatch.field.speciesField.tip"; - labelFor: {speciesField}; - _help: {"tutti.splitSpeciesBatch.field.speciesField.help"}; -} - -#speciesField { - editable: false; - enabled: false; - text: {handler.decorateSpecies(model.getSpecies())}; -} - #batchWeightLabel { text: "tutti.splitSpeciesBatch.field.batchWeight"; toolTipText: "tutti.splitSpeciesBatch.field.batchWeightField.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-09-18 05:20:33 UTC (rev 1184) @@ -88,16 +88,6 @@ </cell> </row> -  - <row> - <cell anchor='west'> - <JLabel id='speciesLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesField'/> - </cell> - </row> -  <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -45,7 +45,7 @@ public static final String PROPERTY_CATEGORY = "category"; - public static final String PROPERTY_SPECIES = "species"; +// public static final String PROPERTY_SPECIES = "species"; public static final String PROPERTY_SELECTED_CATEGORY = "selectedCategory"; @@ -93,17 +93,17 @@ } public void setBatch(SpeciesBatchRowModel batch) { - Object oldSpecies = getSpecies(); +// Object oldSpecies = getSpecies(); Object oldWeight = getBatchWeight(); this.batch = batch; - firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); +// firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); firePropertyChange(PROPERTY_BATCH_WEIGHT, oldWeight, getBatchWeight()); } - public Species getSpecies() { - return batch == null ? null : batch.getSpecies(); - } +// public Species getSpecies() { +// return batch == null ? null : batch.getSpecies(); +// } public List<SampleCategoryModelEntry> getCategory() { return category;

1 0

r1183 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/resources tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 07:02:30 +0200 (Wed, 18 Sep 2013) New Revision: 1183 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1183 Log: refs #3266: [MENSURATION] Ne pas conserver les id des cat?\195?\169gories dans la barre de rappel Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-09-18 04:27:31 UTC (rev 1182) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-09-18 05:02:30 UTC (rev 1183) @@ -878,7 +878,8 @@ CaracteristicQualitativeValue target2 = TuttiBeanFactory.newCaracteristicQualitativeValue(); target2.setId(String.valueOf(source2[0])); target2.setName(String.valueOf(source2[1])); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source2[2], target2); + target2.setDescription(String.valueOf(source2[2])); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source2[3], target2); values.add(target2); } result.setQualitativeValue(Collections.unmodifiableList(values)); Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-09-18 04:27:31 UTC (rev 1182) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-09-18 05:02:30 UTC (rev 1183) @@ -549,7 +549,8 @@ <![CDATA[ SELECT qv.id AS id, - case when (qv.description is null or qv.name = qv.description) then qv.name else concat(qv.name, ' - ', qv.description) end AS name, + qv.name, + case when (qv.description is null) then qv.name else qv.description end AS description, qv.status AS status FROM PmfmImpl p JOIN p.qualitativeValues qv Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-09-18 04:27:31 UTC (rev 1182) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-09-18 05:02:30 UTC (rev 1183) @@ -33,7 +33,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -106,7 +105,8 @@ registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); - registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); +// registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); + registerTuttiDecorator(CaracteristicQualitativeValue.class, "${description}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesReferenceTaxonId}", SEPARATOR, " - "); registerTuttiDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(LabelAware.class, "${label}$s", SEPARATOR, " - ");

1 0

r1182 - trunk
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 06:27:31 +0200 (Wed, 18 Sep 2013) New Revision: 1182 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1182 Log: fixes #3269: Updates mavenpom to 4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-18 04:26:49 UTC (rev 1181) +++ trunk/pom.xml 2013-09-18 04:27:31 UTC (rev 1182) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.0</version> + <version>4.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1181 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action
by tchemit＠users.forge.codelutin.com 18 Sep '13

18 Sep '13

Author: tchemit Date: 2013-09-18 06:26:49 +0200 (Wed, 18 Sep 2013) New Revision: 1181 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1181 Log: fixes #3263: [ERGO] Barre de progression trop longue Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-17 21:31:34 UTC (rev 1180) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-09-18 04:26:49 UTC (rev 1181) @@ -259,13 +259,15 @@ } protected void setSize(MainUI mainUI) { - Container component = mainUI.getBody(); - int width = component == null ? 0 : component.getWidth(); + // Better to let his own size to the action progress bar + // see http://forge.codelutin.com/issues/3263 +// Container component = mainUI.getBody(); +// int width = component == null ? 0 : component.getWidth(); ui.pack(); - if (width != 0 && ui.getWidth() < width) { - ui.setSize(width, ui.getHeight()); - } +// if (width != 0 && ui.getWidth() < width) { +// ui.setSize(width, ui.getHeight()); +// } } }

1 0

r1180 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit＠users.forge.codelutin.com 17 Sep '13

17 Sep '13

Author: tchemit Date: 2013-09-17 23:31:34 +0200 (Tue, 17 Sep 2013) New Revision: 1180 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1180 Log: fixes #2881: suite Evolution #2460, oui on peut suprimer une esp?\195?\168ce dans le protocole via clic droit mais la ligne se d?\195?\169s?\195?\169lectionne donc on ne sais pas ce que l'on va supprimer Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-09-17 21:21:22 UTC (rev 1179) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-09-17 21:31:34 UTC (rev 1180) @@ -90,7 +90,7 @@ #speciesTable { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; + /*selectionBackground: {null};*/ selectionForeground: {Color.BLACK}; sortable: false; _help: {"tutti.editProtocol.field.species.help"}; @@ -108,7 +108,7 @@ #benthosTable { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; + /*selectionBackground: {null};*/ selectionForeground: {Color.BLACK}; sortable: false; _help: {"tutti.editProtocol.field.benthos.help"};

1 0

r1179 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/frequency species species/frequency
by tchemit＠users.forge.codelutin.com 17 Sep '13

17 Sep '13

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) {

1 0

r1178 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create resources/i18n
by tchemit＠users.forge.codelutin.com 17 Sep '13

17 Sep '13

Author: tchemit Date: 2013-09-17 23:02:26 +0200 (Tue, 17 Sep 2013) New Revision: 1178 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1178 Log: fixes #3264: [ESPECE] Sur l'?\195?\169cran de cr?\195?\169ation d'un lot, libell?\195?\169 manquant + hors-vrac s?\195?\169lectionn?\195?\169 au lieu de vrac Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.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/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -78,7 +79,18 @@ SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - sortedValue = caracteristic.getCaracteristic().getQualitativeValue(0); + Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); + sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -117,8 +129,8 @@ (CreateBenthosBatchUIModel) evt.getSource(); Species newValue = (Species) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New Selected species " + (newValue == null ? null : newValue.getRefTaxCode())); + if (log.isDebugEnabled()) { + log.debug("New Selected species " + (newValue == null ? null : decorate(newValue))); } if (newValue == null || source.getSpeciesUsed() == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -78,7 +79,18 @@ SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - sortedValue = caracteristic.getCaracteristic().getQualitativeValue(0); + Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue,"Could not found vrac qualitative value"); + sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -117,8 +129,8 @@ (CreateSpeciesBatchUIModel) evt.getSource(); Species newValue = (Species) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New Selected species " + (newValue == null ? null : newValue.getRefTaxCode())); + if (log.isDebugEnabled()) { + log.debug("New Selected species " + (newValue == null ? null : decorate(newValue))); } if (newValue == null || source.getSpeciesUsed() == null) { 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-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 21:02:26 UTC (rev 1178) @@ -163,8 +163,8 @@ tutti.createBenthosBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg) tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot (kg) -tutti.createBenthosBatch.field.sampleCategory= -tutti.createBenthosBatch.field.sampleCategory.tip= +tutti.createBenthosBatch.field.sampleCategory=V / HV +tutti.createBenthosBatch.field.sampleCategory.tip=Catégorie Vrac / Hors Vrac tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot @@ -215,8 +215,8 @@ tutti.createSpeciesBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) tutti.createSpeciesBatch.field.batchWeight.tip=Poids du lot (non obligatoire à ce stade) -tutti.createSpeciesBatch.field.sampleCategory= -tutti.createSpeciesBatch.field.sampleCategory.tip= +tutti.createSpeciesBatch.field.sampleCategory=V / HV +tutti.createSpeciesBatch.field.sampleCategory.tip=Catégorie Vrac / Hors Vrac tutti.createSpeciesBatch.field.species=Espèce du lot tutti.createSpeciesBatch.field.species.tip=Code campagne ou Code Rubin – Nom scientifique du lot à créer tutti.createSpeciesBatch.title=Créer un lot @@ -407,8 +407,6 @@ tutti.editBenthosFrequencies.action.save=Enregistrer tutti.editBenthosFrequencies.action.save.mnemonic=E tutti.editBenthosFrequencies.action.save.tip=Enregistrer les mensurations -tutti.editBenthosFrequencies.batchCategory=Catégorie -tutti.editBenthosFrequencies.batchSpecies=Espèce tutti.editBenthosFrequencies.error.length.doublon=La classe de taille %s est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne %s), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus @@ -928,8 +926,6 @@ tutti.editSpeciesFrequencies.action.save=Enregistrer tutti.editSpeciesFrequencies.action.save.mnemonic=E tutti.editSpeciesFrequencies.action.save.tip=Enregistrer les mensurations -tutti.editSpeciesFrequencies.batchCategory=Catégorie -tutti.editSpeciesFrequencies.batchSpecies=Espèce tutti.editSpeciesFrequencies.error.length.doublon=La classe de taille %s est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne %s), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus

1 0

[ANN] - Tutti 2.4 released
by forge.codelutin.com Release Notification 17 Sep '13

17 Sep '13

The Tutti team is pleased to announce the tutti-2.4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o Amélioration de la barre de progression des actions Issue: 3104. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Faciliter l'import d'une nouvelle base Issue: 3106. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Utiliser deux fichiers de configuration pour les mises à jour (applicatif / base de données) Issue: 3259. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] - Prise en compte de nouvelles catégories dans l'applicatif Issue: 2889. Thanks to Tony Chemit. Resolved by tchemit. o [MENSURATION] manque information sur l'espèce en cours de saisie Issue: 3213. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [MENSURATION] problèmes en mode génération de classe Issue: 2895. Thanks to Vincent BADTS. Resolved by vbadts. o [IMPORT-EXPORT MULTIPOSTE] Problème de transaction lors d'une erreur Issue: 3004. Thanks to Tony Chemit. Resolved by tchemit. o [RAPPORT] erreur poids total trié Issue: 2901. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] - Vérification de la version utilisée par rapport à la BDD Issue: 2890. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] changer nom d'un champ et écriture Male Issue: 2905. Thanks to Vincent BADTS. Resolved by tchemit. o Mise à jour jre en 1.7u40 Issue: 3219. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0