[Tutti-commits] r829 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . accidental individualobservation

19 Apr 2013

Author: kmorin
Date: 2013-04-19 10:39:39 +0200 (Fri, 19 Apr 2013)
New Revision: 829

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

Log:
- refs #1866 [CAPTURE] - Captures accidentelles (validation)
- refs #1867 [CAPTURE] - Observations individuelles (validation)

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/accidental/AccidentalBatchUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java

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-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css	2013-04-19 08:39:39 UTC (rev 829)
@@ -72,14 +72,6 @@
   rightDecoration: {marineLitterTabContent.getMarineLitterBatchTabToolBar()};
 }
 
-#accidentalTabFishingOperationReminderLabel {
-  rightDecoration: {accidentalTabContent.getAccidentalBatchTabToolBar()};
-}
-
-#individualObservationTabFishingOperationReminderLabel {
-  rightDecoration: {individualObservationTabContent.getIndividualObservationBatchTabToolBar()};
-}
-
 #catchTable {
   border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.total"))};
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css	2013-04-19 08:39:39 UTC (rev 829)
@@ -33,16 +33,6 @@
   _help: {"tuttihelp.editAccidentalBatch.help"};
 }
 
-#accidentalBatchTabToolBar {
-  floatable: false;
-  opaque: false;
-  borderPainted: false;
-}
-
-#accidentalBatchAttachmentsButton {
-  enabled: {model.getObjectId() != null};
-}
-
 #tablePopup {
   label: "tutti.editAccidentalBatch.title.batchActions";
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx	2013-04-19 08:39:39 UTC (rev 829)
@@ -68,11 +68,6 @@
   <TuttiHelpBroker id='broker'
                    constructorParams='"tuttihelp.editAccidentalBatch.help"'/>
 
-  <JToolBar id='accidentalBatchTabToolBar'>
-    <ButtonAttachment id='accidentalBatchAttachmentsButton'
-                      constructorParams='getHandler().getContext(), getModel()'/>
-  </JToolBar>
-
   <JPopupMenu id='tablePopup'>
     <JMenuItem id='removeAccidentalBatchMenu'/>
   </JPopupMenu>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java	2013-04-19 08:39:39 UTC (rev 829)
@@ -26,9 +26,7 @@
 
 import com.google.common.collect.Lists;
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
-import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch;
-import fr.ifremer.tutti.persistence.entities.data.Attachment;
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
+import fr.ifremer.tutti.persistence.entities.data.*;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
 import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
@@ -40,6 +38,7 @@
 import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUIModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchRowModel;
 import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
 import fr.ifremer.tutti.ui.swing.util.TuttiUI;
 import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
@@ -118,12 +117,23 @@
             }
             rows = Lists.newArrayList();
 
+            if (!TuttiEntities.isNew(bean)) {
+
+                // get all marine litter root
+                List<AccidentalBatch> batches =
+                        persistenceService.getAllAccidentalBatch(bean.getId());
+
+                for (AccidentalBatch aBatch : batches) {
+                    AccidentalBatchRowModel entry = loadBatch(aBatch);
+                    rows.add(entry);
+                }
+            }
         }
         model.setRows(rows);
         recomputeBatchActionEnable();
     }
 
