[Git][ultreiaio/ird-observe][develop] 2 commits: Fix FOB form

17 May 2019


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
6a7185c2 by tchemit at 2019-05-17T11:16:47Z
Fix FOB form

- - - - -
8390a6cf by tchemit at 2019-05-17T11:42:28Z
Fix LL-Obs-CatchLongline  form

- - - - -


3 changed files:

- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIModel.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java


Changes:

=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java
=====================================
@@ -193,7 +193,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
         setTableModelEditable(model.isEditable());
 
         positionHelper = new LonglinePositionHelper<>(ui.getSection(), ui.getBasket(), ui.getBranchline(), getModel().getTableEditBean());
-        model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, evt -> ui.getBranchlineValidator().setChanged(true));
+        model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_TIME_SINCE_CONTACT, evt -> ui.getBranchlineValidator().setChanged(true));
     }
 
     @Override
@@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
         CatchLonglineObsUIModel model = getModel();
         if (BooleanUtils.isTrue(branchline.getTimer())) {
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(model.getBranchlineTimeSinceContact());
+            calendar.setTime(model.getTimeSinceContact());
             int minutes = calendar.get(Calendar.MINUTE);
             int hours = calendar.get(Calendar.HOUR);
             branchline.setTimeSinceContact(minutes + 60L * hours);
@@ -665,7 +665,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
         if (newValue == null) {
             log.info(prefix + "Remove branchline");
             branchlineValidator.setBean(null);
-            model.setBranchlineTimeSinceContact(null);
+            model.setTimeSinceContact(null);
 
         } else {
             log.info(prefix + "Use branchline: " + newValue);
@@ -682,11 +682,11 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
                 Long timeSinceContact = branchline.getTimeSinceContact();
                 if (timeSinceContact != null) {
                     Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0);
-                    model.setBranchlineTimeSinceContact(timeSinceContactDate);
+                    model.setTimeSinceContact(timeSinceContactDate);
                 }
             } else {
                 Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0);
-                model.setBranchlineTimeSinceContact(timeSinceContactDate);
+                model.setTimeSinceContact(timeSinceContactDate);
             }
             branchlineValidator.setBean(branchline);
         }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIModel.java
=====================================
@@ -28,6 +28,9 @@ import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI;
 import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIModel;
 import fr.ird.observe.dto.data.ll.observation.CatchLonglineObsDto;
 import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchDto;
+import io.ultreia.java4all.bean.JavaBean;
+import io.ultreia.java4all.bean.definition.JavaBeanDefinition;
+import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
 import org.nuiton.util.beans.Binder;
 import org.nuiton.util.beans.BinderModelBuilder;
 
@@ -41,9 +44,10 @@ import java.util.List;
  * @author Tony Chemit - dev@tchemit.fr
  * @since 3.7
  */
-public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsCatchDto, CatchLonglineObsDto> {
+@GenerateJavaBeanDefinition
+public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsCatchDto, CatchLonglineObsDto> implements JavaBean {
 
-    public static final String PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT = "branchlineTimeSinceContact";
+    public static final String PROPERTY_TIME_SINCE_CONTACT = "timeSinceContact";
 
     public static final String PROPERTY_SHOW_INDIVIDUAL_TABS = "showIndividualTabs";
 
@@ -58,15 +62,7 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC
      */
     protected boolean showIndividualTabs;
 
-    protected boolean caracteristicsTabValid;
-
-    protected boolean depredatedTabValid;
-
-    protected boolean foodAndSexualTabValid;
-
-    protected boolean branchlineTabValid;
-
-    protected Date branchlineTimeSinceContact;
+    protected Date timeSinceContact;
 
     public CatchLonglineObsUIModel(CatchLonglineObsUI ui) {
         super(SetLonglineObsCatchDto.class,
@@ -139,14 +135,14 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC
         firePropertyChange(PROPERTY_SHOW_INDIVIDUAL_TABS, null, showIndividualTabs);
     }
 
-    public Date getBranchlineTimeSinceContact() {
-        return branchlineTimeSinceContact;
+    public Date getTimeSinceContact() {
+        return timeSinceContact;
     }
 
-    public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) {
+    public void setTimeSinceContact(Date timeSinceContact) {
 //        Date oldValue = getBranchlineTimeSinceContact();
-        this.branchlineTimeSinceContact = branchlineTimeSinceContact;
-        firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, null, branchlineTimeSinceContact);
+        this.timeSinceContact = timeSinceContact;
+        firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, null, timeSinceContact);
 
     }
 
@@ -166,4 +162,15 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC
 
     }
 
+    /**
+     * Lazy helper class that manages all java bean operations.
+     *
+     * @see #javaBeanDefinition()
+     */
+    private transient final JavaBeanDefinition javaBeanDefinition = new CatchLonglineObsUIModelJavaBeanDefinition();
+
+    @Override
+    public JavaBeanDefinition javaBeanDefinition() {
+        return javaBeanDefinition;
+    }
 }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java
=====================================
@@ -73,7 +73,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject
         ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy();
 
         //FIXME-PROTECTED-ID
-        ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new);
+        ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.observation.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new);
 
         for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) {
             if (objectMaterialHierarchyDto.isEnabled()) {



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2808ba1bf555cb174a9526b8885...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2808ba1bf555cb174a9526b8885...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)