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

Commits:

5 changed files:

Changes:

  • .mvn/gitlab-cache/milestones/898778-issues.json
    ... ... @@ -55,7 +55,7 @@
    55 55 
           "totalTimeSpent": 0
    56 56 
         },
    57 57 
         "state": "closed",
    58 
    -    "updatedAt": "Jul 2, 2019 9:38:33 AM",
    58 
    +    "updatedAt": "Jul 2, 2019 11:19:47 AM",
    59 59 
         "createdAt": "May 22, 2019 11:52:43 AM",
    60 60 
         "closedAt": "Jun 29, 2019 9:14:19 PM",
    61 61 
         "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1293"
    ... ... @@ -170,7 +170,7 @@
    170 170 
           "_external": false,
    171 171 
           "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d80\u0026d\u003didenticon"
    172 172 
         },
    173 
    -    "userNotesCount": 3,
    173 
    +    "userNotesCount": 4,
    174 174 
         "upVotes": 0,
    175 175 
         "downVotes": 0,
    176 176 
         "confidential": false,
    ... ... @@ -179,7 +179,7 @@
    179 179 
           "totalTimeSpent": 0
    180 180 
         },
    181 181 
         "state": "closed",
    182 
    -    "updatedAt": "Jun 12, 2019 1:00:39 PM",
    182 
    +    "updatedAt": "Jul 2, 2019 11:19:45 AM",
    183 183 
         "createdAt": "Jun 12, 2019 12:54:12 PM",
    184 184 
         "closedAt": "Jun 12, 2019 12:59:20 PM",
    185 185 
         "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1330"
    ... ... @@ -245,6 +245,66 @@
    245 245 
         "closedAt": "Jun 28, 2019 5:52:13 PM",
    246 246 
         "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1145"
    247 247 
       },
    248 
    +  {
    249 
    +    "id": 22439064,
    250 
    +    "iid": 1340,
    251 
    +    "projectId": 2722779,
    252 
    +    "title": "On ne peut pas sauvegarder une configuration d\u0027un serveur distant en mode admin",
    253 
    +    "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```",
    254 
    +    "labels": [
    255 
    +      "Anomalie",
    256 
    +      "IRD-2018-01-V8"
    257 
    +    ],
    258 
    +    "milestone": {
    259 
    +      "id": 898778,
    260 
    +      "iid": 143,
    261 
    +      "projectId": 2722779,
    262 
    +      "groupId": 0,
    263 
    +      "title": "8.0-RC-3",
    264 
    +      "description": "",
    265 
    +      "dueDate": "Jul 2, 2019 2:00:00 AM",
    266 
    +      "state": "closed"
    267 
    +    },
    268 
    +    "assignees": [
    269 
    +      {
    270 
    +        "_id": 166231,
    271 
    +        "_username": "tchemit",
    272 
    +        "_name": "Tony CHEMIT",
    273 
    +        "_state": "active",
    274 
    +        "_external": false,
    275 
    +        "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
    276 
    +      }
    277 
    +    ],
    278 
    +    "assignee": {
    279 
    +      "_id": 166231,
    280 
    +      "_username": "tchemit",
    281 
    +      "_name": "Tony CHEMIT",
    282 
    +      "_state": "active",
    283 
    +      "_external": false,
    284 
    +      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
    285 
    +    },
    286 
    +    "author": {
    287 
    +      "_id": 166231,
    288 
    +      "_username": "tchemit",
    289 
    +      "_name": "Tony CHEMIT",
    290 
    +      "_state": "active",
    291 
    +      "_external": false,
    292 
    +      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
    293 
    +    },
    294 
    +    "userNotesCount": 0,
    295 
    +    "upVotes": 0,
    296 
    +    "downVotes": 0,
    297 
    +    "confidential": true,
    298 
    +    "timeStats": {
    299 
    +      "timeEstimate": 0,
    300 
    +      "totalTimeSpent": 0
    301 
    +    },
    302 
    +    "state": "closed",
    303 
    +    "updatedAt": "Jul 2, 2019 11:52:36 AM",
    304 
    +    "createdAt": "Jul 2, 2019 11:45:16 AM",
    305 
    +    "closedAt": "Jul 2, 2019 11:52:36 AM",
    306 
    +    "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1340"
    307 
    +  },
    248 308 
       {
    249 309 
         "id": 21873545,
    250 310 
         "iid": 1333,

  • CHANGELOG.md
    1 1 
     # ObServe changelog
    2 2
    3 3 
      * Author [Tony Chemit](mailto:dev@tchemit.fr)
    4 
    - * Last generated at 2019-07-02 09:52.
    4 
    + * Last generated at 2019-07-02 11:53.
    5 5
    6 6 
     ## Version [8.0-RC-3](https://gitlab.com/ultreiaio/ird-observe/milestones/143)
    7 7
    ... ... @@ -15,6 +15,7 @@
    15 15 
       * [[Anomalie 1326]](https://gitlab.com/ultreiaio/ird-observe/issues/1326) **[PS FOB Buoys] Revoir cet écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
    16 16 
       * [[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)
    17 17 
       * [[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)
    18 
    +  * [[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)
    18 19 
       * [[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)
    19 20 
       * [[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)
    20 21 
       * [[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 {
    48 48 
         @Override
    49 49 
         public void setValidation(String validation) {
    50 50 
             super.setValidation(validation);
    51 
    -        boolean result = FormulaHelper.validateObjectMaterialValidation(validation, 10);
    51 
    +        Object value = "10";
    52 
    +        if (isBoolean()) {
    53 
    +            value = Boolean.TRUE;
    54 
    +        } else if (isInteger()) {
    55 
    +            value = 10;
    56 
    +        }else if (isFloat()) {
    57 
    +            value = 10f;
    58 
    +        }
    59 
    +        boolean result = FormulaHelper.validateObjectMaterialValidationSyntax(validation, value);
    52 60 
             setValidationValid(result);
    53 61 
         }
    54 62

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

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.