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

Commits:

8 changed files:

Changes:

  • client/datasource/actions/src/main/i18n/templates/validationReport_en_GB.ftl
    ... ... @@ -163,6 +163,11 @@
    163 163 
             ul.messages {
    164 164 
                 list-style-type: none;
    165 165 
             }
    166 
    +
    167 
    +        .action {
    168 
    +            cursor: pointer;
    169 
    +            user-select: none;
    170 
    +        }
    166 171 
         </style>
    167 172 
     </head>
    168 173 
     <body>
    ... ... @@ -191,6 +196,8 @@
    191 196 
     <div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div>
    192 197 
     <div class="information">A click on a id will select it automatically.</div>
    193 198 
     <br/>
    199 
    +<div class="information">To expand all, click on the following icon: <span id="expandAll" class="caretSymbol action"></span>.</div>
    200 
    +<div class="information">To collapse all, click on the following icon: <span id="collapseAll" class="caret-down action"></span>.</div>
    194 201 
     <#assign rootNode = .data_model.rootNode />
    195 202 
     <ul id="result">
    196 203 
         <#list rootNode.getChildren() as node>
    ... ... @@ -230,10 +237,22 @@
    230 237 
                     }
    231 238 
                 }
    232 239 
             });
    233 
    -        <#if .data_model.modelMode.name() == "REFERENTIEL">
    234 
    -        caret.click();
    235 
    -        </#if>
    236 240 
         }
    241 
    +    let collapseAll = document.getElementById("collapseAll");
    242 
    +    collapseAll.addEventListener("click", function (event) {
    243 
    +        for (const caret of document.getElementsByClassName("caret")) {
    244 
    +            collapse(caret);
    245 
    +        }
    246 
    +    });
    247 
    +    let expandAll = document.getElementById("expandAll");
    248 
    +    expandAll.addEventListener("click", function (event) {
    249 
    +        for (const caret of document.getElementsByClassName("caret")) {
    250 
    +            expand(caret);
    251 
    +        }
    252 
    +    });
    253 
    +    <#if .data_model.modelMode.name() == "REFERENTIEL">
    254 
    +    expandAll.click();
    255 
    +    </#if>
    237 256 
         for (const caret of document.getElementsByClassName("leaf")) {
    238 257 
             let element = caret.parentElement.querySelector(".nested");
    239 258 
             if (element != null) {

  • client/datasource/actions/src/main/i18n/templates/validationReport_es_ES.ftl
    ... ... @@ -26,8 +26,9 @@
    26 26 
         <#assign withMessages = node.messagesCount != 0 />
    27 27 
         <li>
    28 28 
             <span id="${node.id}" class="<#if withChildren>caret<#else>leaf</#if>"></span>
    29 
    -        <span class="datum">${node.label}</span> <#if node.id?starts_with("fr.ird.referential") || node.id?starts_with("fr.ird.data") > - <span
    30 
    -                class="topiaId">${node.id}</span></#if>
    29 
    +        <span class="datum">${node.label}</span> <#if node.id?starts_with("fr.ird.referential") || node.id?starts_with("fr.ird.data") > -
    30 
    +            <span
    31 
    +                    class="topiaId">${node.id}</span></#if>
    31 32 
             <#if withChildren || withMessages>
    32 33 
                 <ul class="nested">
    33 34 
                     <#if withMessages>
    ... ... @@ -90,6 +91,7 @@
    90 91 
                 display: inline-block;
    91 92 
                 margin-right: 6px;
    92 93 
             }
    94 
    +
    93 95 
             .leaf {
    94 96 
                 margin-top: 6px;
    95 97 
             }
    ... ... @@ -163,6 +165,11 @@
    163 165 
             ul.messages {
    164 166 
                 list-style-type: none;
    165 167 
             }
    168 
    +
    169 
    +        .action {
    170 
    +            cursor: pointer;
    171 
    +            user-select: none;
    172 
    +        }
    166 173 
         </style>
    167 174 
     </head>
    168 175 
     <body>
    ... ... @@ -179,19 +186,34 @@
    179 186 
                 <span class="<#if scope.name() == "ERROR">error<#else>warning</#if>">${scope.label}</span>
    180 187 
             </#list>
    181 188 
         </li>
    182 
    -    <li>Velocidad máxima autorizada en el control de las velocidades de las actividades: ${.data_model.validationSpeedMaxValue}</li>
    183 
    -    <li>Forzar la validación de las velocidades de las actividades: ${.data_model.validationSpeedEnable?string("yes", "no")}</li>
    184 
    -    <li>Forzar la validación de la talla de especies min/max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li>
    185 
    -    <li>Para que la utilización de referenciales obsoletos sea autorizado (se advertirá en los mensajes de validación): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li>
    189 
    +    <li>Velocidad máxima autorizada en el control de las velocidades de las
    190 
    +        actividades: ${.data_model.validationSpeedMaxValue}</li>
    191 
    +    <li>Forzar la validación de las velocidades de las
    192 
    +        actividades: ${.data_model.validationSpeedEnable?string("yes", "no")}</li>
    193 
    +    <li>Forzar la validación de la talla de especies
    194 
    +        min/max: ${.data_model.validationLengthWeightEnable?string("yes", "no")}</li>
    195 
    +    <li>Para que la utilización de referenciales obsoletos sea autorizado (se advertirá en los mensajes de
    196 
    +        validación): ${.data_model.validationUseDisabledReferential?string("yes", "no")}</li>
    186 197 
         <li>Diccionario de sistemas observados requeridos por especies en la modalidad de cerco: ...</li>
    187 198 
     </ul>
    188 199
    189 200 
     <h2>Results</h2>
    190 201 
     <h3>Notes</h3>
    191 
    -<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b> will also expand his inner sub-tree).</div>
    192 
    -<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b> will also collapse his inner sub-tree).</div>
    202 
    +<div class="information">To expand a node, click on icon <span class="caretSymbol"></span> (Combination with key <b>Shift</b>
    203 
    +    will also expand his inner sub-tree).
    204 
    +</div>
    205 
    +<div class="information">To collapse a note, click on icon <span class="caret-down"></span> (Combination with key <b>Shift</b>
    206 
    +    will also collapse his inner sub-tree).
    207 
    +</div>
    193 208 
     <div class="information">A click on a id will select it automatically.</div>
    194 209 
     <br/>
    210 
    +<div class="information">To expand all, click on the following icon: <span id="expandAll"
    211 
    +                                                                           class="caretSymbol action"></span>.
    212 
    +</div>
    213 
    +<div class="information">To collapse all, click on the following icon: <span id="collapseAll"
    214 
    +                                                                             class="caret-down action"></span>.
    215 
    +</div>
    216 
    +
    195 217 
     <#assign rootNode = .data_model.rootNode />
    196 218 
     <ul id="result">
    197 219 
         <#list rootNode.getChildren() as node>
    ... ... @@ -231,10 +253,22 @@
    231 253 
                     }
    232 254 
                 }
    233 255 
             });
    234 
    -        <#if .data_model.modelMode.name() == "REFERENTIEL">
    235 
    -        caret.click();
    236 
    -        </#if>
    237 256 
         }
    257 
    +    let collapseAll = document.getElementById("collapseAll");
    258 
    +    collapseAll.addEventListener("click", function (event) {
    259 
    +        for (const caret of document.getElementsByClassName("caret")) {
    260 
    +            collapse(caret);
    261 
    +        }
    262 
    +    });
    263 
    +    let expandAll = document.getElementById("expandAll");
    264 
    +    expandAll.addEventListener("click", function (event) {
    265 
    +        for (const caret of document.getElementsByClassName("caret")) {
    266 
    +            expand(caret);
    267 
    +        }
    268 
    +    });
    269 
    +    <#if .data_model.modelMode.name() == "REFERENTIEL">
    270 
    +    expandAll.click();
    271 
    +    </#if>
    238 272 
         for (const caret of document.getElementsByClassName("leaf")) {
    239 273 
             let element = caret.parentElement.querySelector(".nested");
    240 274 
             if (element != null) {

  • client/datasource/actions/src/main/i18n/templates/validationReport_fr_FR.ftl
    ... ... @@ -164,6 +164,10 @@
    164 164 
             ul.messages {
    165 165 
                 list-style-type: none;
    166 166 
             }
    167 
    +        .action {
    168 
    +            cursor: pointer;
    169 
    +            user-select: none;
    170 
    +        }
    167 171 
         </style>
    168 172 
     </head>
    169 173 
     <body>
    ... ... @@ -192,6 +196,8 @@
    192 196 
     <div class="information">Pour replier un nœud, cliquez sur l'icone <span class="caret-down"></span> (la combinaison avec la touche <b>Maj</b> effectue l'action sur le sous-arbre constitué de ses fils).</div>
    193 197 
     <div class="information">Un clic sur un identifiant le sélectionne automatiquement.</div>
    194 198 
     <br/>
    199 
    +<div class="information">Pour tout déplier, cliquez sur l'icone suivant : <span id="expandAll" class="caretSymbol action"></span>.</div>
    200 
    +<div class="information">Pour tout replier, cliquez sur l'icone suivant : <span id="collapseAll" class="caret-down action"></span>.</div>
    195 201 
     <#assign rootNode = .data_model.rootNode />
    196 202 
     <ul id="result">
    197 203 
         <#list rootNode.getChildren() as node>
    ... ... @@ -220,7 +226,6 @@
    220 226 
                 expand(node);
    221 227 
             }
    222 228 
         }
    223 
    -
    224 229 
         for (const caret of document.getElementsByClassName("caret")) {
    225 230 
             caret.addEventListener("click", function (event) {
    226 231 
                 let expanded = this.classList.contains("caret-down");
    ... ... @@ -234,10 +239,22 @@
    234 239 
                     }
    235 240 
                 }
    236 241 
             });
    237 
    -        <#if .data_model.modelMode.name() == "REFERENTIEL">
    238 
    -        caret.click();
    239 
    -        </#if>
    240 242 
         }
    243 
    +    let collapseAll = document.getElementById("collapseAll");
    244 
    +    collapseAll.addEventListener("click", function (event) {
    245 
    +        for (const caret of document.getElementsByClassName("caret")) {
    246 
    +            collapse(caret);
    247 
    +        }
    248 
    +    });
    249 
    +    let expandAll = document.getElementById("expandAll");
    250 
    +    expandAll.addEventListener("click", function (event) {
    251 
    +        for (const caret of document.getElementsByClassName("caret")) {
    252 
    +            expand(caret);
    253 
    +        }
    254 
    +    });
    255 
    +    <#if .data_model.modelMode.name() == "REFERENTIEL">
    256 
    +    expandAll.click();
    257 
    +    </#if>
    241 258 
         for (const caret of document.getElementsByClassName("leaf")) {
    242 259 
             let element = caret.parentElement.querySelector(".nested");
    243 260 
             if (element != null) {

  • core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java
    ... ... @@ -125,6 +125,10 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe
    125 125 
             }
    126 126 
             // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2765
    127 127 
             addNewTable(executor, withIds, "12_01_issue-2765", "table-common_gear_associations");
    128 
    +        if (withIds) {
    129 
    +            // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2787
    130 
    +            executor.addScript("13", "issue-2787");
    131 
    +        }
    128 132
    129 133 
         }
    130 134

  • core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe Core :: Persistence :: Migration
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    22 
    +-- add caracteristic 27
    23 
    +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'),
    24 
    +
    25 
    +-- add characteristic (4, 5, 15 and 27) to gear 2
    26 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    27 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    28 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    29 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    30 
    +
    31 
    +-- add characteristic (4, 5, 15 and 27) to gear 3
    32 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    33 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    34 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    35 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    36 
    +
    37 
    +-- add characteristic (4, 5, 15 and 27) to gear 4
    38 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    39 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    40 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    41 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    42 
    +
    43 
    +-- add characteristic (4, 5, 15 and 27) to gear 5
    44 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    45 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    46 
    +-- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    47 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    48 
    +
    49 
    +-- add characteristic (4, 5, 15 and 27) to gear 6
    50 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    51 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    52 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    53 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    54 
    +
    55 
    +-- add characteristic (4, 5, 15 and 27) to gear 32
    56 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    57 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    58 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    59 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#32', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    60 
    +
    61 
    +-- add characteristic (4, 5, 15 and 27) to gear 34
    62 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    63 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    64 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    65 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#34', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    66 
    +
    67 
    +-- add characteristic (4, 5, 15 and 27) to gear 35
    68 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    69 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    70 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    71 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#35', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    72 
    +
    73 
    +-- add characteristic (4, 5, 15 and 27) to gear 36
    74 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    75 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    76 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    77 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#36', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    78 
    +
    79 
    +-- add characteristic (4, 5, 15 and 27) to gear 37
    80 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    81 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    82 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    83 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1464000000000#37', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');

  • core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties
    ... ... @@ -23,7 +23,7 @@ common.country=91
    23 23 
     common.dataQuality=5
    24 24 
     common.fpaZone=45
    25 25 
     common.gear=38
    26 
    -common.gearCharacteristic=46
    26 
    +common.gearCharacteristic=47
    27 27 
     common.gearCharacteristicListItem=220
    28 28 
     common.gearCharacteristicType=8
    29 29 
     common.harbour=98
    ... ... @@ -114,7 +114,7 @@ ps_observation.reasonForDiscard=5
    114 114 
     ps_observation.speciesStatus=6
    115 115 
     ps_observation.surroundingActivity=8
    116 116
    117 
    -common.gear_allowedGearCharacteristic=43
    117 
    +common.gear_allowedGearCharacteristic=82
    118 118 
     common.gear_defaultGearCharacteristic=39
    119 119 
     common.species_ocean=553
    120 120 
     common.speciesGroup_speciesGroupReleaseMode=19

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json
    ... ... @@ -4387,6 +4387,22 @@
    4387 4387 
             }
    4388 4388 
           ]
    4389 4389 
         },
    4390 
    +    {
    4391 
    +      "datum": {
    4392 
    +        "text": "27##Puissance électrique##kW",
    4393 
    +        "type": "fr.ird.observe.dto.referential.common.GearCharacteristicDto",
    4394 
    +        "id": "fr.ird.referential.common.GearCharacteristic#1464000000000#027",
    4395 
    +        "topiaVersion": 0,
    4396 
    +        "lastUpdateDate": "2023-09-01T00:00:00.000Z"
    4397 
    +      },
    4398 
    +      "messages": [
    4399 
    +        {
    4400 
    +          "fieldName": "uri",
    4401 
    +          "scope": "WARNING",
    4402 
    +          "message": "Le champ n'est pas renseigné."
    4403 
    +        }
    4404 
    +      ]
    4405 
    +    },
    4390 4406 
         {
    4391 4407 
           "datum": {
    4392 4408 
             "text": "FURUNO - CI-30##001_001",

  • model/src/main/resources/fixtures/global.properties
    ... ... @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68
    25 25 
     ENTITIES_LIMIT_SIZE=100
    26 26 
     # fr.ird.observe.services.service.referential.ReferentialService
    27 27 
     # fr.ird.observe.services.local.service.referential.DifferentialModelTest
    28 
    -REFERENTIAL_COUNT=4356
    28 
    +REFERENTIAL_COUNT=4357

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help