[Git][ultreiaio/ird-observe][develop] 5 commits: Editeurs d'url non actifs - Closes #1275 - Observe-commits

21 May 2019


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


Commits:
9857e601 by tchemit at 2019-05-21T09:30:58Z
Editeurs d'url non actifs - Closes #1275

- - - - -
c34fdc68 by tchemit at 2019-05-21T09:31:00Z
update templates

- - - - -
842bb48c by tchemit at 2019-05-21T09:31:00Z
Impossible d'éditer nouveau DCP - Closes #1279

- - - - -
96034c18 by tchemit at 2019-05-21T09:31:00Z
Pas d'accès à l'activité de fin de veille - Closes #1281

- - - - -
cb1af8b5 by tchemit at 2019-05-21T09:31:00Z
Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283

- - - - -


8 changed files:

- .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md
- .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md
- client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java
- client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java
- client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java
- client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
- dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java
- pom.xml


Changes:

=====================================
.gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md
=====================================
@@ -9,6 +9,6 @@
 ```
 
 /label ~"Anomalie"
-/label ~"Contrat SFA-2017"
-/milestone %"Contrat SFA-2017"
+/label ~"IRD-2018-01-V8"
+/milestone %"8.0-beta-1"
 /assign @tchemit
\ No newline at end of file


=====================================
.gitlab/issue_templates/Contrat-SFA-2017-Evolution.md
=====================================
@@ -1,5 +1,5 @@
 
 /label ~"Evolution"
-/label ~"Contrat SFA-2017"
+/label ~"IRD-2018-01-V8"
 /milestone %"Contrat SFA-2017"
 /assign @tchemit
\ No newline at end of file


=====================================
client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java
=====================================
@@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback {
 
             // on selection l'activity de fin de veille et on y reste
             // donc on ne continue pas la fermeture de la route
-            throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node);
+            throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node);
         }
     }
 
@@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback {
 
         MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node"));
 
-        MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode);
+        MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode);
         tree.selectSafeNode(parentNode);
 
         log.debug("PARENT NODE = " + parentNode);


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java
=====================================
@@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction {
             //FIXME See what does it means ?
             getMainUI().getHandler().updateContentSize();
         } catch (CloseEditNodeVetoException e1) {
-            UIHelper.handlingError(e1);
+            log.error("Could not close data from callback", e1);
+//            UIHelper.handlingError(e1);
         }
     }
 


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java
=====================================
@@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI;
 import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport;
 import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI;
 import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel;
+import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
 import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto;
 import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto;
 import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference;
 import fr.ird.observe.dto.result.SaveResultDto;
 import fr.ird.observe.navigation.model.edit.ObserveEditNode;
+import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode;
+import fr.ird.observe.navigation.tree.ReferenceNode;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Function;
 
 /**
  * Created by tchemit on 28/09/2018.
@@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport
         return true;
     }
 
+    @Override
+    protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) {
+        return ((MultipleReferenceContainerNode) parent)::newChildNode;
+    }
 }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
=====================================
@@ -36,6 +36,7 @@ import javax.swing.JComponent;
 import javax.swing.JTable;
 import java.awt.Color;
 import java.awt.Component;
+import java.util.Objects;
 
 import static io.ultreia.java4all.i18n.I18n.t;
 
@@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT
 
     @Override
     public String getFieldName(JTable table, String value, int row) {
+        Objects.requireNonNull(value,"Value can not be null!");
         SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel();
         SwingValidatorMessage model = tableModel.getRow(row);
         JComponent editor = model.getEditor();


=====================================
dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java
=====================================
@@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
     private static final long serialVersionUID = 1L;
     //FIXME-PROTECTED-ID
     public boolean isBoolean() {
-        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId());
+        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId());
     }
     //FIXME-PROTECTED-ID
     public boolean isText() {
-        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId());
+        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId());
     }
     //FIXME-PROTECTED-ID
     public boolean isInteger() {
-        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId());
+        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId());
     }
     //FIXME-PROTECTED-ID
     public boolean isFloat() {
-        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId());
+        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId());
     }
 
     public boolean withValidation() {


=====================================
pom.xml
=====================================
@@ -163,7 +163,7 @@
 
     <!--lib.version.java4all.topia>1.8</lib.version.java4all.topia-->
     <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
-<!--    <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>-->
+    <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>
     <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
     <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
     <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1be1078f4bf849d0ee48e093c73...

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

    

[Git][ultreiaio/ird-observe][develop] 5 commits: Editeurs d'url non actifs - Closes #1275

Tony CHEMIT

tags

participants (1)