[Git][ultreiaio/ird-observe][develop] 2 commits: update changelog [skip ci]

4 Jul 2019


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


Commits:
60687e47 by tchemit at 2019-07-03T15:52:36Z
update changelog [skip ci]

- - - - -
7c5335b3 by tchemit at 2019-07-03T16:07:57Z
[REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339

- - - - -


5 changed files:

- .mvn/gitlab-cache/milestones/898778-issues.json
- CHANGELOG.md
- dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java
- pom.xml
- test/src/main/resources/fixtures/validate-service-referential.properties


Changes:

=====================================
.mvn/gitlab-cache/milestones/898778-issues.json
=====================================
@@ -55,7 +55,7 @@
       "totalTimeSpent": 0
     },
     "state": "closed",
-    "updatedAt": "Jul 2, 2019 9:38:33 AM",
+    "updatedAt": "Jul 2, 2019 11:19:47 AM",
     "createdAt": "May 22, 2019 11:52:43 AM",
     "closedAt": "Jun 29, 2019 9:14:19 PM",
     "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1293"
@@ -170,7 +170,7 @@
       "_external": false,
       "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d80\u0026d\u003didenticon"
     },
-    "userNotesCount": 3,
+    "userNotesCount": 4,
     "upVotes": 0,
     "downVotes": 0,
     "confidential": false,
@@ -179,7 +179,7 @@
       "totalTimeSpent": 0
     },
     "state": "closed",
-    "updatedAt": "Jun 12, 2019 1:00:39 PM",
+    "updatedAt": "Jul 2, 2019 11:19:45 AM",
     "createdAt": "Jun 12, 2019 12:54:12 PM",
     "closedAt": "Jun 12, 2019 12:59:20 PM",
     "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1330"
@@ -245,6 +245,66 @@
     "closedAt": "Jun 28, 2019 5:52:13 PM",
     "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1145"
   },
