[Tutti-commits] r1187 - in trunk/tutti-ui-swing/src/main: filtered-resources help/fr java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create java/fr/ifremer/tutti/ui/swing/content/operation/catches/species java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create resources/i18n

18 Sep 2013

Author: tchemit
Date: 2013-09-18 14:38:56 +0200 (Wed, 18 Sep 2013)
New Revision: 1187

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

Log:
fixes #3279: [CAPTURE] pouvoir saisir aussi le nombre d?\195?\168s la cr?\195?\169ation d'un lot + ajout doc

Added:
   trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html
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/help/fr/editCruise.html
   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/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/benthos/create/CreateBenthosBatchUIModel.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/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/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties	2013-09-18 12:38:56 UTC (rev 1187)
@@ -1,5 +1,5 @@
 #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Wed Sep 18 13:39:38 CEST 2013
+#Wed Sep 18 14:22:16 CEST 2013
 tutti.config.help=config.html
 tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -12,9 +12,9 @@
 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=
 tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions
 tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions
+tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields
 tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields
 tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields
 tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields
@@ -36,11 +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=
 tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions
 tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions
+tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields
 tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields
-tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotActions
+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
@@ -50,7 +50,7 @@
 tutti.dbManager.action.importDb.help=dbManager.html\#actions
 tutti.dbManager.action.installDb.help=dbManager.html\#actions
 tutti.dbManager.action.openDb.help=dbManager.html\#actions
-tutti.dbManager.action.reinstallDb.help=
+tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions
 tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions
 tutti.dbManager.help=dbManager.html
 tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -211,13 +211,13 @@
 tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.help=editProtocol.html
 tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics
-tutti.editSampleCategoryModel.action.cancel.help=
-tutti.editSampleCategoryModel.action.close.help=
-tutti.editSampleCategoryModel.action.moveDownEntry.help=
-tutti.editSampleCategoryModel.action.moveUpEntry.help=
-tutti.editSampleCategoryModel.action.removeEntry.help=
-tutti.editSampleCategoryModel.action.save.help=
-tutti.editSampleCategoryModel.help=
+tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.help=editSampleCategory.html
 tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions
@@ -261,7 +261,7 @@
 tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide
 tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide
 tutti.main.action.showHelp.help=menu.html\#menu_aide
-tutti.main.help=menu.html\#menu_aide
+tutti.main.help=index.html
 tutti.main.menu.action.about.help=menu.html\#menu_aide
 tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide
 tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties	2013-09-18 12:38:56 UTC (rev 1187)
@@ -1,5 +1,5 @@
 #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Wed Sep 18 13:39:38 CEST 2013
+#Wed Sep 18 14:22:16 CEST 2013
 tutti.config.help=config.html
 tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions
 tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -12,11 +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.saveAndClose.help=
-tutti.createBenthosBatch.action.saveAndContinue.help=
+tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions
+tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions
+tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields
 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
@@ -36,9 +36,9 @@
 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=
 tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions
 tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions
+tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields
 tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields
 tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields
 tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields
@@ -50,7 +50,7 @@
 tutti.dbManager.action.importDb.help=dbManager.html\#actions
 tutti.dbManager.action.installDb.help=dbManager.html\#actions
 tutti.dbManager.action.openDb.help=dbManager.html\#actions
-tutti.dbManager.action.reinstallDb.help=
+tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions
 tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions
 tutti.dbManager.help=dbManager.html
 tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions
@@ -211,13 +211,13 @@
 tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics
 tutti.editProtocol.help=editProtocol.html
 tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics
-tutti.editSampleCategoryModel.action.cancel.help=
-tutti.editSampleCategoryModel.action.close.help=
-tutti.editSampleCategoryModel.action.moveDownEntry.help=
-tutti.editSampleCategoryModel.action.moveUpEntry.help=
-tutti.editSampleCategoryModel.action.removeEntry.help=
-tutti.editSampleCategoryModel.action.save.help=
-tutti.editSampleCategoryModel.help=
+tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html#actions
+tutti.editSampleCategoryModel.help=editSampleCategory.html
 tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions
 tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions

