Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe

Commits:

24 changed files:

Changes:

  • .mvn/gitlab-cache/milestones/644883-artifacts.json
    1 
    +[
    2 
    +  {
    3 
    +    "name": "Application",
    4 
    +    "filename": "observe-7.0-RC-19.zip",
    5 
    +    "url": "https://ultreia.io/release/observe-7.0-RC-19.zip"
    6 
    +  },
    7 
    +  {
    8 
    +    "name": "Serveur",
    9 
    +    "filename": "observe-7.0-RC-19.war",
    10 
    +    "url": "https://ultreia.io/release/observe-7.0-RC-19.war"
    11 
    +  }
    12 
    +]
    \ No newline at end of file

  • .mvn/gitlab-cache/milestones/644883-issues.json
    1 
    +[
    2 
    +  {
    3 
    +    "id": 13673624,
    4 
    +    "iid": 1038,
    5 
    +    "projectId": 2722779,
    6 
    +    "title": "[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés",
    7 
    +    "description": "Idéalement, on nous demande des racourcis clavier supplémentaires sur les flêches \u003c- et -\u003e du formaulaire PS systèmes observés :\n\n![image](/uploads/236e6a93607d63560815a257519b7a32/image.png)\n\nEffectivement cela pourrait pas mal fluidifier l\u0027ajout d\u0027éléments.",
    8 
    +    "labels": [
    9 
    +      "Bas",
    10 
    +      "Contrat Code Lutin-2016",
    11 
    +      "Evolution"
    12 
    +    ],
    13 
    +    "milestone": {
    14 
    +      "id": 644883,
    15 
    +      "iid": 122,
    16 
    +      "projectId": 2722779,
    17 
    +      "groupId": 0,
    18 
    +      "title": "7.0-RC-19",
    19 
    +      "description": "",
    20 
    +      "dueDate": "Sep 16, 2018 12:00:00 AM",
    21 
    +      "startDate": "Sep 14, 2018 12:00:00 AM",
    22 
    +      "state": "closed"
    23 
    +    },
    24 
    +    "assignee": {
    25 
    +      "_id": 166231,
    26 
    +      "_username": "tchemit",
    27 
    +      "_name": "Tony CHEMIT",
    28 
    +      "_state": "active",
    29 
    +      "_darkScheme": false,
    30 
    +      "_isAdmin": false,
    31 
    +      "_canCreateGroup": false,
    32 
    +      "_canCreateProject": false,
    33 
    +      "_canCreateTeam": false,
    34 
    +      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
    35 
    +    },
    36 
    +    "author": {
    37 
    +      "_id": 1111318,
    38 
    +      "_username": "pcauquil",
    39 
    +      "_name": "Pascal Cauquil",
    40 
    +      "_state": "active",
    41 
    +      "_darkScheme": false,
    42 
    +      "_isAdmin": false,
    43 
    +      "_canCreateGroup": false,
    44 
    +      "_canCreateProject": false,
    45 
    +      "_canCreateTeam": false,
    46 
    +      "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d80\u0026d\u003didenticon"
    47 
    +    },
    48 
    +    "state": "closed",
    49 
    +    "updatedAt": "Sep 16, 2018 3:10:02 PM",
    50 
    +    "createdAt": "Aug 24, 2018 10:25:25 AM"
    51 
    +  }
    52 
    +]
    \ No newline at end of file

  • .mvn/gitlab-cache/milestones/644883.json
    1 
    +{
    2 
    +  "id": 644883,
    3 
    +  "iid": 122,
    4 
    +  "projectId": 2722779,
    5 
    +  "groupId": 0,
    6 
    +  "title": "7.0-RC-19",
    7 
    +  "description": "",
    8 
    +  "dueDate": "Sep 16, 2018 12:00:00 AM",
    9 
    +  "startDate": "Sep 14, 2018 12:00:00 AM",
    10 
    +  "state": "closed"
    11 
    +}
    \ No newline at end of file

  • CHANGELOG.md
    1 1 
     # ObServe changelog
    2 2
    3 3 
      * Author [Tony Chemit](mailto:dev@tchemit.fr)
    4 
    - * Last generated at 2018-09-12 17:47.
    4 
    + * Last generated at 2018-09-16 15:11.
    5 5
    6 6 
     ## Version [8.0-alpha-2](https://gitlab.com/ultreiaio/ird-observe/milestones/113)
    7 7 
     Second lot du contrat IRD-2018-01-V8
    ... ... @@ -48,6 +48,17 @@ Premier lot du contrat IRD-2018-01-V8
    48 48 
       * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
    49 49 
       * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
    50 50
    51 
    +## Version [7.0-RC-19](https://gitlab.com/ultreiaio/ird-observe/milestones/122)
    52 
    +
    53 
    +**Closed at 2018-09-16.**
    54 
    +
    55 
    +### Download
    56 
    +* [Application (observe-7.0-RC-19.zip)](https://ultreia.io/release/observe-7.0-RC-19.zip)
    57 
    +* [Serveur (observe-7.0-RC-19.war)](https://ultreia.io/release/observe-7.0-RC-19.war)
    58 
    +
    59 
    +### Issues
    60 
    +  * [[Evolution 1038]](https://gitlab.com/ultreiaio/ird-observe/issues/1038) **[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    61 
    +
    51 62 
     ## Version [7.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/milestones/121)
    52 63
    53 64 
     **Closed at 2018-09-12.**

  • client-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-configuration</artifactId>

  • client-configuration/src/main/resources/log4j2.xml
    ... ... @@ -49,6 +49,10 @@
    49 49 
           <AppenderRef ref="console"/>
    50 50 
           <AppenderRef ref="File"/>
    51 51 
         </Logger>
    52 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    53 
    +      <AppenderRef ref="console"/>
    54 
    +      <AppenderRef ref="File"/>
    55 
    +    </Logger>
    52 56 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    53 57 
           <AppenderRef ref="console"/>
    54 58 
           <AppenderRef ref="File"/>

  • client-configuration/src/main/resources/observe-log4j2.xml
    ... ... @@ -49,6 +49,10 @@
    49 49 
           <AppenderRef ref="console"/>
    50 50 
           <AppenderRef ref="File"/>
    51 51 
         </Logger>
    52 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    53 
    +      <AppenderRef ref="console"/>
    54 
    +      <AppenderRef ref="File"/>
    55 
    +    </Logger>
    52 56 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    53 57 
           <AppenderRef ref="console"/>
    54 58 
           <AppenderRef ref="File"/>

  • client/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client</artifactId>

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
    ... ... @@ -87,6 +87,7 @@ JToolBar {
    87 87 
       actionIcon:combobox-reset2;
    88 88 
       toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip";
    89 89 
       enabled:{model.getDefaultSizeMeasureType() != null};
    90 
    +  focusable:false;
    90 91 
     }
    91 92
    92 93 
     #length {

  • dto/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-18</version>
    30 
    +    <version>7.0-RC-19</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>dto</artifactId>

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ deleted
    1 
    -package fr.ird.observe.dto.decoration.decorators;
    2 
    -
    3 
    -<<<<<<< HEAD
    4 
    -=======
    5 
    -/*-
    6 
    - * #%L
    7 
    - * ObServe :: Dto
    8 
    - * %%
    9 
    - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    10 
    - * %%
    11 
    - * This program is free software: you can redistribute it and/or modify
    12 
    - * it under the terms of the GNU General Public License as
    13 
    - * published by the Free Software Foundation, either version 3 of the
    14 
    - * License, or (at your option) any later version.
    15 
    - *
    16 
    - * This program is distributed in the hope that it will be useful,
    17 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    18 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19 
    - * GNU General Public License for more details.
    20 
    - *
    21 
    - * You should have received a copy of the GNU General Public
    22 
    - * License along with this program.  If not, see
    23 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    24 
    - * #L%
    25 
    - */
    26 
    -
    27 
    ->>>>>>> refs/heads/master-7.x
    28 
    -import fr.ird.observe.dto.referential.GearCaracteristicDto;
    29 
    -
    30 
    -import static org.nuiton.i18n.I18n.t;
    31 
    -
    32 
    -/**
    33 
    - * Created by tchemit on 13/06/2018.
    34 
    - *
    35 
    - * @author Tony Chemit - dev@tchemit.fr
    36 
    - */
    37 
    -public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> {
    38 
    -
    39 
    -    public GearCaracteristicDtoDecorator(String libelle) {
    40 
    -        super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " ");
    41 
    -    }
    42 
    -
    43 
    -    @Override
    44 
    -    protected Comparable<?> getDefaultNullValue(String token) {
    45 
    -        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
    46 
    -        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
    47 
    -            return t("observe.common.no.unit");
    48 
    -        }
    49 
    -        return defaultNullValue;
    50 
    -    }
    51 
    -}

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ deleted
    1 
    -package fr.ird.observe.dto.decoration.decorators;
    2 
    -
    3 
    -<<<<<<< HEAD
    4 
    -=======
    5 
    -/*-
    6 
    - * #%L
    7 
    - * ObServe :: Dto
    8 
    - * %%
    9 
    - * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    10 
    - * %%
    11 
    - * This program is free software: you can redistribute it and/or modify
    12 
    - * it under the terms of the GNU General Public License as
    13 
    - * published by the Free Software Foundation, either version 3 of the
    14 
    - * License, or (at your option) any later version.
    15 
    - *
    16 
    - * This program is distributed in the hope that it will be useful,
    17 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    18 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    19 
    - * GNU General Public License for more details.
    20 
    - *
    21 
    - * You should have received a copy of the GNU General Public
    22 
    - * License along with this program.  If not, see
    23 
    - * <http://www.gnu.org/licenses/gpl-3.0.html>.
    24 
    - * #L%
    25 
    - */
    26 
    -
    27 
    ->>>>>>> refs/heads/master-7.x
    28 
    -import fr.ird.observe.dto.referential.GearCaracteristicDto;
    29 
    -import fr.ird.observe.dto.referential.GearCaracteristicReference;
    30 
    -
    31 
    -import static org.nuiton.i18n.I18n.t;
    32 
    -
    33 
    -/**
    34 
    - * Created by tchemit on 13/06/2018.
    35 
    - *
    36 
    - * @author Tony Chemit - dev@tchemit.fr
    37 
    - */
    38 
    -public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> {
    39 
    -    public GeatCaracteristicReferenceDecorator( ) {
    40 
    -        super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s");
    41 
    -    }
    42 
    -
    43 
    -    @Override
    44 
    -    protected Comparable<?> getDefaultNullValue(String token) {
    45 
    -        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
    46 
    -        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
    47 
    -            return t("observe.common.no.unit");
    48 
    -        }
    49 
    -        return defaultNullValue;
    50 
    -    }
    51 
    -}

  • observe/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>observe</artifactId>

  • persistence/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>persistence</artifactId>

  • pom.xml
    ... ... @@ -26,12 +26,12 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.50</version>
    29 
    +    <version>2018.51</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    33 33 
       <artifactId>ird-observe</artifactId>
    34 
    -  <version>7.0-RC-18</version>
    34 
    +  <version>7.0-RC-19</version>
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe :: Pom</name>
    ... ... @@ -153,10 +153,10 @@
    153 153 
         <buildDate>${maven.build.timestamp}</buildDate>
    154 154
    155 155 
         <observeToolkitVersion>3.7.4</observeToolkitVersion>
    156 
    -    <!--<lib.version.java4all.jaxx>3.0-alpha-33-SNAPSHOT</lib.version.java4all.jaxx>-->
    156 
    +    <lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>
    157 157 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    158 158 
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    159 
    -    <xworkVersion>2.3.34</xworkVersion>
    159 
    +    <xworkVersion>2.3.35</xworkVersion>
    160 160 
         <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
    161 161 
         <!--can't use 1.4.197 (date has changed + blob also-->
    162 162 
         <lib.version.h2>1.4.196</lib.version.h2>

  • server-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>server-configuration</artifactId>

  • server-configuration/src/main/resources/log4j2.xml
    ... ... @@ -34,6 +34,9 @@
    34 34 
         <Logger name="org.nuiton" level="warn" additivity="false">
    35 35 
           <AppenderRef ref="console"/>
    36 36 
         </Logger>
    37 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    38 
    +      <AppenderRef ref="console"/>
    39 
    +    </Logger>
    37 40 
         <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
    38 41 
           <AppenderRef ref="console"/>
    39 42 
         </Logger>

  • server-configuration/src/main/resources/observeweb-log4j2.xml
    ... ... @@ -42,7 +42,11 @@
    42 42 
           <AppenderRef ref="console"/>
    43 43 
           <AppenderRef ref="File"/>
    44 44 
         </Logger>
    45 
    -    <Logger name="org.nuiton" level="info" additivity="false">
    45 
    +    <Logger name="org.nuiton" level="warn" additivity="false">
    46 
    +      <AppenderRef ref="console"/>
    47 
    +      <AppenderRef ref="File"/>
    48 
    +    </Logger>
    49 
    +    <Logger name="org.nuiton.topia" level="info" additivity="false">
    46 50 
           <AppenderRef ref="console"/>
    47 51 
           <AppenderRef ref="File"/>
    48 52 
         </Logger>

  • server/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-18</version>
    30 
    +    <version>7.0-RC-19</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>server</artifactId>

  • services-client/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-18</version>
    30 
    +    <version>7.0-RC-19</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-client</artifactId>

  • services-local/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-18</version>
    30 
    +    <version>7.0-RC-19</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-local</artifactId>

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-18</version>
    30 
    +    <version>7.0-RC-19</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services</artifactId>

  • test/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>test</artifactId>

  • validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-18</version>
    29 
    +    <version>7.0-RC-19</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>validation</artifactId>

    • —
    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.