-    protected AccidentalBatchRowModel loadBatch(AccidentalBatchRowModel aBatch) {
+    protected AccidentalBatchRowModel loadBatch(AccidentalBatch aBatch) {
 
         Integer id = aBatch.getIdAsInt();
 
@@ -391,7 +401,6 @@
         if (log.isDebugEnabled()) {
             log.debug("closing: " + ui);
         }
-        ui.getAccidentalBatchAttachmentsButton().onCloseUI();
     }
 
     @Override

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java	2013-04-19 08:39:39 UTC (rev 829)
@@ -41,19 +41,15 @@
  * @since 0.2
  */
 public class AccidentalBatchUIModel extends AbstractTuttiBatchUIModel<AccidentalBatchRowModel, AccidentalBatchUIModel>
-        implements AttachmentModelAware, TabContentModel {
+        implements TabContentModel {
 
     private static final long serialVersionUID = 1L;
 
     public static final String PROPERTY_REMOVE_BATCH_ENABLED = "removeBatchEnabled";
 
-    protected final List<Attachment> attachment = Lists.newArrayList();
-
     /** Can user remove a selected batch? */
     protected boolean removeBatchEnabled;
 
-    private String rootBatchId;
-
     public AccidentalBatchUIModel(EditCatchesUIModel catchesUIModel) {
         super(catchesUIModel);
     }
@@ -68,67 +64,14 @@
         firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled);
     }
 
-    public void setRootBatchId(String rootBatchId) {
-        String oldValue = getObjectId();
-        this.rootBatchId = rootBatchId;
-        firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId());
-    }
-
-    public String getRootBatchId() {
-        return rootBatchId;
-    }
-
     //------------------------------------------------------------------------//