Modified: trunk/tutti-ui-swing/src/main/help/fr/editCruise.html
===================================================================
--- trunk/tutti-ui-swing/src/main/help/fr/editCruise.html	2013-09-18 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/help/fr/editCruise.html	2013-09-18 12:38:56 UTC (rev 1187)
@@ -93,6 +93,6 @@
         <dt>Enregistrer</dt>
         <dd>enregistre les modifications faites dans les différents champs.</dd>
     </dl>
-
+</div>
 </body>
 </html>
\ No newline at end of file

Added: trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html
===================================================================
--- trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html	                        (rev 0)
+++ trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html	2013-09-18 12:38:56 UTC (rev 1187)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+<head>
+    <meta charset="utf-8"/>
+    <title>Tutti - Créer / Éditer une campagne</title>
+    <link href="../css/bootstrap.min.css" rel="stylesheet">
+    <link href="../css/style.css" rel="stylesheet">
+    <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script>
+    <script type="text/javascript" src="../js/bootstrap.min.js"></script>
+</head>
+<body>
+
+<script type="text/javascript" src="../js/navbar.js"></script>
+
+<div class="container">
+    <div class="page-header">
+        <h1>Configurer les catégories</h1>
+    </div>
+
+    <p>Sur cet écran, on peut configuer les catégories à utiliser dans l'écran Espèces / Benthos.</p>
+
+    <h2>Description des champs<a name="fields"></a></h2>
+    TODO
+
+    <h2>Description des actions<a name="actions"></a></h2>
+    <dl>
+        <dt>Fermer</dt>
+        <dd>ferme l'écran.</dd>
+        <dt>Enregistrer</dt>
+        <dd>enregistre les modifications.</dd>
+    </dl>
+</div>
+</body>
+</html>
\ No newline at end of file


Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editSampleCategory.html
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -631,19 +631,20 @@
         parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.CREATE_BATCH_CARD);
     }
 
