r450 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/species java/fr/ifremer/tutti/ui/swing/util resources/fr/ifremer/tutti/ui/swing/content/operation - Tutti-commits

20 Feb 2013

Author: kmorin
Date: 2013-02-20 14:03:56 +0100 (Wed, 20 Feb 2013)
New Revision: 450

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

Log:
reset the computed weights

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
   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/EditCatchesUIModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java
   trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -476,6 +476,7 @@
                 ui.getHandler().getCatchBatchMonitor();
 
         EditCatchesUIModel catchesUIModel = ui.getModel();
+        catchesUIModel.reset();
 
         CatchBatch batch;
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -716,6 +716,11 @@
     public boolean isDateInCruise(Date date) {
         return DateUtil.between(date, cruise.getBeginDate(), cruise.getEndDate());
     }
+    
+    public boolean isValidDuration() {
+        int minutes = DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate);
+        return minutes <= 45 && minutes >= 20;
+    }
 
     public List<FishingOperation> getExistingOperations() {
         return existingOperations;

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -153,6 +153,8 @@
                         operation = null;
                     } else {
                         operation = persistenceService.getFishingOperation(newValue.getId());
+                        Cruise cruise = TuttiUIUtil.getCruise(context);
+                        operation.setCruise(cruise);
                     }
                     editFishingOperationAction.setFishingOperation(operation);
                     editFishingOperationAction.actionPerformed(null);