+  {
+    "id": 22439064,
+    "iid": 1340,
+    "projectId": 2722779,
+    "title": "On ne peut pas sauvegarder une configuration d\u0027un serveur distant en mode admin",
+    "description": "## Quelle est la cause de bogue ?\n\nLancer une opération d\u0027administration d\u0027un serveur et essayer d\u0027enregistrer une nouvelle configuration.\n\n## Logs\n\n```\nINFO  2019-07-02T11:42:49,449 [AWT-EventQueue-0]   SaveCurrentServerConfigurationUIAction : 110 - Will add server configuration: demo-9\nException in thread \"AWT-EventQueue-0\" java.lang.NullPointerException\n\tat fr.ird.observe.client.ui.actions.storage.SaveCurrentServerConfigurationUIAction.doActionPerformed(SaveCurrentServerConfigurationUIAction.java:119)\n\tat fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport.actionPerformed(MenuActionSupport.java:62)\n\tat javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2022)\n\tat javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2348)\n\tat javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:402)\n\tat javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259)\n\tat javax.swing.AbstractButton.doClick(AbstractButton.java:376)\n\tat javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:842)\n\tat javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:886)\n\tat java.awt.Component.processMouseEvent(Component.java:6539)\n\tat javax.swing.JComponent.processMouseEvent(JComponent.java:3324)\n\tat java.awt.Component.processEvent(Component.java:6304)\n\tat java.awt.Container.processEvent(Container.java:2239)\n\tat java.awt.Component.dispatchEventImpl(Component.java:4889)\n\tat java.awt.Container.dispatchEventImpl(Container.java:2297)\n\tat java.awt.Component.dispatchEvent(Component.java:4711)\n\tat java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4904)\n\tat java.awt.LightweightDispatcher.processMouseEvent(Container.java:4535)\n\tat java.awt.LightweightDispatcher.dispatchEvent(Container.java:4476)\n\tat java.awt.Container.dispatchEventImpl(Container.java:2283)\n\tat java.awt.Window.dispatchEventImpl(Window.java:2746)\n\tat java.awt.Component.dispatchEvent(Component.java:4711)\n\tat java.awt.EventQueue.dispatchEventImpl(EventQueue.java:760)\n\tat java.awt.EventQueue.access$500(EventQueue.java:97)\n\tat java.awt.EventQueue$3.run(EventQueue.java:709)\n\tat java.awt.EventQueue$3.run(EventQueue.java:703)\n\tat java.security.AccessController.doPrivileged(Native Method)\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:84)\n\tat java.awt.EventQueue$4.run(EventQueue.java:733)\n\tat java.awt.EventQueue$4.run(EventQueue.java:731)\n\tat java.security.AccessController.doPrivileged(Native Method)\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)\n\tat java.awt.EventQueue.dispatchEvent(EventQueue.java:730)\n\tat java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:205)\n\tat java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)\n\tat java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:109)\n\tat java.awt.WaitDispatchSupport$2.run(WaitDispatchSupport.java:190)\n\tat java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:311)\n\tat java.awt.EventQueue.dispatchEventImpl(EventQueue.java:758)\n\tat java.awt.EventQueue.access$500(EventQueue.java:97)\n\tat java.awt.EventQueue$3.run(EventQueue.java:709)\n\tat java.awt.EventQueue$3.run(EventQueue.java:703)\n\tat java.security.AccessController.doPrivileged(Native Method)\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:74)\n\tat java.awt.EventQueue.dispatchEvent(EventQueue.java:728)\n\tat java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:205)\n\tat java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)\n\tat java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)\n\tat java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)\n\tat java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)\n\tat java.awt.EventDispatchThread.run(EventDispatchThread.java:82)\n\n```",
+    "labels": [
+      "Anomalie",
+      "IRD-2018-01-V8"
+    ],
+    "milestone": {
+      "id": 898778,
+      "iid": 143,
+      "projectId": 2722779,
+      "groupId": 0,
+      "title": "8.0-RC-3",
+      "description": "",
+      "dueDate": "Jul 2, 2019 2:00:00 AM",
+      "state": "closed"
+    },
+    "assignees": [
+      {
+        "_id": 166231,
+        "_username": "tchemit",
+        "_name": "Tony CHEMIT",
+        "_state": "active",
+        "_external": false,
+        "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
+      }
+    ],
+    "assignee": {
+      "_id": 166231,
+      "_username": "tchemit",
+      "_name": "Tony CHEMIT",
+      "_state": "active",
+      "_external": false,
+      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
+    },
+    "author": {
+      "_id": 166231,
+      "_username": "tchemit",
+      "_name": "Tony CHEMIT",
+      "_state": "active",
+      "_external": false,
+      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
+    },
+    "userNotesCount": 0,
+    "upVotes": 0,
+    "downVotes": 0,
+    "confidential": true,
+    "timeStats": {
+      "timeEstimate": 0,
+      "totalTimeSpent": 0
+    },
+    "state": "closed",
+    "updatedAt": "Jul 2, 2019 11:52:36 AM",
+    "createdAt": "Jul 2, 2019 11:45:16 AM",
+    "closedAt": "Jul 2, 2019 11:52:36 AM",
+    "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1340"
+  },
   {
     "id": 21873545,
     "iid": 1333,


=====================================
CHANGELOG.md
=====================================
@@ -1,7 +1,7 @@
 # ObServe changelog
 
  * Author [Tony Chemit](mailto:dev@tchemit.fr)
- * Last generated at 2019-07-02 09:52.
+ * Last generated at 2019-07-02 11:53.
 
 ## Version [8.0-RC-3](https://gitlab.com/ultreiaio/ird-observe/milestones/143)
 
@@ -15,6 +15,7 @@
   * [[Anomalie 1326]](https://gitlab.com/ultreiaio/ird-observe/issues/1326) **[PS FOB Buoys] Revoir cet écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
   * [[Anomalie 1330]](https://gitlab.com/ultreiaio/ird-observe/issues/1330) **N° de versions mentionnés par l'assistant migration** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
   * [[Anomalie 1331]](https://gitlab.com/ultreiaio/ird-observe/issues/1331) **Assistant création de base PG échoue** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Anomalie 1340]](https://gitlab.com/ultreiaio/ird-observe/issues/1340) **On ne peut pas sauvegarder une configuration d'un serveur distant en mode admin** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
   * [[Evolution 1145]](https://gitlab.com/ultreiaio/ird-observe/issues/1145) **L'assistant migration via serveur pourrait refuser de continuer si l'utilisateur n'est pas assez acrédité** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
   * [[Evolution 1293]](https://gitlab.com/ultreiaio/ird-observe/issues/1293) **Choix de nouvelles couleurs pour les symboles de la carte LL** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil)
   * [[Evolution 1321]](https://gitlab.com/ultreiaio/ird-observe/issues/1321) **[PS FOB] Mise en place des nouvelles templates de FOB** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)


=====================================
dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java
=====================================
@@ -48,7 +48,15 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
     @Override
     public void setValidation(String validation) {
         super.setValidation(validation);
-        boolean result = FormulaHelper.validateObjectMaterialValidation(validation, 10);
+        Object value = "10";
+        if (isBoolean()) {
+            value = Boolean.TRUE;
+        } else if (isInteger()) {
+            value = 10;
+        }else if (isFloat()) {
+            value = 10f;
+        }
+        boolean result = FormulaHelper.validateObjectMaterialValidationSyntax(validation, value);
         setValidationValid(result);
     }
 


=====================================
pom.xml
=====================================
@@ -156,7 +156,7 @@
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
 
-    <observeToolkitVersion>4.14</observeToolkitVersion>
+    <observeToolkitVersion>4.15-SNAPSHOT</observeToolkitVersion>
     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
     <!--can't use 1.4.197 (date has changed + blob also)-->
     <lib.version.h2>1.4.196</lib.version.h2>


=====================================
test/src/main/resources/fixtures/validate-service-referential.properties
=====================================
@@ -80,7 +80,7 @@ SpeciesFateDto=3
 WindDto=1
 SpeciesStatusDto=3
 VesselActivityLonglineDto=2
-ObjectMaterialDto=10
+ObjectMaterialDto=9
 LineTypeDto=3
 ProgramDto=9
 BaitTypeDto=3



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/86710b87afec9625c78bb52433c...

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

    

Tony CHEMIT

tags

participants (1)