-    public void addBatch(CreateBenthosBatchUIModel bethosBatchRootRowModel) {
-        if (bethosBatchRootRowModel.isValid()) {
+    public void addBatch(CreateBenthosBatchUIModel batchRootRowModel) {
+        if (batchRootRowModel.isValid()) {
 
             BenthosBatchTableModel tableModel = getTableModel();
 
             BenthosBatchRowModel newRow = tableModel.createNewRow();
-            Species species = bethosBatchRootRowModel.getSpecies();
+            Species species = batchRootRowModel.getSpecies();
             newRow.setSpecies(species);
+            newRow.setNumber(batchRootRowModel.getBatchCount());
 
-            CaracteristicQualitativeValue sampleCategory = bethosBatchRootRowModel.getSampleCategory();
+            CaracteristicQualitativeValue sampleCategory = batchRootRowModel.getSampleCategory();
             SampleCategory category = newRow.getFirstSampleCategory();
             category.setCategoryValue(sampleCategory);
-            category.setCategoryWeight(bethosBatchRootRowModel.getBatchWeight());
+            category.setCategoryWeight(batchRootRowModel.getBatchWeight());
             newRow.setSampleCategory(category);
 
             recomputeRowValidState(newRow);

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css	2013-09-18 12:38:56 UTC (rev 1187)
@@ -78,6 +78,21 @@
   bean: {model};
 }
 
+#batchCountLabel {
+  text: "tutti.createBenthosBatch.field.batchCount";
+  toolTipText: "tutti.createBenthosBatch.field.batchCount.tip";
+  labelFor: {batchCountField};
+  _help: {"tutti.createBenthosBatch.field.batchCount.help"};
+}
+
+#batchCountField {
+  property: batchCount;
+  model: {model.getBatchCount()};
+  useFloat: true;
+  numberPattern: {INT_6_DIGITS_PATTERN};
+  bean: {model};
+}
+
 #addSpeciesButton {
   text: "tutti.createBenthosBatch.action.addSpecies";
   toolTipText: "tutti.createBenthosBatch.action.addSpecies.tip";

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx	2013-09-18 12:38:56 UTC (rev 1187)
@@ -99,6 +99,16 @@
       </cell>
     </row>
 
+    <!-- Species batch count -->
+    <row>
+      <cell anchor='west'>
+        <JLabel id='batchCountLabel'/>
+      </cell>
+      <cell weightx='1.0' columns='2'>
+        <NumberEditor id='batchCountField' constructorParams='this'/>
+      </cell>
+    </row>
+
     <!-- Sorted / Unsorted Category -->
     <row>
       <cell anchor='west'>

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -218,6 +218,7 @@
         model.setSpecies(null);
         model.setSampleCategory(null);
         model.setBatchWeight(null);
+        model.setBatchCount(null);
 
         List<Species> speciesToUse = Lists.newArrayList();
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java	2013-09-18 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -55,6 +55,8 @@
 
     public static final String PROPERTY_BATCH_WEIGHT = "batchWeight";
 
+    public static final String PROPERTY_BATCH_COUNT = "batchCount";
+
     /**
      * All available species (sets by protocol).
      *
@@ -77,13 +79,20 @@
     protected CaracteristicQualitativeValue sampleCategory;
 
     /**
-     * Incoming batch weight to split.
+     * Batch weight.
      *
      * @since 0.3
      */
     protected Float batchWeight;
 
     /**
+     * Batch count.
+     *
+     * @since 0.3
+     */
+    protected Integer batchCount;
+
+    /**
      * Already used species by sample category.
      *
      * @since 0.3
@@ -141,6 +150,16 @@
         firePropertyChange(PROPERTY_BATCH_WEIGHT, oldValue, batchWeight);
     }
 
+    public Integer getBatchCount() {
+        return batchCount;
+    }
+
+    public void setBatchCount(Integer batchCount) {
+        Object oldValue = getBatchCount();
+        this.batchCount = batchCount;
+        firePropertyChange(PROPERTY_BATCH_COUNT, oldValue, batchCount);
+    }
+
     public Multimap<CaracteristicQualitativeValue, Species> getSpeciesUsed() {
         return speciesUsed;
     }

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-18 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -633,19 +633,19 @@
         parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.CREATE_BATCH_CARD);
     }
 
-    public void addBatch(CreateSpeciesBatchUIModel speciesBatchRootRowModel) {
-        if (speciesBatchRootRowModel.isValid()) {
+    public void addBatch(CreateSpeciesBatchUIModel batchRootRowModel) {
+        if (batchRootRowModel.isValid()) {
 
             SpeciesBatchTableModel tableModel = getTableModel();
 
             SpeciesBatchRowModel newRow = tableModel.createNewRow();
-            Species species = speciesBatchRootRowModel.getSpecies();
+            Species species = batchRootRowModel.getSpecies();
             newRow.setSpecies(species);
-
-            CaracteristicQualitativeValue sampleCategory = speciesBatchRootRowModel.getSampleCategory();
+            newRow.setNumber(batchRootRowModel.getBatchCount());
+            CaracteristicQualitativeValue sampleCategory = batchRootRowModel.getSampleCategory();
             SampleCategory category = newRow.getFirstSampleCategory();
             category.setCategoryValue(sampleCategory);
-            category.setCategoryWeight(speciesBatchRootRowModel.getBatchWeight());
+            category.setCategoryWeight(batchRootRowModel.getBatchWeight());
             newRow.setSampleCategory(category);
 
             recomputeRowValidState(newRow);

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css	2013-09-18 12:38:56 UTC (rev 1187)
@@ -78,6 +78,21 @@
   bean: {model};
 }
 
+#batchCountLabel {
+  text: "tutti.createSpeciesBatch.field.batchCount";
+  toolTipText: "tutti.createSpeciesBatch.field.batchCount.tip";
+  labelFor: {batchCountField};
+  _help: {"tutti.createSpeciesBatch.field.batchCount.help"};
+}
+
+#batchCountField {
+  property: batchCount;
+  model: {model.getBatchCount()};
+  useFloat: false;
+  numberPattern: {INT_6_DIGITS_PATTERN};
+  bean: {model};
+}
+
 #addSpeciesButton {
   text: "tutti.createSpeciesBatch.action.addSpecies";
   toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip";

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx	2013-09-18 12:38:56 UTC (rev 1187)
@@ -99,6 +99,16 @@
       </cell>
     </row>
 
+    <!-- Species batch count -->
+    <row>
+      <cell anchor='west'>
+        <JLabel id='batchCountLabel'/>
+      </cell>
+      <cell weightx='1.0' columns='2'>
+        <NumberEditor id='batchCountField' constructorParams='this'/>
+      </cell>
+    </row>
+
     <!-- Sample Category -->
     <row>
       <cell anchor='west'>

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -218,6 +218,7 @@
         model.setSpecies(null);
         model.setSampleCategory(null);
         model.setBatchWeight(null);
+        model.setBatchCount(null);
 
         List<Species> speciesToUse = Lists.newArrayList();
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java	2013-09-18 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java	2013-09-18 12:38:56 UTC (rev 1187)
@@ -54,6 +54,8 @@
 
     public static final String PROPERTY_BATCH_WEIGHT = "batchWeight";
 
+    public static final String PROPERTY_BATCH_COUNT = "batchCount";
+
     /**
      * All available species (sets by protocol).
      *
@@ -76,13 +78,20 @@
     protected CaracteristicQualitativeValue sampleCategory;
 
     /**
-     * Incoming batch weight to split.
+     * Batch weight.
      *
      * @since 0.3
      */
     protected Float batchWeight;
 
     /**
+     * Batch count.
+     *
+     * @since 0.3
+     */
+    protected Integer batchCount;
+
+    /**
      * Already used species by sample category.
      *
      * @since 0.3
@@ -140,6 +149,16 @@
         firePropertyChange(PROPERTY_BATCH_WEIGHT, oldValue, batchWeight);
     }
 
+    public Integer getBatchCount() {
+        return batchCount;
+    }
+
+    public void setBatchCount(Integer batchCount) {
+        Object oldValue = getBatchCount();
+        this.batchCount = batchCount;
+        firePropertyChange(PROPERTY_BATCH_COUNT, oldValue, batchCount);
+    }
+
     public Multimap<CaracteristicQualitativeValue, Species> getSpeciesUsed() {
         return speciesUsed;
     }

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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties	2013-09-18 12:38:56 UTC (rev 1187)
@@ -177,6 +177,8 @@
 tutti.createBenthosBatch.action.saveAndContinue=
 tutti.createBenthosBatch.action.saveAndContinue.mnemonic=
 tutti.createBenthosBatch.action.saveAndContinue.tip=
+tutti.createBenthosBatch.field.batchCount=
+tutti.createBenthosBatch.field.batchCount.tip=
 tutti.createBenthosBatch.field.batchWeight=
 tutti.createBenthosBatch.field.batchWeight.tip=
 tutti.createBenthosBatch.field.sampleCategory=
@@ -232,8 +234,11 @@
 tutti.createSpeciesBatch.action.saveAndClose=
 tutti.createSpeciesBatch.action.saveAndClose.mnemonic=
 tutti.createSpeciesBatch.action.saveAndClose.tip=
+tutti.createSpeciesBatch.action.saveAndContinue=
 tutti.createSpeciesBatch.action.saveAndContinue.mnemonic=
 tutti.createSpeciesBatch.action.saveAndContinue.tip=
+tutti.createSpeciesBatch.field.batchCount=
+tutti.createSpeciesBatch.field.batchCount.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 12:11:34 UTC (rev 1186)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties	2013-09-18 12:38:56 UTC (rev 1187)
@@ -164,6 +164,8 @@
 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.batchCount=Nombre
+tutti.createBenthosBatch.field.batchCount.tip=Saisir le nombre d'individus dans le lot
 tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg)
 tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot (kg)
 tutti.createBenthosBatch.field.sampleCategory=V / HV
@@ -219,6 +221,8 @@
 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.batchCount=Nombre
+tutti.createSpeciesBatch.field.batchCount.tip=Saisir le nombre d'individus dans le lot
 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

    

tchemit＠users.forge.codelutin.com