@@ -187,7 +189,7 @@
 
         FishingOperation selectedOperation = null;
         for (FishingOperation fishingOperation : fishingOperations) {
-            if (selectedOperation == null || 
+            if (selectedOperation == null ||
                     fishingOperation.getGearShootingStartDate()
                             .after(selectedOperation.getGearShootingStartDate())
                     && fishingOperation.getFishingOperationNumber() 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -150,6 +150,8 @@
             getModel().setModify(false);
 
             saveFishingOperation(toSave);
+            
+            handler.getParentUi().getTabPane().setSelectedIndex(1);
         }
 
 //        if (event.getSource() != null) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -62,10 +62,6 @@
 
     protected Component errorComponent;
 
-    protected enum Weights {
-        UNSORTED, SAMPLE_SORTED, SORTED, TOTAL
-    }
-
     public ComputeWeightsAction(EditCatchesUIHandler handler) {
         super(handler,
               "computeWeights",
@@ -77,21 +73,23 @@
 
     @Override
     protected void doAction(ActionEvent event) throws Exception {
-        Map<Weights, Float> speciesWeights = computeSpeciesBatches();
-
+        EditCatchesUIModel model = getModel();
+        
+        computeSpeciesBatches();
+        Float speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedWeight();
+        Float speciesTotalUnsortedWeight = model.getSpeciesTotalUnsortedComputedWeight();
+        
         EditCatchesUI ui = getUI();
-        setComputedValue(ui.getCatchTotalUnsortedWeightField(),
-                         speciesWeights.get(Weights.UNSORTED));
-        setComputedValue(ui.getCatchTotalSortedWeightField(),
-                         speciesWeights.get(Weights.SORTED));
 
-        EditCatchesUIModel model = getModel();
+        model.setCatchTotalSortedComputedWeight(speciesTotalSortedWeight);
+        model.setCatchTotalUnsortedComputedWeight(speciesTotalUnsortedWeight);
+        
         Float totalWeight = model.getCatchTotalWeight();
         Float rejectedWeight = model.getCatchTotalRejectedWeight();
 
         if (rejectedWeight == null && totalWeight != null) {
-            if (!totalWeight.equals(speciesWeights.get(Weights.UNSORTED)
-                                    + speciesWeights.get(Weights.SORTED))) {
+            if (!totalWeight.equals(speciesTotalUnsortedWeight
+                                    + speciesTotalSortedWeight)) {
                 errorMessage = _("tutti.action.computeWeights.error.incoherentTotal");
                 errorTitle = _("tutti.action.computeWeights.error.incoherentTotal.title");
                 errorComponent = ui.getCatchTotalWeightField();
@@ -99,8 +97,8 @@
             } else {
 
                 model.setCatchTotalRejectedComputedWeight(totalWeight
-                                                          - speciesWeights.get(Weights.UNSORTED)
-                                                          - speciesWeights.get(Weights.SORTED));
+                                                          - speciesTotalUnsortedWeight
+                                                          - speciesTotalSortedWeight);
             }
 
         } else if (totalWeight == null) {
@@ -108,12 +106,14 @@
                 rejectedWeight = 0f;
                 model.setCatchTotalRejectedComputedWeight(0f);
             }
-            model.setCatchTotalComputedWeight(speciesWeights.get(Weights.UNSORTED)
-                                              + speciesWeights.get(Weights.SORTED) + rejectedWeight);
+            model.setCatchTotalComputedWeight(speciesTotalUnsortedWeight
+                                              + speciesTotalSortedWeight 
+                                              + rejectedWeight);
 
         } else if (rejectedWeight != null
-                   && !totalWeight.equals(speciesWeights.get(Weights.UNSORTED)
-                                          + speciesWeights.get(Weights.SORTED) + rejectedWeight)) {
+                   && !totalWeight.equals(speciesTotalUnsortedWeight
+                                          + speciesTotalSortedWeight 
+                                          + rejectedWeight)) {
             errorMessage = _("tutti.action.computeWeights.error.incoherentTotal");
             errorTitle = _("tutti.action.computeWeights.error.incoherentTotal.title");
             errorComponent = ui.getCatchTotalWeightField();
@@ -125,9 +125,7 @@
     //-- Internal methods                                                   --//
     //------------------------------------------------------------------------//
 
-    protected Map<Weights, Float> computeSpeciesBatches() {
-        Map<Weights, Float> result = Maps.newEnumMap(Weights.class);
-
+    protected void computeSpeciesBatches() {
         PersistenceService persistenceService =
                 getService(PersistenceService.class);
         EditCatchesUIModel model = getModel();
@@ -173,11 +171,7 @@
             model.setSpeciesTotalLivingNotItemizedWeight(0f);
         }
 
-        setComputedValue(speciesUI.getSpeciesTotalSampleSortedWeightField(),
-                         totalSortedWeight);
-        setComputedValue(ui.getSpeciesTotalSampleSortedWeightField(),
-                         totalSortedWeight);
-        result.put(Weights.SAMPLE_SORTED, totalSortedWeight);
+        model.setSpeciesTotalSampleSortedComputedWeight(totalSortedWeight);
 
         Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight();
         if (speciesTotalSortedWeight == null) {
@@ -196,24 +190,13 @@
             // le "Poids total VRAC" est bien une valeur observée 
             // sinon la remplacer par le "Poids total Vrac trié"
         }
-        result.put(Weights.SORTED, speciesTotalSortedWeight);
 
-        setComputedValue(speciesUI.getSpeciesTotalUnsortedWeightField(),
-                         totalUnsortedWeight);
-        setComputedValue(ui.getSpeciesTotalUnsortedWeightField(),
-                         totalUnsortedWeight);
-        result.put(Weights.UNSORTED, totalUnsortedWeight);
+        model.setSpeciesTotalUnsortedComputedWeight(totalUnsortedWeight);
 
         Float totalWeight = totalUnsortedWeight + speciesTotalSortedWeight;
-        setComputedValue(speciesUI.getSpeciesTotalWeightField(),
-                         totalWeight);
-        setComputedValue(ui.getSpeciesTotalWeightField(),
-                         totalWeight);
-        result.put(Weights.TOTAL, speciesTotalSortedWeight);
+        model.setSpeciesTotalComputedWeight(totalWeight);
 
         speciesUI.getTable().repaint();
-
-        return result;
     }
 
     protected Float computeSpeciesBatch(SpeciesBatchRowModel row) {
@@ -324,16 +307,6 @@
         return result;
     }
 
-    protected void setComputedValue(JTextField textField, Float value) {
-        String textValue;
-        if (value != null) {
-            textValue = String.format("%.3f", value);
-        } else {
-            textValue = JAXXUtil.getStringValue(value);
-        }
-        textField.setText(textValue);
-    }
-
     @Override
     protected void releaseAction(ActionEvent event) {
         if (errorMessage != null) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css	2013-02-20 13:03:56 UTC (rev 450)
@@ -61,6 +61,7 @@
 }
 
 #catchTotalSortedWeightField {
+  text: {getWeightStringValue(model.getCatchTotalSortedComputedWeight())};
   _computed: true;
 }
 
@@ -100,6 +101,7 @@
 }
 
 #catchTotalUnsortedWeightField {
+  text: {getWeightStringValue(model.getCatchTotalUnsortedComputedWeight())};
   _computed: true;
 }
 
@@ -123,6 +125,7 @@
 }
 
 #speciesTotalWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalComputedWeight())};
   _computed: true;
 }
 
@@ -147,6 +150,7 @@
 }
 
 #speciesTotalSampleSortedWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalSampleSortedComputedWeight())};
   _computed: true;
 }
 
@@ -156,6 +160,7 @@
 }
 
 #speciesTotalUnsortedWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalUnsortedComputedWeight())};
   _computed: true;
 }
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx	2013-02-20 13:03:56 UTC (rev 450)
@@ -48,6 +48,7 @@
 
     static org.nuiton.i18n.I18n._
     static jaxx.runtime.SwingUtil.getStringValue
+    static fr.ifremer.tutti.ui.swing.util.TuttiUIUtil.getWeightStringValue
   </import>
 
   <script><![CDATA[

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-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -139,8 +139,13 @@
         Set<String> result = super.getPropertiesToIgnore();
         result.addAll(Sets.newHashSet(
                 EditCatchesUIModel.PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT,
+                EditCatchesUIModel.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT,
+                EditCatchesUIModel.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT,
                 EditCatchesUIModel.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT,
-                EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT
+                EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT,
+                EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT,
+                EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT,
+                EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT
         ));
         return result;
     }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -47,6 +47,10 @@
     public static final String PROPERTY_CATCH_TOTAL_WEIGHT = "catchTotalWeight";
 
     public static final String PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT = "catchTotalComputedWeight";
+    
+    public static final String PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT = "catchTotalSortedComputedWeight";
+    
+    public static final String PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT = "catchTotalUnsortedComputedWeight";
 
     public static final String PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT = "catchTotalSortedTremisWeight";
 
@@ -56,9 +60,15 @@
 
     public static final String PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT = "catchTotalRejectedComputedWeight";
 
+    public static final String PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT = "speciesTotalComputedWeight";
+    
     public static final String PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT = "speciesTotalSortedWeight";
 
     public static final String PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT = "speciesTotalSortedComputedWeight";
+    
+    public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT = "speciesTotalUnsortedComputedWeight";
+    
+    public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "speciesTotalSampleSortedComputedWeight";
 
     public static final String PROPERTY_SPECIES_TOTAL_INERT_WEIGHT = "speciesTotalInertWeight";
 
@@ -121,8 +131,14 @@
 
     protected static final Binder<EditCatchesUIModel, CatchBatch> toBeanBinder = BinderFactory.newBinder(EditCatchesUIModel.class, CatchBatch.class);
 
+    protected Float speciesTotalComputedWeight;
+    
     protected TuttiComputedOrNotData<Float> speciesTotalSortedComputedOrNotWeight = new TuttiComputedOrNotData<Float>();
 
+    protected Float speciesTotalUnsortedComputedWeight;
+
+    protected Float speciesTotalSampleSortedComputedWeight;
+    
     protected Float speciesTotalInertWeight = 0f;
 
     protected Float speciesTotalLivingNotItemizedWeight = 0f;
@@ -144,6 +160,10 @@
     protected TuttiComputedOrNotData<Float> catchTotalComputedOrNotWeight
             = new TuttiComputedOrNotData<Float>();
 
+    protected Float catchTotalSortedComputedWeight;
+    
+    protected Float catchTotalUnsortedComputedWeight;
+    
     protected Float catchTotalSortedTremisWeight;
 
     protected Float catchTotalSortedCarousselWeight;
@@ -234,7 +254,27 @@
         this.catchTotalComputedOrNotWeight.setComputedData(catchTotalComputedWeight);
         firePropertyChange(PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, oldValue, catchTotalComputedWeight);
     }
+    
+    public Float getCatchTotalSortedComputedWeight() {
+        return catchTotalSortedComputedWeight;
+    }
 
