Author: kmorin Date: 2013-05-17 15:38:02 +0200 (Fri, 17 May 2013) New Revision: 960 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/960 Log: fixes #2435 [MENSURATIONS] manque information sur l'esp?\195?\168ce en cours de saisie 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/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 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/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.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/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-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) @@ -279,10 +279,6 @@ } public void setSpeciesSelectedCard(String card) { - setSpeciesSelectedCard(card, null); - } - - public void setSpeciesSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -319,17 +315,13 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); + titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } } } } public void setBenthosSelectedCard(String card) { - setBenthosSelectedCard(card, null); - } - - public void setBenthosSelectedCard(String card, Species editingSpecies) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); if (!card.equals(layout.getSelected())) { @@ -366,7 +358,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies))); + titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } } } 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-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-17 13:38:02 UTC (rev 960) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); + 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/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,26 @@ _help: {"tutti.editBenthosFrequencies.help"}; } +#batchSpeciesLabel { + text: "tutti.editBenthosFrequencies.batchSpecies"; +} + +#batchSpecies { + text: { handler.decorateSpecies(model.getBatch()) }; + editable: false; + enabled: false; +} + +#batchCategoryLabel { + text: "tutti.editBenthosFrequencies.batchCategory"; +} + +#batchCategory { + text: { handler.decorateCategory(model.getBatch()) }; + editable: false; + enabled: false; +} + #stepLabel { text: "tutti.editBenthosFrequencies.field.step"; toolTipText: "tutti.editBenthosFrequencies.field.step.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-17 13:38:02 UTC (rev 960) @@ -89,6 +89,30 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> + <Table constraints='BorderLayout.NORTH' fill='both'> + <row> + <cell anchor='west'> + <JLabel id='batchSpeciesLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchSpecies'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='batchCategoryLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchCategory'/> + </cell> + </row> + <row> + <cell columns='2'> + <JSeparator/> + </cell> + </row> + </Table> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) @@ -49,8 +49,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JComponent; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -532,6 +531,15 @@ closeUI(ui); } + public String decorateSpecies(BenthosBatchRowModel object) { + return object == null ? "" : decorate(object.getSpecies()); + } + + public String decorateCategory(BenthosBatchRowModel object) { + return object == null ? "" : + decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,8 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_BATCH = "batch"; + public static final String PROPERTY_CONFIGURATION_MODE = "configurationMode"; public static final String PROPERTY_STEP = "step"; @@ -212,6 +214,7 @@ public void setBatch(BenthosBatchRowModel batch) { this.batch = batch; + firePropertyChange(PROPERTY_BATCH, null, batch); } public float getLengthStep(float lengthStep) { 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-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-17 13:38:02 UTC (rev 960) @@ -164,7 +164,7 @@ frequencyEditor.getHandler().editBatch(editRow, this); // open frequency editor - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies()); + parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-17 13:38:02 UTC (rev 960) @@ -37,6 +37,26 @@ _help: {"tutti.editSpeciesFrequencies.help"}; } +#batchSpeciesLabel { + text: "tutti.editSpeciesFrequencies.batchSpecies"; +} + +#batchSpecies { + text: { handler.decorateSpecies(model.getBatch()) }; + editable: false; + enabled: false; +} + +#batchCategoryLabel { + text: "tutti.editSpeciesFrequencies.batchCategory"; +} + +#batchCategory { + text: { handler.decorateCategory(model.getBatch()) }; + editable: false; + enabled: false; +} + #stepLabel { text: "tutti.editSpeciesFrequencies.field.step"; toolTipText: "tutti.editSpeciesFrequencies.field.step.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-17 13:38:02 UTC (rev 960) @@ -89,6 +89,30 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> + <Table constraints='BorderLayout.NORTH' fill='both'> + <row> + <cell anchor='west'> + <JLabel id='batchSpeciesLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchSpecies'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='batchCategoryLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='batchCategory'/> + </cell> + </row> + <row> + <cell columns='2'> + <JSeparator/> + </cell> + </row> + </Table> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-17 13:38:02 UTC (rev 960) @@ -29,6 +29,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -533,6 +534,15 @@ closeUI(ui); } + public String decorateSpecies(SpeciesBatchRowModel object) { + return object == null ? "" : decorate(object.getSpecies()); + } + + public String decorateCategory(SpeciesBatchRowModel object) { + return object == null ? "" : + decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-17 13:38:02 UTC (rev 960) @@ -38,6 +38,8 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_BATCH = "batch"; + public static final String PROPERTY_CONFIGURATION_MODE = "configurationMode"; public static final String PROPERTY_STEP = "step"; @@ -213,6 +215,7 @@ public void setBatch(SpeciesBatchRowModel batch) { this.batch = batch; + firePropertyChange(PROPERTY_BATCH, null, batch); } public float getLengthStep(float lengthStep) { 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-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-17 13:38:02 UTC (rev 960) @@ -382,6 +382,8 @@ tutti.editBenthosFrequencies.action.save= tutti.editBenthosFrequencies.action.save.mnemonic= tutti.editBenthosFrequencies.action.save.tip= +tutti.editBenthosFrequencies.batchCategory= +tutti.editBenthosFrequencies.batchSpecies= tutti.editBenthosFrequencies.field.lengthStepCaracteristic= tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip= tutti.editBenthosFrequencies.field.maxStep= @@ -899,6 +901,9 @@ tutti.editSpeciesFrequencies.action.save= tutti.editSpeciesFrequencies.action.save.mnemonic= tutti.editSpeciesFrequencies.action.save.tip= +tutti.editSpeciesFrequencies.batchCategory= +tutti.editSpeciesFrequencies.batchCategoryValue= +tutti.editSpeciesFrequencies.batchSpecies= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= tutti.editSpeciesFrequencies.field.maxStep= 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-05-17 12:54:48 UTC (rev 959) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-17 13:38:02 UTC (rev 960) @@ -376,6 +376,8 @@ 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.field.lengthStepCaracteristic=Type de mesure tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editBenthosFrequencies.field.maxStep=Classe max @@ -398,7 +400,7 @@ tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) tutti.editBenthosFrequencies.label.no.configuration=< Pas de configuration > tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. -tutti.editBenthosFrequencies.title=%s - Mensuration +tutti.editBenthosFrequencies.title=Mensuration tutti.editCaracteristics.title=Autres caractéristiques tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R @@ -864,6 +866,8 @@ 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.field.lengthStepCaracteristic=Type de mesure tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus tutti.editSpeciesFrequencies.field.maxStep=Classe max @@ -889,7 +893,7 @@ tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) -tutti.editSpeciesFrequencies.title=%s - Mensuration +tutti.editSpeciesFrequencies.title=Mensuration tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur