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

Commits:

20 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
    ... ... @@ -26,7 +26,7 @@ import com.google.common.collect.Lists;
    26 26 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    27 27 
     import fr.ird.observe.client.constants.AcquisitionMode;
    28 28 
     import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel;
    29 
    -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler;
    29 
    +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler;
    30 30 
     import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy;
    31 31 
     import fr.ird.observe.client.ui.util.UIHelper;
    32 32 
     import fr.ird.observe.dto.data.longline.SampleLogbookDto;
    ... ... @@ -57,7 +57,7 @@ import static org.nuiton.i18n.I18n.n;
    57 57 
      * @author Tony Chemit - dev@tchemit.fr
    58 58 
      * @since 3.7
    59 59 
      */
    60 
    -public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> {
    60 
    +public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> {
    61 61
    62 62 
         private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class);
    63 63 
         private final PropertyChangeListener speciesChanged;
    ... ... @@ -76,7 +76,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb
    76 76 
                 ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook()));
    77 77 
             } else {
    78 78 
                 ui.setContextValue(new SamplePartLogbookUIModel(ui));
    79 
    -
    80 79 
             }
    81 80 
         }
    82 81
    ... ... @@ -202,16 +201,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb
    202 201
    203 202 
         }
    204 203
    205 
    -    @Override
    206 
    -    public void doPersist(SampleLogbookDto bean) {
    207 
    -        // fait par le doSave de LonglineGlobalCompositionLogbookUIHandler
    208 
    -    }
    209 
    -
    210 
    -    @Override
    211 
    -    protected void loadEditBean(String beanId) {
    212 
    -        // fait par le parent
    213 
    -    }
    214 
    -
    215 204 
         private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) {
    216 205 
             Optional<SizeMeasureTypeReference> result = Optional.empty();
    217 206 
             if (species != null) {

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -91,7 +91,7 @@
    91 91
    92 92 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    93 93 
         <field-validator type="required" short-circuit="true">
    94 
    -      <message>observe.validation.activity.required.quadrant</message>
    94 
    +      <message>observe.validation.required.quadrant</message>
    95 95 
         </field-validator>
    96 96
    97 97 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -108,7 +108,7 @@
    108 108
    109 109 
         <!-- latitude obligatoire -->
    110 110 
         <field-validator type="required" short-circuit="true">
    111 
    -      <message>observe.validation.activity.required.latitude</message>
    111 
    +      <message>observe.validation.required.latitude</message>
    112 112 
         </field-validator>
    113 113
    114 114 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -122,7 +122,7 @@
    122 122
    123 123 
         <!-- longitude obligatoire -->
    124 124 
         <field-validator type="required" short-circuit="true">
    125 
    -      <message>observe.validation.activity.required.longitude</message>
    125 
    +      <message>observe.validation.required.longitude</message>
    126 126 
         </field-validator>
    127 127
    128 128 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -76,7 +76,7 @@
    76 76
    77 77 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    78 78 
         <field-validator type="required" short-circuit="true">
    79 
    -      <message>observe.validation.activity.required.quadrant</message>
    79 
    +      <message>observe.validation.required.quadrant</message>
    80 80 
         </field-validator>
    81 81
    82 82 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -93,7 +93,7 @@
    93 93
    94 94 
         <!-- latitude obligatoire  -->
    95 95 
         <field-validator type="required" short-circuit="true">
    96 
    -      <message>observe.validation.activity.required.latitude</message>
    96 
    +      <message>observe.validation.required.latitude</message>
    97 97 
         </field-validator>
    98 98
    99 99 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -107,7 +107,7 @@
    107 107
    108 108 
         <!-- longitude obligatoire -->
    109 109 
         <field-validator type="required" short-circuit="true">
    110 
    -      <message>observe.validation.activity.required.longitude</message>
    110 
    +      <message>observe.validation.required.longitude</message>
    111 111 
         </field-validator>
    112 112
    113 113 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
    ... ... @@ -92,7 +92,7 @@
    92 92
    93 93 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    94 94 
         <field-validator type="required" short-circuit="true">
    95 
    -      <message>observe.validation.activity.required.quadrant</message>
    95 
    +      <message>observe.validation.required.quadrant</message>
    96 96 
         </field-validator>
    97 97
    98 98 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -109,7 +109,7 @@
    109 109
    110 110 
         <!-- latitude obligatoire -->
    111 111 
         <field-validator type="required" short-circuit="true">
    112 
    -      <message>observe.validation.activity.required.latitude</message>
    112 
    +      <message>observe.validation.required.latitude</message>
    113 113 
         </field-validator>
    114 114
    115 115 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -123,7 +123,7 @@
    123 123
    124 124 
         <!-- longitude obligatoire -->
    125 125 
         <field-validator type="required" short-circuit="true">
    126 
    -      <message>observe.validation.activity.required.longitude</message>
    126 
    +      <message>observe.validation.required.longitude</message>
    127 127 
         </field-validator>
    128 128
    129 129 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
    ... ... @@ -77,7 +77,7 @@
    77 77
    78 78 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    79 79 
         <field-validator type="required" short-circuit="true">
    80 
    -      <message>observe.validation.activity.required.quadrant</message>
    80 
    +      <message>observe.validation.required.quadrant</message>
    81 81 
         </field-validator>
    82 82
    83 83 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -94,7 +94,7 @@
    94 94
    95 95 
         <!-- latitude obligatoire  -->
    96 96 
         <field-validator type="required" short-circuit="true">
    97 
    -      <message>observe.validation.activity.required.latitude</message>
    97 
    +      <message>observe.validation.required.latitude</message>
    98 98 
         </field-validator>
    99 99
    100 100 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -108,7 +108,7 @@
    108 108
    109 109 
         <!-- longitude obligatoire -->
    110 110 
         <field-validator type="required" short-circuit="true">
    111 
    -      <message>observe.validation.activity.required.longitude</message>
    111 
    +      <message>observe.validation.required.longitude</message>
    112 112 
         </field-validator>
    113 113
    114 114 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
    ... ... @@ -35,8 +35,11 @@
    35 35
    36 36 
       <field name="quadrant">
    37 37
    38 
    -    <field-validator type="required" short-circuit="true">
    39 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    38 
    +    <field-validator type="fieldexpression" short-circuit="true">
    39 
    +      <param name="expression">
    40 
    +        <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]>
    41 
    +      </param>
    42 
    +      <message>observe.validation.required.quadrant</message>
    40 43 
         </field-validator>
    41 44
    42 45 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -51,9 +54,11 @@
    51 54
    52 55 
       <field name="latitude">
    53 56
    54 
    -    <!-- latitude obligatoire -->
    55 
    -    <field-validator type="required" short-circuit="true">
    56 
    -      <message>observe.validation.activity.required.latitude</message>
    57 
    +    <field-validator type="fieldexpression" short-circuit="true">
    58 
    +      <param name="expression">
    59 
    +        <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]>
    60 
    +      </param>
    61 
    +      <message>observe.validation.required.latitude</message>
    57 62 
         </field-validator>
    58 63
    59 64 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -65,9 +70,12 @@
    65 70
    66 71 
       <field name="longitude">
    67 72
    68 
    -    <!-- longitude obligatoire -->
    69 
    -    <field-validator type="required" short-circuit="true">
    70 
    -      <message>observe.validation.activity.required.longitude</message>
    73 
    +
    74 
    +    <field-validator type="fieldexpression" short-circuit="true">
    75 
    +      <param name="expression">
    76 
    +        <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]>
    77 
    +      </param>
    78 
    +      <message>observe.validation.required.longitude</message>
    71 79 
         </field-validator>
    72 80
    73 81 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    ... ... @@ -76,6 +84,7 @@
    76 84 
         </field-validator>
    77 85
    78 86 
       </field>
    87 
    +
    79 88 
       <field name="comment">
    80 89
    81 90 
         <!-- comentaire de moins de 1024 caractères -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-warning-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    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 
    +  You should have received a copy of the GNU General Public
    17 
    +  License along with this program.  If not, see
    18 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    19 
    +  #L%
    20 
    +  -->
    21 
    +
    22 
    +<!DOCTYPE validators PUBLIC
    23 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    +<validators>
    26 
    +
    27 
    +  <field name="timeStamp">
    28 
    +
    29 
    +    <!-- pas de date selectionne -->
    30 
    +    <field-validator type="required" short-circuit="true">
    31 
    +      <message>observe.validation.sampleLogbook.required.date</message>
    32 
    +    </field-validator>
    33 
    +
    34 
    +  </field>
    35 
    +
    36 
    +  <field name="quadrant">
    37 
    +
    38 
    +    <field-validator type="fieldexpression" short-circuit="true">
    39 
    +      <param name="expression">
    40 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    41 
    +      </param>
    42 
    +      <message>observe.validation.required.quadrant</message>
    43 
    +    </field-validator>
    44 
    +
    45 
    +  </field>
    46 
    +
    47 
    +  <field name="latitude">
    48 
    +    <field-validator type="fieldexpression" short-circuit="true">
    49 
    +      <param name="expression">
    50 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    51 
    +      </param>
    52 
    +      <message>observe.validation.required.latitude</message>
    53 
    +    </field-validator>
    54 
    +
    55 
    +  </field>
    56 
    +
    57 
    +  <field name="longitude">
    58 
    +    <field-validator type="fieldexpression" short-circuit="true">
    59 
    +      <param name="expression">
    60 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    61 
    +      </param>
    62 
    +      <message>observe.validation.required.longitude</message>
    63 
    +    </field-validator>
    64 
    +  </field>
    65 
    +
    66 
    +  <field name="comment">
    67 
    +
    68 
    +    <!-- comentaire de moins de 1024 caractères -->
    69 
    +    <field-validator type="stringlength" short-circuit="true">
    70 
    +      <param name="maxLength">1024</param>
    71 
    +      <message>observe.validation.catchLongline.comment.tobig</message>
    72 
    +    </field-validator>
    73 
    +
    74 
    +  </field>
    75 
    +
    76 
    +</validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
    ... ... @@ -33,11 +33,13 @@
    33 33
    34 34 
       </field>
    35 35
    36 
    -
    37 36 
       <field name="quadrant">
    38 37
    39 
    -    <field-validator type="required" short-circuit="true">
    40 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    38 
    +    <field-validator type="fieldexpression" short-circuit="true">
    39 
    +      <param name="expression">
    40 
    +        <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]>
    41 
    +      </param>
    42 
    +      <message>observe.validation.required.quadrant</message>
    41 43 
         </field-validator>
    42 44
    43 45 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -52,9 +54,11 @@
    52 54
    53 55 
       <field name="latitude">
    54 56
    55 
    -    <!-- latitude obligatoire -->
    56 
    -    <field-validator type="required" short-circuit="true">
    57 
    -      <message>observe.validation.activity.required.latitude</message>
    57 
    +    <field-validator type="fieldexpression" short-circuit="true">
    58 
    +      <param name="expression">
    59 
    +        <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]>
    60 
    +      </param>
    61 
    +      <message>observe.validation.required.latitude</message>
    58 62 
         </field-validator>
    59 63
    60 64 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -66,9 +70,12 @@
    66 70
    67 71 
       <field name="longitude">
    68 72
    69 
    -    <!-- longitude obligatoire -->
    70 
    -    <field-validator type="required" short-circuit="true">
    71 
    -      <message>observe.validation.activity.required.longitude</message>
    73 
    +
    74 
    +    <field-validator type="fieldexpression" short-circuit="true">
    75 
    +      <param name="expression">
    76 
    +        <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]>
    77 
    +      </param>
    78 
    +      <message>observe.validation.required.longitude</message>
    72 79 
         </field-validator>
    73 80
    74 81 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">
    ... ... @@ -77,6 +84,7 @@
    77 84 
         </field-validator>
    78 85
    79 86 
       </field>
    87 
    +
    80 88 
       <field name="comment">
    81 89
    82 90 
         <!-- comentaire de moins de 1024 caractères -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-warning-validation.xml
    1 
    +<?xml version="1.0" encoding="UTF-8"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Validation
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    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 
    +  You should have received a copy of the GNU General Public
    17 
    +  License along with this program.  If not, see
    18 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    19 
    +  #L%
    20 
    +  -->
    21 
    +
    22 
    +<!DOCTYPE validators PUBLIC
    23 
    +    "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 
    +    "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 
    +<validators>
    26 
    +
    27 
    +  <field name="timeStamp">
    28 
    +
    29 
    +    <!-- pas de date selectionne -->
    30 
    +    <field-validator type="required" short-circuit="true">
    31 
    +      <message>observe.validation.sampleLogbook.required.date</message>
    32 
    +    </field-validator>
    33 
    +
    34 
    +  </field>
    35 
    +
    36 
    +  <field name="quadrant">
    37 
    +
    38 
    +    <field-validator type="fieldexpression" short-circuit="true">
    39 
    +      <param name="expression">
    40 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    41 
    +      </param>
    42 
    +      <message>observe.validation.required.quadrant</message>
    43 
    +    </field-validator>
    44 
    +
    45 
    +  </field>
    46 
    +
    47 
    +  <field name="latitude">
    48 
    +    <field-validator type="fieldexpression" short-circuit="true">
    49 
    +      <param name="expression">
    50 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    51 
    +      </param>
    52 
    +      <message>observe.validation.required.latitude</message>
    53 
    +    </field-validator>
    54 
    +
    55 
    +  </field>
    56 
    +
    57 
    +  <field name="longitude">
    58 
    +    <field-validator type="fieldexpression" short-circuit="true">
    59 
    +      <param name="expression">
    60 
    +        <![CDATA[ quadrant != null || latitude != null || longitude != null ]]>
    61 
    +      </param>
    62 
    +      <message>observe.validation.required.longitude</message>
    63 
    +    </field-validator>
    64 
    +  </field>
    65 
    +
    66 
    +  <field name="comment">
    67 
    +
    68 
    +    <!-- comentaire de moins de 1024 caractères -->
    69 
    +    <field-validator type="stringlength" short-circuit="true">
    70 
    +      <param name="maxLength">1024</param>
    71 
    +      <message>observe.validation.catchLongline.comment.tobig</message>
    72 
    +    </field-validator>
    73 
    +
    74 
    +  </field>
    75 
    +
    76 
    +</validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
    ... ... @@ -201,7 +201,7 @@
    201 201 
       <field name="settingStartQuadrant">
    202 202
    203 203 
         <field-validator type="required" short-circuit="true">
    204 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    204 
    +      <message>observe.validation.required.quadrant</message>
    205 205 
         </field-validator>
    206 206
    207 207 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -248,7 +248,7 @@
    248 248 
           <param name="expression">
    249 249 
             <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
    250 250 
           </param>
    251 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    251 
    +      <message>observe.validation.required.quadrant</message>
    252 252 
         </field-validator>
    253 253
    254 254 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -299,7 +299,7 @@
    299 299 
           <param name="expression">
    300 300 
             <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
    301 301 
           </param>
    302 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    302 
    +      <message>observe.validation.required.quadrant</message>
    303 303 
         </field-validator>
    304 304
    305 305 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -350,7 +350,7 @@
    350 350 
           <param name="expression">
    351 351 
             <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
    352 352 
           </param>
    353 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    353 
    +      <message>observe.validation.required.quadrant</message>
    354 354 
         </field-validator>
    355 355
    356 356 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml
    ... ... @@ -48,7 +48,7 @@
    48 48 
           <param name="expression">
    49 49 
             <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
    50 50 
           </param>
    51 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    51 
    +      <message>observe.validation.required.quadrant</message>
    52 52 
         </field-validator>
    53 53
    54 54 
       </field>
    ... ... @@ -81,7 +81,7 @@
    81 81 
           <param name="expression">
    82 82 
             <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
    83 83 
           </param>
    84 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    84 
    +      <message>observe.validation.required.quadrant</message>
    85 85 
         </field-validator>
    86 86
    87 87 
       </field>
    ... ... @@ -114,7 +114,7 @@
    114 114 
           <param name="expression">
    115 115 
             <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
    116 116 
           </param>
    117 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    117 
    +      <message>observe.validation.required.quadrant</message>
    118 118 
         </field-validator>
    119 119
    120 120 
       </field>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
    ... ... @@ -232,7 +232,7 @@
    232 232 
           <param name="expression">
    233 233 
             <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]>
    234 234 
           </param>
    235 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    235 
    +      <message>observe.validation.required.quadrant</message>
    236 236 
         </field-validator>
    237 237
    238 238 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -283,7 +283,7 @@
    283 283 
           <param name="expression">
    284 284 
             <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]>
    285 285 
           </param>
    286 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    286 
    +      <message>observe.validation.required.quadrant</message>
    287 287 
         </field-validator>
    288 288
    289 289 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -334,7 +334,7 @@
    334 334 
           <param name="expression">
    335 335 
             <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]>
    336 336 
           </param>
    337 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    337 
    +      <message>observe.validation.required.quadrant</message>
    338 338 
         </field-validator>
    339 339
    340 340 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml
    ... ... @@ -48,7 +48,7 @@
    48 48 
           <param name="expression">
    49 49 
             <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]>
    50 50 
           </param>
    51 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    51 
    +      <message>observe.validation.required.quadrant</message>
    52 52 
         </field-validator>
    53 53
    54 54 
       </field>
    ... ... @@ -81,7 +81,7 @@
    81 81 
           <param name="expression">
    82 82 
             <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]>
    83 83 
           </param>
    84 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    84 
    +      <message>observe.validation.required.quadrant</message>
    85 85 
         </field-validator>
    86 86
    87 87 
       </field>
    ... ... @@ -114,7 +114,7 @@
    114 114 
           <param name="expression">
    115 115 
             <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]>
    116 116 
           </param>
    117 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    117 
    +      <message>observe.validation.required.quadrant</message>
    118 118 
         </field-validator>
    119 119
    120 120 
       </field>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
    ... ... @@ -210,7 +210,7 @@
    210 210 
       <field name="settingStartQuadrant">
    211 211
    212 212 
         <field-validator type="required" short-circuit="true">
    213 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    213 
    +      <message>observe.validation.required.quadrant</message>
    214 214 
         </field-validator>
    215 215
    216 216 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -254,7 +254,7 @@
    254 254 
       <field name="settingEndQuadrant">
    255 255
    256 256 
         <field-validator type="required" short-circuit="true">
    257 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    257 
    +      <message>observe.validation.required.quadrant</message>
    258 258 
         </field-validator>
    259 259
    260 260 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -298,7 +298,7 @@
    298 298 
       <field name="haulingStartQuadrant">
    299 299
    300 300 
         <field-validator type="required" short-circuit="true">
    301 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    301 
    +      <message>observe.validation.required.quadrant</message>
    302 302 
         </field-validator>
    303 303
    304 304 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -342,7 +342,7 @@
    342 342 
       <field name="haulingEndQuadrant">
    343 343
    344 344 
         <field-validator type="required" short-circuit="true">
    345 
    -      <message>observe.validation.setLongline.required.quadrant</message>
    345 
    +      <message>observe.validation.required.quadrant</message>
    346 346 
         </field-validator>
    347 347
    348 348 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
    ... ... @@ -239,7 +239,7 @@
    239 239
    240 240 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    241 241 
         <field-validator type="required" short-circuit="true">
    242 
    -      <message>observe.validation.activity.required.quadrant</message>
    242 
    +      <message>observe.validation.required.quadrant</message>
    243 243 
         </field-validator>
    244 244
    245 245 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -283,7 +283,7 @@
    283 283
    284 284 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    285 285 
         <field-validator type="required" short-circuit="true">
    286 
    -      <message>observe.validation.activity.required.quadrant</message>
    286 
    +      <message>observe.validation.required.quadrant</message>
    287 287 
         </field-validator>
    288 288
    289 289 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -328,7 +328,7 @@
    328 328
    329 329 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    330 330 
         <field-validator type="required" short-circuit="true">
    331 
    -      <message>observe.validation.activity.required.quadrant</message>
    331 
    +      <message>observe.validation.required.quadrant</message>
    332 332 
         </field-validator>
    333 333
    334 334 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -373,7 +373,7 @@
    373 373
    374 374 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    375 375 
         <field-validator type="required" short-circuit="true">
    376 
    -      <message>observe.validation.activity.required.quadrant</message>
    376 
    +      <message>observe.validation.required.quadrant</message>
    377 377 
         </field-validator>
    378 378
    379 379 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml
    ... ... @@ -172,7 +172,7 @@
    172 172
    173 173 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    174 174 
         <field-validator type="required" short-circuit="true">
    175 
    -      <message>observe.validation.activity.required.quadrant</message>
    175 
    +      <message>observe.validation.required.quadrant</message>
    176 176 
         </field-validator>
    177 177
    178 178 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -189,7 +189,7 @@
    189 189
    190 190 
         <!-- latitude obligatoire -->
    191 191 
         <field-validator type="required" short-circuit="true">
    192 
    -      <message>observe.validation.activity.required.latitude</message>
    192 
    +      <message>observe.validation.required.latitude</message>
    193 193 
         </field-validator>
    194 194
    195 195 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -203,7 +203,7 @@
    203 203
    204 204 
         <!-- longitude obligatoire -->
    205 205 
         <field-validator type="required" short-circuit="true">
    206 
    -      <message>observe.validation.activity.required.longitude</message>
    206 
    +      <message>observe.validation.required.longitude</message>
    207 207 
         </field-validator>
    208 208
    209 209 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml
    ... ... @@ -30,7 +30,7 @@
    30 30
    31 31 
         <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
    32 32 
         <field-validator type="required" short-circuit="true">
    33 
    -      <message>observe.validation.activity.required.quadrant</message>
    33 
    +      <message>observe.validation.required.quadrant</message>
    34 34 
         </field-validator>
    35 35
    36 36 
         <!-- coherence quadrant par rapport a l'ocean de la maree -->
    ... ... @@ -47,7 +47,7 @@
    47 47
    48 48 
         <!-- latitude obligatoire -->
    49 49 
         <field-validator type="required" short-circuit="true">
    50 
    -      <message>observe.validation.activity.required.latitude</message>
    50 
    +      <message>observe.validation.required.latitude</message>
    51 51 
         </field-validator>
    52 52
    53 53 
         <field-validator type="coordinateLatitudeDto" short-circuit="true">
    ... ... @@ -61,7 +61,7 @@
    61 61
    62 62 
         <!-- longitude obligatoire -->
    63 63 
         <field-validator type="required" short-circuit="true">
    64 
    -      <message>observe.validation.activity.required.longitude</message>
    64 
    +      <message>observe.validation.required.longitude</message>
    65 65 
         </field-validator>
    66 66
    67 67 
         <field-validator type="coordinateLongitudeDto" short-circuit="true">

  • validation/src/main/resources/i18n/validation_en_GB.properties
    ... ... @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=A comment is re
    472 472 
     observe.validation.activity.required.comment.for.reasonForNoFishing=A comment is required for the selected reason for no fishing mode.
    473 473 
     observe.validation.activity.required.comment.for.vesselActivity=A comment is required for the selected vessel activity mode.
    474 474 
     observe.validation.activity.required.date=Observation date must be filled.
    475 
    -observe.validation.activity.required.latitude=Latitude must be filled.
    476 
    -observe.validation.activity.required.longitude=Longitude must be filled.
    477 475 
     observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s
    478 
    -observe.validation.activity.required.quadrant=quadrant must be filled.
    479 476 
     observe.validation.activity.required.time=Time must be filled.
    480 477 
     observe.validation.activity.required.vesselActivity=must be filled.
    481 478 
     observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled.
    ... ... @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=English label is not translat
    704 701 
     observe.validation.referentiel.untranslated.label3=Spanish label is not translated.
    705 702 
     observe.validation.required.compagnies=Compagnies is not filled.
    706 703 
     observe.validation.required.harbour=Harbour is not filleds.
    704 
    +observe.validation.required.latitude=Latitude must be filled.
    705 
    +observe.validation.required.longitude=Longitude must be filled.
    706 
    +observe.validation.required.quadrant=Quadrant is mandatory.
    707 707 
     observe.validation.required.species=Species is not filled.
    708 708 
     observe.validation.route.activityFinDeVeille.notAvailable=There is already an end watch activity on trip.
    709 709 
     observe.validation.route.comment.tobig=Comment size can not exceed 1024 characters.
    ... ... @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp must be fi
    794 794 
     observe.validation.setLongline.required.haulingStartLatitude=Latitude must be filled.
    795 795 
     observe.validation.setLongline.required.haulingStartLongitude=Longitude must be filled.
    796 796 
     observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp must be filled.
    797 
    -observe.validation.setLongline.required.quadrant=Quadrant is mandatory.
    798 797 
     observe.validation.setLongline.required.settingEndLatitude=Latitude must be filled.
    799 798 
     observe.validation.setLongline.required.settingEndLongitude=Longitude must be filled.
    800 799 
     observe.validation.setLongline.required.settingEndTimeStamp=Timestamp must be filled.

  • validation/src/main/resources/i18n/validation_es_ES.properties
    ... ... @@ -474,10 +474,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Se necesita un
    474 474 
     observe.validation.activity.required.comment.for.reasonForNoFishing=Se necesita un comentario para la causa de no lance.
    475 475 
     observe.validation.activity.required.comment.for.vesselActivity=Se necesita un comentario para la actividad del barco.
    476 476 
     observe.validation.activity.required.date=La fecha de observación de la actividad es mandatoria.
    477 
    -observe.validation.activity.required.latitude=La latitud debe ser introducida
    478 
    -observe.validation.activity.required.longitude=La longitud debe ser introducida
    479 477 
     observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s \#TODO
    480 
    -observe.validation.activity.required.quadrant=Se debe seleccionar el cuadrante.
    481 478 
     observe.validation.activity.required.time=La hora de observación para la actividad es mandatoria.
    482 479 
     observe.validation.activity.required.vesselActivity=Se debe seleccionar la actividad del barco.
    483 480 
     observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada.
    ... ... @@ -706,6 +703,9 @@ observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se
    706 703 
     observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido.
    707 704 
     observe.validation.required.compagnies=Compagnies is not filled.
    708 705 
     observe.validation.required.harbour=Harbour is not filleds.
    706 
    +observe.validation.required.latitude=La latitud debe ser introducida
    707 
    +observe.validation.required.longitude=La longitud debe ser introducida
    708 
    +observe.validation.required.quadrant=Se debe seleccionar el cuadrante.
    709 709 
     observe.validation.required.species=Species is not filled.
    710 710 
     observe.validation.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta.
    711 711 
     observe.validation.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres.
    ... ... @@ -796,7 +796,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp de fin de
    796 796 
     observe.validation.setLongline.required.haulingStartLatitude=Latitud de inicio de arrastre vacía.
    797 797 
     observe.validation.setLongline.required.haulingStartLongitude=Longitud de inicio de arrastre vacía.
    798 798 
     observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp de inicio de arrastre vacío.
    799 
    -observe.validation.setLongline.required.quadrant=Se debe seleccionar el cuadrante.
    800 799 
     observe.validation.setLongline.required.settingEndLatitude=Latitud de fin de calada vacíoe.
    801 800 
     observe.validation.setLongline.required.settingEndLongitude=longitud de fin de calada vacía.
    802 801 
     observe.validation.setLongline.required.settingEndTimeStamp=Timestamp de fin de calada vacío.

  • validation/src/main/resources/i18n/validation_fr_FR.properties
    ... ... @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Un commentaire
    472 472 
     observe.validation.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non pêche sélectionnée.
    473 473 
     observe.validation.activity.required.comment.for.vesselActivity=Un commentaire est requis pour le type d'activité sélectionné.
    474 474 
     observe.validation.activity.required.date=La date d'observation de l'activité est obligatoire.
    475 
    -observe.validation.activity.required.latitude=La latitude doit être renseignée.
    476 
    -observe.validation.activity.required.longitude=La longitude doit être renseignée.
    477 475 
     observe.validation.activity.required.observedSystem.for.nonTargetCatch=Certains systèmes observés parmis les suivants sont obligatoires en regard des captures de faunes accessoires \: %s
    478 
    -observe.validation.activity.required.quadrant=Le quadrant doit être sélectionné.
    479 476 
     observe.validation.activity.required.time=L'heure d'observation de l'activité est obligatoire.
    480 477 
     observe.validation.activity.required.vesselActivity=L'activité du navire est obligatoire.
    481 478 
     observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée.
    ... ... @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas
    704 701 
     observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit.
    705 702 
     observe.validation.required.compagnies=La compagnie n'est pas renseignée.
    706 703 
     observe.validation.required.harbour=Le port n'est pas renseigné.
    704 
    +observe.validation.required.latitude=La latitude doit être renseignée.
    705 
    +observe.validation.required.longitude=La longitude doit être renseignée.
    706 
    +observe.validation.required.quadrant=Le quadrant est obligatoire.
    707 707 
     observe.validation.required.species=L'espèce n'est pas renseigné.
    708 708 
     observe.validation.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route
    709 709 
     observe.validation.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
    ... ... @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Horodatage de fin de
    794 794 
     observe.validation.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée.
    795 795 
     observe.validation.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée.
    796 796 
     observe.validation.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné.
    797 
    -observe.validation.setLongline.required.quadrant=Le quadrant est obligatoire.
    798 797 
     observe.validation.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée.
    799 798 
     observe.validation.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée.
    800 799 
     observe.validation.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné.

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