+    public void setCatchTotalSortedComputedWeight(Float catchTotalSortedComputedWeight) {
+        Object oldValue = getCatchTotalSortedComputedWeight();
+        this.catchTotalSortedComputedWeight = catchTotalSortedComputedWeight;
+        firePropertyChange(PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, oldValue, catchTotalSortedComputedWeight);
+    }
+    
+    public Float getCatchTotalUnsortedComputedWeight() {
+        return catchTotalUnsortedComputedWeight;
+    }
+
+    public void setCatchTotalUnsortedComputedWeight(Float catchTotalUnsortedComputedWeight) {
+        Object oldValue = getCatchTotalUnsortedComputedWeight();
+        this.catchTotalUnsortedComputedWeight = catchTotalUnsortedComputedWeight;
+        firePropertyChange(PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, oldValue, catchTotalUnsortedComputedWeight);
+    }
+
     public Float getCatchTotalSortedTremisWeight() {
         return catchTotalSortedTremisWeight;
     }
@@ -279,6 +319,16 @@
         firePropertyChange(PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT, oldValue, catchTotalRejectedComputedWeight);
     }
 
+    public Float getSpeciesTotalComputedWeight() {
+        return speciesTotalComputedWeight;
+    }
+
+    public void setSpeciesTotalComputedWeight(Float speciesTotalComputedWeight) {
+        Object oldValue = getSpeciesTotalComputedWeight();
+        this.speciesTotalComputedWeight = speciesTotalComputedWeight;
+        firePropertyChange(PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, oldValue, speciesTotalComputedWeight);
+    }
+    
     public TuttiComputedOrNotData<Float> getSpeciesTotalSortedComputedOrNotWeight() {
         return speciesTotalSortedComputedOrNotWeight;
     }
@@ -303,6 +353,26 @@
         firePropertyChange(PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, oldValue, speciesTotalSortedComputedWeight);
     }
 
+    public Float getSpeciesTotalSampleSortedComputedWeight() {
+        return speciesTotalSampleSortedComputedWeight;
+    }
+
+    public void setSpeciesTotalSampleSortedComputedWeight(Float speciesTotalSampleSortedComputedWeight) {
+        Object oldValue = getSpeciesTotalSampleSortedComputedWeight();
+        this.speciesTotalSampleSortedComputedWeight = speciesTotalSampleSortedComputedWeight;
+        firePropertyChange(PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, oldValue, speciesTotalSampleSortedComputedWeight);
+    }
+
+    public Float getSpeciesTotalUnsortedComputedWeight() {
+        return speciesTotalUnsortedComputedWeight;
+    }
+
+    public void setSpeciesTotalUnsortedComputedWeight(Float speciesTotalUnsortedComputedWeight) {
+        Object oldValue = getSpeciesTotalUnsortedComputedWeight();
+        this.speciesTotalUnsortedComputedWeight = speciesTotalUnsortedComputedWeight;
+        firePropertyChange(PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, oldValue, speciesTotalUnsortedComputedWeight);
+    }
+    
     public Float getSpeciesTotalInertWeight() {
         return speciesTotalInertWeight;
     }
@@ -393,8 +463,20 @@
         firePropertyChange(PROPERTY_MACRO_WASTE_TOTAL_WEIGHT, oldValue, macroWasteTotalWeight);
     }
 
+    public void reset() {
+        setSpeciesTotalSampleSortedComputedWeight(null);
+        setSpeciesTotalSortedComputedWeight(null);
+        setSpeciesTotalUnsortedComputedWeight(null);
+        setSpeciesTotalComputedWeight(null);
+        setCatchTotalRejectedComputedWeight(null);
+        setCatchTotalSortedComputedWeight(null);
+        setCatchTotalUnsortedComputedWeight(null);
+        setCatchTotalComputedWeight(null);
+    }
+    
     @Override
     protected CatchBatch newEntity() {
         return catchBatch;
     }
+    
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css	2013-02-20 13:03:56 UTC (rev 450)
@@ -46,6 +46,7 @@
 }
 
 #speciesTotalWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalComputedWeight())};
   _computed: true;
 }
 
@@ -65,6 +66,7 @@
 }
 
 #speciesTotalSampleSortedWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalSampleSortedComputedWeight())};
   _computed: true;
 }
 
