r957 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n - Tutti-commits

17 May 2013

Author: kmorin
Date: 2013-05-17 12:00:39 +0200 (Fri, 17 May 2013)
New Revision: 957

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/957

Log:
fixes #2437 [MENSURATIONS] Tutti n'enregistre pas les mesures de la derni?\195?\168re ligne
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/BenthosFrequencyTableModel.java
   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/species/frequency/SpeciesFrequencyCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.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/EditCatchesUIHandler.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java	2013-05-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -25,6 +25,7 @@
  */
 
 import com.google.common.collect.Sets;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI;
 import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler;
 import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler;
@@ -278,6 +279,10 @@
     }
 
     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())) {
@@ -314,13 +319,17 @@
                     registerValidators(tuttiUi.getHandler().getValidator());
                 }
                 if (titlePanel != null) {
-                    titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title));
+                    titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies)));
                 }
             }
         }
     }
 
     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())) {
@@ -357,7 +366,7 @@
                     registerValidators(tuttiUi.getHandler().getValidator());
                 }
                 if (titlePanel != null) {
-                    titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title));
+                    titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(editingSpecies)));
                 }
             }
         }

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-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -164,7 +164,7 @@
             frequencyEditor.getHandler().editBatch(editRow, this);
 
             // open frequency editor
-            parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+            parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies());
         }
 
         public void validateEdition(BenthosFrequencyUIModel frequencyModel) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java	2013-05-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -87,6 +87,7 @@
             }
         }
         BenthosFrequencyRowModel result = new BenthosFrequencyRowModel();
+        result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
         result.setLengthStep(defaultStep);
         result.setValid(false);
         return result;

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-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -193,7 +193,7 @@
 
             // FIXME 20130128 kmorin: the species have no technical id
             speciesProtocol = Maps.newHashMap();
-            for (SpeciesProtocol sp : protocol.getSpecies()) {
+            for (SpeciesProtocol sp : protocol.getBenthos()) {
                 speciesProtocol.put(sp.getSpeciesReferenceTaxonId(), sp);
             }
 

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-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -164,7 +164,7 @@
             frequencyEditor.getHandler().editBatch(editRow, this);
 
             // open frequency editor
-            parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+            parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD, editRow.getSpecies());
         }
 
         public void validateEdition(SpeciesFrequencyUIModel frequencyModel) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java	2013-05-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java	2013-05-17 10:00:39 UTC (rev 957)
@@ -87,6 +87,7 @@
             }
         }
         SpeciesFrequencyRowModel result = new SpeciesFrequencyRowModel();
+        result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
         result.setLengthStep(defaultStep);
         result.setValid(false);
         return result;

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-16 16:28:15 UTC (rev 956)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-05-17 10:00:39 UTC (rev 957)
@@ -398,7 +398,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=Mensuration
+tutti.editBenthosFrequencies.title=%s - Mensuration
 tutti.editCaracteristics.title=Autres caractéristiques
 tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser
 tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R
@@ -889,7 +889,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=Mensuration
+tutti.editSpeciesFrequencies.title=%s - 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

    

r957 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n

kmorin＠users.forge.codelutin.com

tags

participants (1)