-    //-- AttachmentModelAware                                               --//
-    //------------------------------------------------------------------------//
-
-    @Override
-    public AttachementObjectTypeEnum getObjectType() {
-        return AttachementObjectTypeEnum.CATCH_BATCH;
-    }
-
-    @Override
-    public String getObjectId() {
-        return rootBatchId;
-    }
-
-    @Override
-    public List<Attachment> getAttachment() {
-        return attachment;
-    }
-
-    @Override
-    public void addAllAttachment(Collection<Attachment> attachments) {
-        this.attachment.addAll(attachments);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void addAttachment(Attachment attachment) {
-        this.attachment.add(attachment);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void removeAllAttachment(Collection<Attachment> attachments) {
-        this.attachment.removeAll(attachments);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void removeAttachment(Attachment attachment) {
-        this.attachment.remove(attachment);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    //------------------------------------------------------------------------//
     //-- TabContentModel                                                    --//
     //------------------------------------------------------------------------//
 
     @Override
     public boolean isEmpty() {
-        boolean result = CollectionUtils.isEmpty(getAttachment());
-        if (result && CollectionUtils.isNotEmpty(getRows())) {
+        boolean result = true;
+        if (CollectionUtils.isNotEmpty(getRows())) {
 
             // check if every line is not valid
             for (AccidentalBatchRowModel row : rows) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css	2013-04-19 08:39:39 UTC (rev 829)
@@ -26,16 +26,6 @@
   _help: {"tuttihelp.editIndividualObservationBatch.help"};
 }
 
-#individualObservationBatchTabToolBar {
-  floatable: false;
-  opaque: false;
-  borderPainted: false;
-}
-
-#individualObservationBatchAttachmentsButton {
-  enabled: {model.getObjectId() != null};
-}
-
 #tablePopup {
   label: "tutti.editIndividualObservationBatch.title.batchActions";
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx	2013-04-19 08:39:39 UTC (rev 829)
@@ -67,11 +67,6 @@
   <TuttiHelpBroker id='broker'
                    constructorParams='"tuttihelp.editIndividualObservationBatch.help"'/>
 
-  <JToolBar id='individualObservationBatchTabToolBar'>
-    <ButtonAttachment id='individualObservationBatchAttachmentsButton'
-                      constructorParams='getHandler().getContext(), getModel()'/>
-  </JToolBar>
-
   <JPopupMenu id='tablePopup'>
     <JMenuItem id='removeIndividualObservationBatchMenu'/>
   </JPopupMenu>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java	2013-04-19 08:39:39 UTC (rev 829)
@@ -25,6 +25,7 @@
 import com.google.common.collect.Lists;
 import fr.ifremer.tutti.PropagatePropertyChangeListener;
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
+import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch;
 import fr.ifremer.tutti.persistence.entities.data.Attachment;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
 import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch;
@@ -35,6 +36,7 @@
 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.EditCatchesUIModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchRowModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUIModel;
 import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
@@ -114,9 +116,13 @@
             }
             rows = Lists.newArrayList();
 
-//            if (!TuttiEntities.isNew(bean)) {
-//
-//            }
+            List<IndividualObservationBatch> batches =
+                    persistenceService.getAllIndividualObservationBatch(bean.getId());
+
+            for (IndividualObservationBatch aBatch : batches) {
+                IndividualObservationBatchRowModel entry = loadBatch(aBatch);
+                rows.add(entry);
+            }
         }
         model.setRows(rows);
         recomputeBatchActionEnable();
@@ -390,7 +396,6 @@
         if (log.isDebugEnabled()) {
             log.debug("closing: " + ui);
         }
-        ui.getIndividualObservationBatchAttachmentsButton().onCloseUI();
     }
 
     @Override

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java	2013-04-19 07:29:27 UTC (rev 828)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java	2013-04-19 08:39:39 UTC (rev 829)
@@ -40,19 +40,15 @@
  * @since 1.4
  */
 public class IndividualObservationBatchUIModel extends AbstractTuttiBatchUIModel<IndividualObservationBatchRowModel, IndividualObservationBatchUIModel>
-        implements AttachmentModelAware, TabContentModel {
+        implements TabContentModel {
 
     private static final long serialVersionUID = 1L;
 
     public static final String PROPERTY_REMOVE_BATCH_ENABLED = "removeBatchEnabled";
 
-    protected final List<Attachment> attachment = Lists.newArrayList();
-
     /** Can user remove a selected batch? */
     protected boolean removeBatchEnabled;
 
-    private String rootBatchId;
-
     public IndividualObservationBatchUIModel(EditCatchesUIModel catchesUIModel) {
         super(catchesUIModel);
     }
@@ -67,16 +63,6 @@
         firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled);
     }
 
-    public void setRootBatchId(String rootBatchId) {
-        String oldValue = getObjectId();
-        this.rootBatchId = rootBatchId;
-        firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId());
-    }
-
-    public String getRootBatchId() {
-        return rootBatchId;
-    }
-
     public Species getLastSpeciesUsed() {
         Species result = null;
         if (!rows.isEmpty()) {
@@ -86,56 +72,13 @@
     }
 
     //------------------------------------------------------------------------//
-    //-- AttachmentModelAware                                               --//
-    //------------------------------------------------------------------------//
-
-    @Override
-    public AttachementObjectTypeEnum getObjectType() {
-        return AttachementObjectTypeEnum.CATCH_BATCH;
-    }
-
-    @Override
-    public String getObjectId() {
-        return rootBatchId;
-    }
-
-    @Override
-    public List<Attachment> getAttachment() {
-        return attachment;
-    }
-
-    @Override
-    public void addAllAttachment(Collection<Attachment> attachments) {
-        this.attachment.addAll(attachments);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void addAttachment(Attachment attachment) {
-        this.attachment.add(attachment);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void removeAllAttachment(Collection<Attachment> attachments) {
-        this.attachment.removeAll(attachments);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    @Override
-    public void removeAttachment(Attachment attachment) {
-        this.attachment.remove(attachment);
-        firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment());
-    }
-
-    //------------------------------------------------------------------------//
     //-- TabContentModel                                                    --//
     //------------------------------------------------------------------------//
 
     @Override
     public boolean isEmpty() {
-        boolean result = CollectionUtils.isEmpty(getAttachment());
-        if (result && CollectionUtils.isNotEmpty(getRows())) {
+        boolean result = true;
+        if (CollectionUtils.isNotEmpty(getRows())) {
 
             // check if every line is not valid
             for (IndividualObservationBatchRowModel row : rows) {

    

[Tutti-commits] r829 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . accidental individualobservation

kmorin＠users.forge.codelutin.com