@@ -74,6 +76,7 @@
 }
 
 #speciesTotalUnsortedWeightField {
+  text: {getWeightStringValue(model.getSpeciesTotalUnsortedComputedWeight())};
   _computed: true;
 }
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx	2013-02-20 13:03:56 UTC (rev 450)
@@ -44,6 +44,7 @@
 
     static org.nuiton.i18n.I18n._
     static jaxx.runtime.SwingUtil.getStringValue
+    static fr.ifremer.tutti.ui.swing.util.TuttiUIUtil.getWeightStringValue
   </import>
 
   <script><![CDATA[

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -133,11 +133,22 @@
 
     public SpeciesBatchUIModel(EditCatchesUIModel catchesUIModel) {
         super(catchesUIModel,
+              EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT,
               EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT,
+              EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT,
+              EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT,
               EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT,
               EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT);
     }
 
+    public Float getSpeciesTotalComputedWeight() {
+        return catchesUIModel.getSpeciesTotalComputedWeight();
+    }
+
+    public void setSpeciesTotalComputedWeight(Float speciesTotalComputedWeight) {
+        catchesUIModel.setSpeciesTotalComputedWeight(speciesTotalComputedWeight);
+    }
+    
     public TuttiComputedOrNotData<Float> getSpeciesTotalSortedComputedOrNotWeight() {
         return catchesUIModel.getSpeciesTotalSortedComputedOrNotWeight();
     }
@@ -158,6 +169,22 @@
         catchesUIModel.setSpeciesTotalSortedComputedWeight(speciesTotalSortedComputedWeight);
     }
 
+    public Float getSpeciesTotalUnsortedComputedWeight() {
+        return catchesUIModel.getSpeciesTotalUnsortedComputedWeight();
+    }
+
+    public void setSpeciesTotalUnsortedComputedWeight(Float speciesTotalUnsortedComputedWeight) {
+        catchesUIModel.setSpeciesTotalUnsortedComputedWeight(speciesTotalUnsortedComputedWeight);
+    }
+    
+    public Float getSpeciesTotalSampleSortedComputedWeight() {
+        return catchesUIModel.getSpeciesTotalSampleSortedComputedWeight();
+    }
+
+    public void setSpeciesTotalSampleSortedComputedWeight(Float speciesTotalSampleSortedComputedWeight) {
+        catchesUIModel.setSpeciesTotalSampleSortedComputedWeight(speciesTotalSampleSortedComputedWeight);
+    }
+    
     public Float getSpeciesTotalInertWeight() {
         return catchesUIModel.getSpeciesTotalInertWeight();
     }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java	2013-02-20 13:03:56 UTC (rev 450)
@@ -342,4 +342,15 @@
         return d.intValue();
 
     }
+    
+    public static String getWeightStringValue(Float weight) {
+        String textValue;
+        if (weight != null) {
+            textValue = String.format("%.3f", weight);
+            
+        } else {
+            textValue = JAXXUtil.getStringValue(weight);
+        }
+        return textValue;
+    }
 }

Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml	2013-02-20 08:50:46 UTC (rev 449)
+++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml	2013-02-20 13:03:56 UTC (rev 450)
@@ -42,8 +42,7 @@
     <field-validator type="fieldexpression" short-circuit="true">
       <param name="expression">
         <![CDATA[ gearShootingStartDate == null || gearShootingEndDate == null 
-                  || (org.nuiton.util.DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate) <= 45 
-                      && org.nuiton.util.DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate) >= 20 ) 
+                  || isValidDuration()
         ]]>
       </param>
       <message>tutti.validator.error.fishingOperation.dates.wrongTime</message>
@@ -63,8 +62,7 @@
     <field-validator type="fieldexpression" short-circuit="true">
       <param name="expression">
         <![CDATA[ gearShootingStartDate == null || gearShootingEndDate == null 
-                  || (org.nuiton.util.DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate) <= 45 
-                      && org.nuiton.util.DateUtil.getDifferenceInMinutes(gearShootingStartDate, gearShootingEndDate) >= 20 )
+                  || isValidDuration()
         ]]>
       </param>
       <message>tutti.validator.error.fishingOperation.dates.wrongTime</message>

    

kmorin＠users.forge.codelutin.com

tags

participants (1)