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

Commits:

13 changed files:

Changes:

  • CHANGELOG.md
    1 1 
     # ObServe changelog
    2 2
    3 3 
      * Author [Tony Chemit](mailto:dev@tchemit.fr)
    4 
    - * Last generated at 2022-05-09 18:33.
    4 
    + * Last generated at 2022-05-19 01:45.
    5 
    +
    6 
    +## Version [9.0.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/226)
    7 
    +
    8 
    +**Closed at 2022-05-19.**
    9 
    +
    10 
    +
    11 
    +### Download
    12 
    +* [Client (observe-9.0.1-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.1/observe-9.0.1-client.zip)
    13 
    +* [Serveur (observe-9.0.1.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.1/observe-9.0.1.war)
    14 
    +* [Serveur (observe-9.0.1-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.1/observe-9.0.1-server.zip)
    15 
    +
    16 
    +### Issues
    17 
    +  * [[Type::Anomalie 2334]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2334) **Comportement de la carte, activités masquées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    18 
    +  * [[Type::Anomalie 2337]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2337) **Comportement de l'assistant connexion après un première échact de connexion** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    19 
    +  * [[Type::Anomalie 2351]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2351) **Sur le form trip LL, le bouton 'Save' ne détecte pas bien tous les événements de changements de valeurs** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    20 
    +  * [[Type::Anomalie 2356]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2356) **Exception sur form LL logbook / Global Composition / Branchline** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    21 
    +  * [[Type::Anomalie 2357]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2357) **Sur Global composition / Hook, the bouton 'Save' n'est pas activé** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    22 
    +  * [[Type::Anomalie 2358]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2358) **Global composition / Floatlines, Bouton 'Save' non déclenché sur mise à jour d'une valeur du tableau** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    23 
    +  * [[Type::Anomalie 2360]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2360) **Nouvelle erreur de type réseau, HResponseErrorException** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    24 
    +  * [[Type::Anomalie 2361]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2361) **Sur le form Sample (attaché à une activité), on peut cliquer sur 'Save' prématurément, ce qui le fait planter** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    25 
    +  * [[Type::Anomalie 2364]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2364) **Quandrant de Méditérannée et Multiples non initialisés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    26 
    +  * [[Type::Evolution 2333]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2333) **Rajouter sur l'arbre des critères de classement relatifs aux bateaux** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    27 
    +  * [[Type::Evolution 2338]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2338) **Comportement de l'arbre quand à l'affichage des références** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    28 
    +  * [[Type::Evolution 2339]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2339) **Amélioration des identifiants générés lors d'un CREATE ou UPDATE depuis le service public** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
    29 
    +  * [[Type::Evolution 2342]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2342) **Sur l'UI, sur les traductions anglaises, changer tous les 'Harbour' en 'Port'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    30 
    +  * [[Type::Evolution 2346]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2346) **Renommer le noeud Landing de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    31 
    +  * [[Type::Evolution 2348]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2348) **Questions autour de la création d'un échantillon directement depuis le noeud Activity** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    32 
    +  * [[Type::Evolution 2350]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2350) **Une coquille s'est glisée dans le code de migration V9** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    33 
    +  * [[Type::Evolution 2352]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2352) **Augmenter le nombre total d'hameçons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    34 
    +  * [[Type::Evolution 2353]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2353) **Petites améliorations sur l'onglet de choix des espèces ciblées par la marée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    35 
    +  * [[Type::Evolution 2354]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2354) **Nombre maximum de lightsticks à augmenter** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    36 
    +  * [[Type::Evolution 2355]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2355) **Bouton de recopie de valeurs d'une activité à l'autre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    37 
    +  * [[Type::Evolution 2359]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2359) **Valeurs maxi sur Branchline et Floatline** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    38 
    +  * [[Type::Evolution 2365]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2365) **Libellé LL / Set à renommer en Fishing Operation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    39 
    +  * [[Type::Evolution 2367]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2367) **Vérifier quel critère est utilisé pour filtrer la liste des bateaux disponibles sur Trip** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    40 
    +  * [[Type::Evolution 2368]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2368) **Mise en page et traductions dans l'UI de réglage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    41 
    +  * [[Type::Evolution 2176]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2176) **Contrôle sur Etat des cuves au pdépart/à l'arrivée ** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    5 42
    6 43 
     ## Version [9.0.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/222)
    7 44
    ... ... @@ -12,7 +49,6 @@
    12 49 
     * [Serveur (observe-9.0.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.0/observe-9.0.0.war)
    13 50 
     * [Serveur (observe-9.0.0-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.0/observe-9.0.0-server.zip)
    14 51
    15 
    -
    16 52 
     ### Issues
    17 53 
       * [[Type::Anomalie 2330]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2330) **Le gestionnaire de connexion directe a une petite imperfection** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    18 54 
       * [[Type::Evolution 2242]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2242) **Définition des rapports LL simples** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    ... ... @@ -36,7 +72,7 @@
    36 72 
       * [[Type::Evolution 2113]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2113) **Modélisation activity <-> sample sur LL logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    37 73 
       * [[Type::Evolution 2326]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2326) **Intégrer cette référence ll_landing.dataSource dans la migration 9.0.0** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    38 74 
       * [[Type::Evolution 2328]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2328) **Standardiser l'affichage des statistiques LL dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    39 
    -  * [[Type::Evolution 2329]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2329) **Renforcer le modèle ar des clés d'unicité sur certaines clés étrangères** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    75 
    +  * [[Type::Evolution 2329]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2329) **Renforcer le modèle par des clés d'unicité sur certaines clés étrangères** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    40 76 
       * [[Type::Tâche 2320]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2320) **Calée orpheline de la base IRD** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
    41 77
    42 78 
     ## Version [9.0.0-RC-30](https://gitlab.com/ultreiaio/ird-observe/-/milestones/224)

  • core/api/validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -58,7 +58,9 @@ observe.data.ll.observation.Tdr.validation.fishingEnd.after.fishingStart
    58 58 
     observe.data.ll.observation.Tdr.validation.fishingStart.after.deploymentStart
    59 59 
     observe.data.ps.Route.validation.duplicated.date
    60 60 
     observe.data.ps.SampleSpecies.validation.mismatch.measuredCount
    61 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled
    61 62 
     observe.data.ps.common.Trip.departureWellContentStatus.validation.required
    63 
    +observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled
    62 64 
     observe.data.ps.common.Trip.landingWellContentStatus.validation.required
    63 65 
     observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.endDate
    64 66 
     observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startDate

  • core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-warning-validation.xml
    ... ... @@ -23,6 +23,20 @@
    23 23 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 
    +  <field name="departureWellContentStatus">
    27 
    +    <!-- departureWellContentStatus is not filled (code = 3) -->
    28 
    +    <field-validator type="fieldexpression" short-circuit="true">
    29 
    +      <param name="expression"><![CDATA[ departureWellContentStatus == null || departureWellContentStatus.code != '3']]></param>
    30 
    +      <message>observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled</message>
    31 
    +    </field-validator>
    32 
    +  </field>
    33 
    +  <field name="landingWellContentStatus">
    34 
    +    <!-- landingWellContentStatus is not filled (code = 3) -->
    35 
    +    <field-validator type="fieldexpression" short-circuit="true">
    36 
    +      <param name="expression"><![CDATA[ landingWellContentStatus == null || landingWellContentStatus.code != '3']]></param>
    37 
    +      <message>observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled</message>
    38 
    +    </field-validator>
    39 
    +  </field>
    26 40 
       <field name="vessel">
    27 41 
         <!-- check vessel availability on trip -->
    28 42 
         <field-validator type="tripVessel" short-circuit="true">

  • core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-warning-validation.xml
    ... ... @@ -23,6 +23,20 @@
    23 23 
         "-//Apache Struts//XWork Validator 1.0.3//EN"
    24 24 
         "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd">
    25 25 
     <validators>
    26 
    +  <field name="departureWellContentStatus">
    27 
    +    <!-- departureWellContentStatus is not filled (code = 3) -->
    28 
    +    <field-validator type="fieldexpression" short-circuit="true">
    29 
    +      <param name="expression"><![CDATA[ departureWellContentStatus == null || departureWellContentStatus.code != '3']]></param>
    30 
    +      <message>observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled</message>
    31 
    +    </field-validator>
    32 
    +  </field>
    33 
    +  <field name="landingWellContentStatus">
    34 
    +    <!-- landingWellContentStatus is not filled (code = 3) -->
    35 
    +    <field-validator type="fieldexpression" short-circuit="true">
    36 
    +      <param name="expression"><![CDATA[ landingWellContentStatus == null || landingWellContentStatus.code != '3']]></param>
    37 
    +      <message>observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled</message>
    38 
    +    </field-validator>
    39 
    +  </field>
    26 40 
       <field name="vessel">
    27 41 
         <!-- check vessel availability on trip -->
    28 42 
         <field-validator type="tripVessel" short-circuit="true">

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip/validation-create.json
    ... ... @@ -32,7 +32,8 @@
    32 32 
           "departureWellContentStatus is mandatory except if !logbookEnabled"
    33 33 
         ],
    34 34 
         "warnings": [
    35 
    -      "check if referential departureWellContentStatus is disabled (only if validation is not strong)"
    35 
    +      "check if referential departureWellContentStatus is disabled (only if validation is not strong)",
    36 
    +      "departureWellContentStatus is not filled (code = 3)"
    36 37 
         ]
    37 38 
       },
    38 39 
       "endDate": {
    ... ... @@ -87,7 +88,8 @@
    87 88 
           "landingWellContentStatus is mandatory except if !logbookEnabled"
    88 89 
         ],
    89 90 
         "warnings": [
    90 
    -      "check if referential landingWellContentStatus is disabled (only if validation is not strong)"
    91 
    +      "check if referential landingWellContentStatus is disabled (only if validation is not strong)",
    92 
    +      "landingWellContentStatus is not filled (code = 3)"
    91 93 
         ]
    92 94 
       },
    93 95 
       "localMarketAcquisitionStatus": {

  • core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip/validation-update.json
    ... ... @@ -32,7 +32,8 @@
    32 32 
           "departureWellContentStatus is mandatory except if !logbookEnabled"
    33 33 
         ],
    34 34 
         "warnings": [
    35 
    -      "check if referential departureWellContentStatus is disabled (only if validation is not strong)"
    35 
    +      "check if referential departureWellContentStatus is disabled (only if validation is not strong)",
    36 
    +      "departureWellContentStatus is not filled (code = 3)"
    36 37 
         ]
    37 38 
       },
    38 39 
       "endDate": {
    ... ... @@ -87,7 +88,8 @@
    87 88 
           "landingWellContentStatus is mandatory except if !logbookEnabled"
    88 89 
         ],
    89 90 
         "warnings": [
    90 
    -      "check if referential landingWellContentStatus is disabled (only if validation is not strong)"
    91 
    +      "check if referential landingWellContentStatus is disabled (only if validation is not strong)",
    92 
    +      "landingWellContentStatus is not filled (code = 3)"
    91 93 
         ]
    92 94 
       },
    93 95 
       "localMarketAcquisitionStatus": {

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -899,12 +899,14 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=View forms in a web brow
    899 899 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=View reports in a web browser
    900 900 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling
    901 901 
     observe.data.ps.common.Trip.departureWellContentStatus=Departure well content status
    902 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled=Status is not filled.
    902 903 
     observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected.
    903 904 
     observe.data.ps.common.Trip.fishingTime=Fishing time (h)
    904 905 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection
    905 906 
     observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing
    906 907 
     observe.data.ps.common.Trip.landingTotalWeight=Landing total weight (t)
    907 908 
     observe.data.ps.common.Trip.landingWellContentStatus=Landing well content status
    909 
    +observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled=Status is not filled.
    908 910 
     observe.data.ps.common.Trip.landingWellContentStatus.validation.required=Required if logbook data is selected.
    909 911 
     observe.data.ps.common.Trip.localMarketAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for Local market
    910 912 
     observe.data.ps.common.Trip.localMarketSurveySamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for Local market survey

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -899,12 +899,14 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Acceder a los formulario
    899 899 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    900 900 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling TODO
    901 901 
     observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ \#TODO
    902 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled=Status is not filled.
    902 903 
     observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected. \#TODO
    903 904 
     observe.data.ps.common.Trip.fishingTime=Heures de peche \#TODO
    904 905 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection \#TODO
    905 906 
     observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing
    906 907 
     observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t) \#TODO
    907 908 
     observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement \#TODO
    909 
    +observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled=Status is not filled.
    908 910 
     observe.data.ps.common.Trip.landingWellContentStatus.validation.required=Must be filled.
    909 911 
     observe.data.ps.common.Trip.localMarketAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for Local market
    910 912 
     observe.data.ps.common.Trip.localMarketSurveySamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for Local market survey

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -899,12 +899,14 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Accéder aux formulaires
    899 899 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    900 900 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Échantillonnage avancé
    901 901 
     observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ
    902 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled=État de remplissage non renseigné.
    902 903 
     observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Champs obligatoire si données livre de bord est sélectionné.
    903 904 
     observe.data.ps.common.Trip.fishingTime=Heures de pêche
    904 905 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Collecte du bon de débarquement
    905 906 
     observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la collecte du bon de débarquement
    906 907 
     observe.data.ps.common.Trip.landingTotalWeight=Total débarqué (en t)
    907 908 
     observe.data.ps.common.Trip.landingWellContentStatus=État de remplissage des cuves après débarquement
    909 
    +observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled=État de remplissage non renseigné.
    908 910 
     observe.data.ps.common.Trip.landingWellContentStatus.validation.required=Champs obligatoire si données livre de bord est sélectionné.
    909 911 
     observe.data.ps.common.Trip.localMarketAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la saisie du marché local
    910 912 
     observe.data.ps.common.Trip.localMarketSurveySamplingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la saisie des sondages à quai du marché local

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create-warning.xml
    ... ... @@ -55,6 +55,12 @@
    55 55 
         <field-validator type="checkDisabledReferentialOnWarningScope">
    56 56 
           <message/>
    57 57 
         </field-validator>
    58 
    +
    59 
    +    <!-- departureWellContentStatus is not filled (code = 3) -->
    60 
    +    <field-validator type="fieldexpression" short-circuit="true">
    61 
    +      <param name="expression"><![CDATA[ departureWellContentStatus == null || departureWellContentStatus.code != '3']]></param>
    62 
    +      <message>observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled</message>
    63 
    +    </field-validator>
    58 64 
       </field>
    59 65
    60 66 
       <field name="landingAcquisitionStatus">
    ... ... @@ -81,6 +87,12 @@
    81 87 
         <field-validator type="checkDisabledReferentialOnWarningScope">
    82 88 
           <message/>
    83 89 
         </field-validator>
    90 
    +
    91 
    +    <!-- landingWellContentStatus is not filled (code = 3) -->
    92 
    +    <field-validator type="fieldexpression" short-circuit="true">
    93 
    +      <param name="expression"><![CDATA[ landingWellContentStatus == null || landingWellContentStatus.code != '3']]></param>
    94 
    +      <message>observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled</message>
    95 
    +    </field-validator>
    84 96 
       </field>
    85 97
    86 98 
       <field name="localMarketAcquisitionStatus">

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create.json
    ... ... @@ -32,7 +32,8 @@
    32 32 
           "departureWellContentStatus is mandatory except if !logbookEnabled"
    33 33 
         ],
    34 34 
         "warnings": [
    35 
    -      "check if referential departureWellContentStatus is disabled (only if validation is not strong)"
    35 
    +      "check if referential departureWellContentStatus is disabled (only if validation is not strong)",
    36 
    +      "departureWellContentStatus is not filled (code = 3)"
    36 37 
         ]
    37 38 
       },
    38 39 
       "endDate": {
    ... ... @@ -87,7 +88,8 @@
    87 88 
           "landingWellContentStatus is mandatory except if !logbookEnabled"
    88 89 
         ],
    89 90 
         "warnings": [
    90 
    -      "check if referential landingWellContentStatus is disabled (only if validation is not strong)"
    91 
    +      "check if referential landingWellContentStatus is disabled (only if validation is not strong)",
    92 
    +      "landingWellContentStatus is not filled (code = 3)"
    91 93 
         ]
    92 94 
       },
    93 95 
       "localMarketAcquisitionStatus": {

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update-warning.xml
    ... ... @@ -55,6 +55,12 @@
    55 55 
         <field-validator type="checkDisabledReferentialOnWarningScope">
    56 56 
           <message/>
    57 57 
         </field-validator>
    58 
    +
    59 
    +    <!-- departureWellContentStatus is not filled (code = 3) -->
    60 
    +    <field-validator type="fieldexpression" short-circuit="true">
    61 
    +      <param name="expression"><![CDATA[ departureWellContentStatus == null || departureWellContentStatus.code != '3']]></param>
    62 
    +      <message>observe.data.ps.common.Trip.departureWellContentStatus.validation.notFilled</message>
    63 
    +    </field-validator>
    58 64 
       </field>
    59 65
    60 66 
       <field name="landingAcquisitionStatus">
    ... ... @@ -81,6 +87,12 @@
    81 87 
         <field-validator type="checkDisabledReferentialOnWarningScope">
    82 88 
           <message/>
    83 89 
         </field-validator>
    90 
    +
    91 
    +    <!-- landingWellContentStatus is not filled (code = 3) -->
    92 
    +    <field-validator type="fieldexpression" short-circuit="true">
    93 
    +      <param name="expression"><![CDATA[ landingWellContentStatus == null || landingWellContentStatus.code != '3']]></param>
    94 
    +      <message>observe.data.ps.common.Trip.landingWellContentStatus.validation.notFilled</message>
    95 
    +    </field-validator>
    84 96 
       </field>
    85 97
    86 98 
       <field name="localMarketAcquisitionStatus">

  • server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update.json
    ... ... @@ -32,7 +32,8 @@
    32 32 
           "departureWellContentStatus is mandatory except if !logbookEnabled"
    33 33 
         ],
    34 34 
         "warnings": [
    35 
    -      "check if referential departureWellContentStatus is disabled (only if validation is not strong)"
    35 
    +      "check if referential departureWellContentStatus is disabled (only if validation is not strong)",
    36 
    +      "departureWellContentStatus is not filled (code = 3)"
    36 37 
         ]
    37 38 
       },
    38 39 
       "endDate": {
    ... ... @@ -87,7 +88,8 @@
    87 88 
           "landingWellContentStatus is mandatory except if !logbookEnabled"
    88 89 
         ],
    89 90 
         "warnings": [
    90 
    -      "check if referential landingWellContentStatus is disabled (only if validation is not strong)"
    91 
    +      "check if referential landingWellContentStatus is disabled (only if validation is not strong)",
    92 
    +      "landingWellContentStatus is not filled (code = 3)"
    91 93 
         ]
    92 94 
       },
    93 95 
       "localMarketAcquisitionStatus": {

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