Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
ef2526ae
by Tony CHEMIT at 2017-08-02T09:59:57+02:00
29 changed files:
- client-configuration/pom.xml
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml
- client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml
- client-validation/src/main/resources/i18n/client-validation_en_GB.properties
- client-validation/src/main/resources/i18n/client-validation_es_ES.properties
- client-validation/src/main/resources/i18n/client-validation_fr_FR.properties
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeHeader.jcss
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- common/pom.xml
- + common/src/main/resources/i18n/common_en_GB.properties
- + common/src/main/resources/i18n/common_es_ES.properties
- + common/src/main/resources/i18n/common_fr_FR.properties
- services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java
- services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialBinder.java
- services/pom.xml
- services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
- services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java
- services/src/main/resources/i18n/services_en_GB.properties
- services/src/main/resources/i18n/services_es_ES.properties
- services/src/main/resources/i18n/services_fr_FR.properties
Changes:
| ... | ... | @@ -123,6 +123,34 @@ |
| 123 | 123 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 124 | 124 |
<executions>
|
| 125 | 125 |
<execution>
|
| 126 |
+ <id>generateI18nEnumHelper</id>
|
|
| 127 |
+ <goals>
|
|
| 128 |
+ <goal>generateI18nEnumHelper</goal>
|
|
| 129 |
+ </goals>
|
|
| 130 |
+ <configuration>
|
|
| 131 |
+ <enumerationSets>
|
|
| 132 |
+ <enumerationSet>
|
|
| 133 |
+ <name>label</name>
|
|
| 134 |
+ <!--suppress MavenModelInspection -->
|
|
| 135 |
+ <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
|
|
| 136 |
+ <enums>
|
|
| 137 |
+ <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum>
|
|
| 138 |
+ <enum>fr.ird.observe.client.configuration.constants.DbMode</enum>
|
|
| 139 |
+ </enums>
|
|
| 140 |
+ </enumerationSet>
|
|
| 141 |
+ <enumerationSet>
|
|
| 142 |
+ <name>description</name>
|
|
| 143 |
+ <!--suppress MavenModelInspection -->
|
|
| 144 |
+ <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern>
|
|
| 145 |
+ <enums>
|
|
| 146 |
+ <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum>
|
|
| 147 |
+ <enum>fr.ird.observe.client.configuration.constants.DbMode</enum>
|
|
| 148 |
+ </enums>
|
|
| 149 |
+ </enumerationSet>
|
|
| 150 |
+ </enumerationSets>
|
|
| 151 |
+ </configuration>
|
|
| 152 |
+ </execution>
|
|
| 153 |
+ <execution>
|
|
| 126 | 154 |
<id>scan-sources</id>
|
| 127 | 155 |
<goals>
|
| 128 | 156 |
<goal>parserJava</goal>
|
| ... | ... | @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Opened data from last session |
| 89 | 89 |
observe.config.validation.lengthWeightEnable=Force validation of species length max
|
| 90 | 90 |
observe.config.validation.speedEnable=Force validation of activities speed
|
| 91 | 91 |
observe.config.validation.speedMaxValue=Max speed value used in activities speed validation
|
| 92 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generate an empty data base.
|
|
| 93 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base.
|
|
| 94 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz)
|
|
| 95 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from
|
|
| 96 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database
|
|
| 97 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database.
|
|
| 98 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base
|
|
| 99 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generate a new local data bse and import in it the referential of another local data base.
|
|
| 100 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Import referential from a remote database
|
|
| 101 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generate a new local data base and import in it the referential of a remove database.
|
|
| 102 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Import referential from a remote server
|
|
| 103 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generate a new local data base and import in it the referential of a remove server.
|
|
| 104 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Create a new local database
|
|
| 105 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2)
|
|
| 106 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Use local database
|
|
| 107 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2)
|
|
| 108 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Use a direct connection to a remote database
|
|
| 109 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=sans service web (moins performant)
|
|
| 110 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Use a remote web service
|
|
| 111 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Use a remote ObServe web service to connect to a central database with better performances than with a direct connection
|
|
| 92 | 112 |
observe.message.save.configuration=Save configuration in file %1$s
|
| 93 | 113 |
observe.model.version=Model version
|
| ... | ... | @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Nudos abiertos del arbol abiertos cuando se cerr |
| 89 | 89 |
observe.config.validation.lengthWeightEnable=Forcer la validation des bormes min/max de taille d'espèce \#TODO
|
| 90 | 90 |
observe.config.validation.speedEnable=Force validation of activities speedTODO
|
| 91 | 91 |
observe.config.validation.speedMaxValue=Max speed value used in activities speed validationTODO
|
| 92 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generar una base vacía
|
|
| 93 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente...
|
|
| 94 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Cargar una copia de seguridad de la base local (*.sql.gz)
|
|
| 95 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación
|
|
| 96 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Cargar la base de datos incrustada
|
|
| 97 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generar una nueva base local a partir\nde la última versión de la base incrustada.
|
|
| 98 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importar el referencial de una base local
|
|
| 99 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generar una nueva base local e importar el referencial de una otra base local.
|
|
| 100 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importar el referencial de una base remota
|
|
| 101 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generar una nueva base locale e importar el referencial e una otra base remota.
|
|
| 102 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto
|
|
| 103 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto.
|
|
| 104 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local
|
|
| 105 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo H2
|
|
| 106 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local
|
|
| 107 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo H2
|
|
| 108 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utilizar una conexión directa a une base remota
|
|
| 109 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (PostgreSQL)\= without web service (less efficient)\=Utilizar una base remota de tipo PostgreSQL\= sin servicio web (menos eficiente)
|
|
| 110 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utilizar un servicio web remoto
|
|
| 111 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servicio web remoto para obtener un mejor rendimiento
|
|
| 92 | 112 |
observe.message.save.configuration=Guardar la configuración en el archivo %1$s
|
| 93 | 113 |
observe.model.version=Versión del modelo
|
| ... | ... | @@ -89,5 +89,25 @@ observe.config.ui.treeOpenNodes=Nœuds de l'arbre ouverts lors de la dernière f |
| 89 | 89 |
observe.config.validation.lengthWeightEnable=Forcer la validation des bormes min/max de taille d'espèce
|
| 90 | 90 |
observe.config.validation.speedEnable=Forcer la validation des vitesses d'activités
|
| 91 | 91 |
observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités
|
| 92 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Générer une base vide
|
|
| 93 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide.
|
|
| 94 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz)
|
|
| 95 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir
|
|
| 96 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée
|
|
| 97 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir
|
|
| 98 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale
|
|
| 99 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale.
|
|
| 100 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante
|
|
| 101 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante.
|
|
| 102 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant
|
|
| 103 |
+observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant.
|
|
| 104 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale
|
|
| 105 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2
|
|
| 106 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale
|
|
| 107 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type H2
|
|
| 108 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante en connexion directe
|
|
| 109 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type PostgreSQL en connexion directe
|
|
| 110 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utiliser un service web distant
|
|
| 111 |
+observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utiliser un service web ObServe distant pour se connecter à une base centrale avec de meilleures performances qu'en connexion directe
|
|
| 92 | 112 |
observe.message.save.configuration=Sauvegarde de la configuration dans le fichier %1$s
|
| 93 | 113 |
observe.model.version=Version du modèle
|
| ... | ... | @@ -42,6 +42,7 @@ |
| 42 | 42 |
<message>validator.ui.referentiel.null.uri</message>
|
| 43 | 43 |
</field-validator>
|
| 44 | 44 |
</field>
|
| 45 |
+ |
|
| 45 | 46 |
<field name="label1">
|
| 46 | 47 |
<!-- libelle 1 non traduit (egal a label2) -->
|
| 47 | 48 |
<field-validator type="fieldexpression">
|
| ... | ... | @@ -62,4 +63,32 @@ |
| 62 | 63 |
</field-validator>
|
| 63 | 64 |
</field>
|
| 64 | 65 |
|
| 66 |
+ <field name="parent">
|
|
| 67 |
+ <!-- pas de parent selectionne -->
|
|
| 68 |
+ <field-validator type="required" short-circuit="true">
|
|
| 69 |
+ <message>validator.ui.referentiel.null.parentCode</message>
|
|
| 70 |
+ </field-validator>
|
|
| 71 |
+ </field>
|
|
| 72 |
+ |
|
| 73 |
+ <field name="objectMaterialType">
|
|
| 74 |
+ <!-- pas de objectMaterialType selectionne -->
|
|
| 75 |
+ <field-validator type="required" short-circuit="true">
|
|
| 76 |
+ <message>validator.ui.referentiel.null.objectMaterialType</message>
|
|
| 77 |
+ </field-validator>
|
|
| 78 |
+ </field>
|
|
| 79 |
+ |
|
| 80 |
+ <field name="legacyCode">
|
|
| 81 |
+ <!-- pas de legacyCode selectionne -->
|
|
| 82 |
+ <field-validator type="requiredstring" short-circuit="true">
|
|
| 83 |
+ <message>validator.ui.referentiel.null.legacyCode</message>
|
|
| 84 |
+ </field-validator>
|
|
| 85 |
+ </field>
|
|
| 86 |
+ |
|
| 87 |
+ <field name="standardCode">
|
|
| 88 |
+ <!-- pas de standardCode selectionne -->
|
|
| 89 |
+ <field-validator type="requiredstring" short-circuit="true">
|
|
| 90 |
+ <message>validator.ui.referentiel.null.standardCode</message>
|
|
| 91 |
+ </field-validator>
|
|
| 92 |
+ </field>
|
|
| 93 |
+ |
|
| 65 | 94 |
</validators>
|
| ... | ... | @@ -42,6 +42,7 @@ |
| 42 | 42 |
<message>validator.ui.referentiel.null.uri</message>
|
| 43 | 43 |
</field-validator>
|
| 44 | 44 |
</field>
|
| 45 |
+ |
|
| 45 | 46 |
<field name="label1">
|
| 46 | 47 |
<!-- libelle 1 non traduit (egal a label2) -->
|
| 47 | 48 |
<field-validator type="fieldexpression">
|
| ... | ... | @@ -62,4 +63,32 @@ |
| 62 | 63 |
</field-validator>
|
| 63 | 64 |
</field>
|
| 64 | 65 |
|
| 66 |
+ <field name="parent">
|
|
| 67 |
+ <!-- pas de parent selectionne -->
|
|
| 68 |
+ <field-validator type="required" short-circuit="true">
|
|
| 69 |
+ <message>validator.ui.referentiel.null.parentCode</message>
|
|
| 70 |
+ </field-validator>
|
|
| 71 |
+ </field>
|
|
| 72 |
+ |
|
| 73 |
+ <field name="objectMaterialType">
|
|
| 74 |
+ <!-- pas de objectMaterialType selectionne -->
|
|
| 75 |
+ <field-validator type="required" short-circuit="true">
|
|
| 76 |
+ <message>validator.ui.referentiel.null.objectMaterialType</message>
|
|
| 77 |
+ </field-validator>
|
|
| 78 |
+ </field>
|
|
| 79 |
+ |
|
| 80 |
+ <field name="legacyCode">
|
|
| 81 |
+ <!-- pas de legacyCode selectionne -->
|
|
| 82 |
+ <field-validator type="requiredstring" short-circuit="true">
|
|
| 83 |
+ <message>validator.ui.referentiel.null.legacyCode</message>
|
|
| 84 |
+ </field-validator>
|
|
| 85 |
+ </field>
|
|
| 86 |
+ |
|
| 87 |
+ <field name="standardCode">
|
|
| 88 |
+ <!-- pas de standardCode selectionne -->
|
|
| 89 |
+ <field-validator type="requiredstring" short-circuit="true">
|
|
| 90 |
+ <message>validator.ui.referentiel.null.standardCode</message>
|
|
| 91 |
+ </field-validator>
|
|
| 92 |
+ </field>
|
|
| 93 |
+ |
|
| 65 | 94 |
</validators>
|
| ... | ... | @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Start date must be filled. |
| 229 | 229 |
validator.ui.referentiel.bad.parentCode=Code should starts with %1$s-
|
| 230 | 230 |
validator.ui.referentiel.invalid.code.uniqueKey=Code must be unique, value %s is already used.
|
| 231 | 231 |
validator.ui.referentiel.invalid.uri.uniqueKey=Uri must be unique, value %s is already used.
|
| 232 |
+validator.ui.referentiel.null.legacyCode=No legacy code filled.
|
|
| 233 |
+validator.ui.referentiel.null.objectMaterialType=No type selected.
|
|
| 234 |
+validator.ui.referentiel.null.parentCode=No parent selected.
|
|
| 235 |
+validator.ui.referentiel.null.standardCode=No standard code filled.
|
|
| 232 | 236 |
validator.ui.referentiel.null.uri=Uri is not filled.
|
| 233 | 237 |
validator.ui.referentiel.required.brandName=Brand name must be filled.
|
| 234 | 238 |
validator.ui.referentiel.required.code=Code must be filled.
|
| ... | ... | @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Fecha de comienzo de programa debe ser e |
| 229 | 229 |
validator.ui.referentiel.bad.parentCode=Code should starts with %1$s- \#TODO
|
| 230 | 230 |
validator.ui.referentiel.invalid.code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
|
| 231 | 231 |
validator.ui.referentiel.invalid.uri.uniqueKey=El uri debe ser único, el valor %1$s ya se ha usado.
|
| 232 |
+validator.ui.referentiel.null.legacyCode=Pas de code ancien renseigné. \#TODO
|
|
| 233 |
+validator.ui.referentiel.null.objectMaterialType=Pas de type sélectionné. \#TODO
|
|
| 234 |
+validator.ui.referentiel.null.parentCode=Pas de parent sélectionné. \#TODO
|
|
| 235 |
+validator.ui.referentiel.null.standardCode=Pas de code standard renseigné. \#TODO
|
|
| 232 | 236 |
validator.ui.referentiel.null.uri=Ningún uri especificado.
|
| 233 | 237 |
validator.ui.referentiel.required.brandName=El nombre de marca es mandatorio
|
| 234 | 238 |
validator.ui.referentiel.required.code=Code must be filled \#TODO
|
| ... | ... | @@ -229,6 +229,10 @@ validator.ui.program.required.startDate=Date de début de programme non renseign |
| 229 | 229 |
validator.ui.referentiel.bad.parentCode=Le code doit commencer par %1$s-
|
| 230 | 230 |
validator.ui.referentiel.invalid.code.uniqueKey=Le code doit être unique, la valeur %1$s est déjà utilisée.
|
| 231 | 231 |
validator.ui.referentiel.invalid.uri.uniqueKey=L'uri doit être unique, la valeur %1$s est déjà utilisée.
|
| 232 |
+validator.ui.referentiel.null.legacyCode=Pas de code ancien renseigné.
|
|
| 233 |
+validator.ui.referentiel.null.objectMaterialType=Pas de type sélectionné.
|
|
| 234 |
+validator.ui.referentiel.null.parentCode=Pas de parent sélectionné.
|
|
| 235 |
+validator.ui.referentiel.null.standardCode=Pas de code standard renseigné.
|
|
| 232 | 236 |
validator.ui.referentiel.null.uri=Aucune uri renseignée.
|
| 233 | 237 |
validator.ui.referentiel.required.brandName=Le nom n'est pas renseigné.
|
| 234 | 238 |
validator.ui.referentiel.required.code=Aucun code renseigné.
|
| ... | ... | @@ -645,25 +645,14 @@ |
| 645 | 645 |
<!--suppress MavenModelInspection -->
|
| 646 | 646 |
<pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
|
| 647 | 647 |
<enums>
|
| 648 |
- <enum>fr.ird.observe.common.constants.GearType</enum>
|
|
| 649 |
- <enum>fr.ird.observe.common.constants.ReferenceStatus</enum>
|
|
| 650 |
- <enum>fr.ird.observe.common.constants.TripMapPointType</enum>
|
|
| 651 |
- <enum>fr.ird.observe.common.constants.seine.SchoolType</enum>
|
|
| 652 |
- <enum>fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation</enum>
|
|
| 653 |
- <enum>fr.ird.observe.common.constants.seine.Ownership</enum>
|
|
| 654 |
- <enum>fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource</enum>
|
|
| 655 |
- <enum>fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus</enum>
|
|
| 656 |
- <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum>
|
|
| 657 |
- <enum>fr.ird.observe.client.configuration.constants.DbMode</enum>
|
|
| 658 | 648 |
<enum>fr.ird.observe.client.db.constants.ConnexionStatus</enum>
|
| 649 |
+ <enum>fr.ird.observe.client.ui.admin.AdminStep</enum>
|
|
| 659 | 650 |
<enum>fr.ird.observe.client.ui.admin.synchronize.referential.ReferentialSynchronizeMode</enum>
|
| 660 | 651 |
<enum>fr.ird.observe.client.ui.content.ref.impl.ProgramObservationEnum</enum>
|
| 661 | 652 |
<enum>fr.ird.observe.client.ui.content.table.impl.seine.ModeSaisieEchantillonEnum</enum>
|
| 662 |
- <enum>fr.ird.observe.client.ui.storage.StorageStep</enum>
|
|
| 663 | 653 |
<enum>fr.ird.observe.client.ui.storage.ObstunaAdminAction</enum>
|
| 664 |
- <enum>fr.ird.observe.client.ui.admin.AdminStep</enum>
|
|
| 654 |
+ <enum>fr.ird.observe.client.ui.storage.StorageStep</enum>
|
|
| 665 | 655 |
<enum>fr.ird.observe.client.validation.ValidationModelMode</enum>
|
| 666 |
- <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum>
|
|
| 667 | 656 |
</enums>
|
| 668 | 657 |
</enumerationSet>
|
| 669 | 658 |
<enumerationSet>
|
| ... | ... | @@ -671,13 +660,11 @@ |
| 671 | 660 |
<!--suppress MavenModelInspection -->
|
| 672 | 661 |
<pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern>
|
| 673 | 662 |
<enums>
|
| 674 |
- <enum>fr.ird.observe.client.configuration.constants.CreationMode</enum>
|
|
| 675 |
- <enum>fr.ird.observe.client.configuration.constants.DbMode</enum>
|
|
| 676 | 663 |
<enum>fr.ird.observe.client.validation.ValidationModelMode</enum>
|
| 677 | 664 |
<enum>fr.ird.observe.client.db.constants.ConnexionStatus</enum>
|
| 678 | 665 |
<enum>fr.ird.observe.client.ui.admin.AdminStep</enum>
|
| 679 |
- <enum>fr.ird.observe.client.ui.storage.StorageStep</enum>
|
|
| 680 | 666 |
<enum>fr.ird.observe.client.ui.storage.ObstunaAdminAction</enum>
|
| 667 |
+ <enum>fr.ird.observe.client.ui.storage.StorageStep</enum>
|
|
| 681 | 668 |
</enums>
|
| 682 | 669 |
</enumerationSet>
|
| 683 | 670 |
</enumerationSets>
|
| ... | ... | @@ -40,6 +40,7 @@ |
| 40 | 40 |
<BeanValidator id='validator' autoField='true'
|
| 41 | 41 |
beanClass='fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto'
|
| 42 | 42 |
context='ui-create' errorTableModel='{getErrorTableModel()}'>
|
| 43 |
+ <field name='parent' component='parentCode'/>
|
|
| 43 | 44 |
<field name='label1' component='label1'/>
|
| 44 | 45 |
<field name='label2' component='label2'/>
|
| 45 | 46 |
<field name='label3' component='label3'/>
|
| ... | ... | @@ -79,15 +80,27 @@ |
| 79 | 80 |
</cell>
|
| 80 | 81 |
</row>
|
| 81 | 82 |
|
| 83 |
+ <!-- legacyCode / standardCode -->
|
|
| 84 |
+ <row>
|
|
| 85 |
+ <cell anchor="west">
|
|
| 86 |
+ <JLabel id='legacyCodeStandardCodeLabel'/>
|
|
| 87 |
+ </cell>
|
|
| 88 |
+ <cell anchor='east' weightx="1" fill="both">
|
|
| 89 |
+ <JPanel id='legacyCodeStandardCodePanel' layout='{new GridLayout(1,0)}'>
|
|
| 90 |
+ <JTextField id='legacyCode'/>
|
|
| 91 |
+ <JTextField id='standardCode'/>
|
|
| 92 |
+ </JPanel>
|
|
| 93 |
+ </cell>
|
|
| 94 |
+ </row>
|
|
| 95 |
+ |
|
| 82 | 96 |
<!-- parent -->
|
| 83 | 97 |
<row>
|
| 84 | 98 |
<cell anchor="west">
|
| 85 | 99 |
<JLabel id='parentCodeLabel'/>
|
| 86 | 100 |
</cell>
|
| 87 | 101 |
<cell anchor='east' weightx="1" fill="both">
|
| 88 |
- <BeanComboBox id='parentCode' constructorParams='this'
|
|
| 89 |
- genericType='ReferentialReference<ObjectMaterialDto>'
|
|
| 90 |
- _entityClass='ObjectMaterialDto.class'/>
|
|
| 102 |
+ <BeanComboBox id='parentCode' constructorParams='this' _entityClass='ObjectMaterialDto.class'
|
|
| 103 |
+ genericType='ReferentialReference<ObjectMaterialDto>'/>
|
|
| 91 | 104 |
</cell>
|
| 92 | 105 |
</row>
|
| 93 | 106 |
|
| ... | ... | @@ -97,9 +110,8 @@ |
| 97 | 110 |
<JLabel id='objectMaterialTypeLabel'/>
|
| 98 | 111 |
</cell>
|
| 99 | 112 |
<cell anchor='east' weightx="1" fill="both">
|
| 100 |
- <BeanComboBox id='objectMaterialType' constructorParams='this'
|
|
| 101 |
- genericType='ReferentialReference<ObjectMaterialTypeDto>'
|
|
| 102 |
- _entityClass='ObjectMaterialTypeDto.class'/>
|
|
| 113 |
+ <BeanComboBox id='objectMaterialType' constructorParams='this' _entityClass='ObjectMaterialTypeDto.class'
|
|
| 114 |
+ genericType='ReferentialReference<ObjectMaterialTypeDto>'/>
|
|
| 103 | 115 |
</cell>
|
| 104 | 116 |
</row>
|
| 105 | 117 |
|
| ... | ... | @@ -20,6 +20,20 @@ |
| 20 | 20 |
* #L%
|
| 21 | 21 |
*/
|
| 22 | 22 |
|
| 23 |
+#legacyCodeStandardCodeLabel {
|
|
| 24 |
+ text:"observe.ui.objectMaterial.legacyCodeStandardCode";
|
|
| 25 |
+}
|
|
| 26 |
+ |
|
| 27 |
+#legacyCode {
|
|
| 28 |
+ text:{getStringValue(bean.getLegacyCode())};
|
|
| 29 |
+ _propertyName:{ObjectMaterialDto.PROPERTY_LEGACY_CODE};
|
|
| 30 |
+}
|
|
| 31 |
+ |
|
| 32 |
+#standardCode {
|
|
| 33 |
+ text:{getStringValue(bean.getStandardCode())};
|
|
| 34 |
+ _propertyName:{ObjectMaterialDto.PROPERTY_STANDARD_CODE};
|
|
| 35 |
+}
|
|
| 36 |
+ |
|
| 23 | 37 |
#parentCodeLabel {
|
| 24 | 38 |
text:"observe.common.parentCode";
|
| 25 | 39 |
labelFor:{parentCode};
|
| ... | ... | @@ -28,7 +42,6 @@ |
| 28 | 42 |
#parentCode {
|
| 29 | 43 |
property:{ObjectMaterialDto.PROPERTY_PARENT};
|
| 30 | 44 |
selectedItem:{bean.getParent()};
|
| 31 |
- _validatorLabel: {t("observe.common.parentCode")};
|
|
| 32 | 45 |
}
|
| 33 | 46 |
|
| 34 | 47 |
#objectMaterialTypeLabel {
|
| ... | ... | @@ -48,7 +61,7 @@ |
| 48 | 61 |
|
| 49 | 62 |
#validation {
|
| 50 | 63 |
text:{getStringValue(bean.getValidation())};
|
| 51 |
- _propertyName:{ObjectMaterialDto.PROPERTY_VALIDATION};
|
|
| 64 |
+ _propertyName:{ObjectMaterialDto.PROPERTY_VALIDATION};
|
|
| 52 | 65 |
}
|
| 53 | 66 |
|
| 54 | 67 |
#selectable {
|
| ... | ... | @@ -36,7 +36,27 @@ public class ObjectMaterialUIModel extends ContentReferenceUIModel<ObjectMateria |
| 36 | 36 |
private static final long serialVersionUID = 1L;
|
| 37 | 37 |
|
| 38 | 38 |
public ObjectMaterialUIModel() {
|
| 39 |
- super(ObjectMaterialDto.class);
|
|
| 39 |
+ super(ObjectMaterialDto.class,
|
|
| 40 |
+ new String[]{
|
|
| 41 |
+ ObjectMaterialDto.PROPERTY_PARENT,
|
|
| 42 |
+ ObjectMaterialDto.PROPERTY_LEGACY_CODE,
|
|
| 43 |
+ ObjectMaterialDto.PROPERTY_STANDARD_CODE,
|
|
| 44 |
+ ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE,
|
|
| 45 |
+ ObjectMaterialDto.PROPERTY_VALIDATION,
|
|
| 46 |
+ ObjectMaterialDto.PROPERTY_SELECTABLE,
|
|
| 47 |
+ ObjectMaterialDto.PROPERTY_CHILD_SELECTION_MANDATORY,
|
|
| 48 |
+ ObjectMaterialDto.PROPERTY_CHILDREN_MULTI_SELECTABLE
|
|
| 49 |
+ },
|
|
| 50 |
+ new String[]{
|
|
| 51 |
+ ObjectMaterialUI.BINDING_PARENT_CODE_SELECTED_ITEM,
|
|
| 52 |
+ ObjectMaterialUI.BINDING_OBJECT_MATERIAL_TYPE_SELECTED_ITEM,
|
|
| 53 |
+ ObjectMaterialUI.BINDING_LEGACY_CODE_TEXT,
|
|
| 54 |
+ ObjectMaterialUI.BINDING_STANDARD_CODE_TEXT,
|
|
| 55 |
+ ObjectMaterialUI.BINDING_VALIDATION_TEXT,
|
|
| 56 |
+ ObjectMaterialUI.BINDING_SELECTABLE_SELECTED,
|
|
| 57 |
+ ObjectMaterialUI.BINDING_CHILD_SELECTION_MANDATORY_SELECTED,
|
|
| 58 |
+ ObjectMaterialUI.BINDING_CHILDREN_MULTI_SELECTABLE_SELECTED
|
|
| 59 |
+ });
|
|
| 40 | 60 |
}
|
| 41 | 61 |
|
| 42 | 62 |
}
|
| ... | ... | @@ -23,23 +23,23 @@ |
| 23 | 23 |
#showSeine {
|
| 24 | 24 |
selected: {tree.getTreeModel().isLoadSeine()};
|
| 25 | 25 |
text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS";
|
| 26 |
- toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip";
|
|
| 26 |
+ toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description";
|
|
| 27 | 27 |
}
|
| 28 | 28 |
#showLongline {
|
| 29 | 29 |
selected: {tree.getTreeModel().isLoadLongline()};
|
| 30 | 30 |
text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL";
|
| 31 |
- toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip";
|
|
| 31 |
+ toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description";
|
|
| 32 | 32 |
}
|
| 33 | 33 |
#showReferential {
|
| 34 | 34 |
selected: {tree.getTreeModel().isLoadReferential()};
|
| 35 | 35 |
text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF";
|
| 36 |
- toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip";
|
|
| 36 |
+ toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description";
|
|
| 37 | 37 |
}
|
| 38 | 38 |
|
| 39 | 39 |
#showEmptyProgram {
|
| 40 | 40 |
selected: {tree.getTreeModel().isLoadEmptyProgram()};
|
| 41 | 41 |
text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY";
|
| 42 |
- toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip";
|
|
| 42 |
+ toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description";
|
|
| 43 | 43 |
}
|
| 44 | 44 |
|
| 45 | 45 |
JToggleButton {
|
| ... | ... | @@ -1291,26 +1291,6 @@ observe.converter.error.float.format=Decimal format not correct for value %s |
| 1291 | 1291 |
observe.converter.error.no.convertor=could not convert decimal %s using convertor %s
|
| 1292 | 1292 |
observe.converter.error.noValue=No value to convert using convertor %s
|
| 1293 | 1293 |
observe.entity.message.updating=object '%1$s' is in editing mode.
|
| 1294 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generate an empty data base.
|
|
| 1295 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generate a new empty data base.
|
|
| 1296 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Load a database backup (*.sql.gz)
|
|
| 1297 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Create a new databse from
|
|
| 1298 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Load embbeded local database
|
|
| 1299 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generate a new local data base and import in it the referential of the last embbeded database.
|
|
| 1300 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Import referential from a local data base
|
|
| 1301 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generate a new local data bse and import in it the referential of another local data base.
|
|
| 1302 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Import referential from a remote database
|
|
| 1303 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generate a new local data base and import in it the referential of a remove database.
|
|
| 1304 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Import referential from a remote server
|
|
| 1305 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generate a new local data base and import in it the referential of a remove server.
|
|
| 1306 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Create a new local database
|
|
| 1307 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Create a new local database (type H2)
|
|
| 1308 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Use local database
|
|
| 1309 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Use the local database (type H2)
|
|
| 1310 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Use a direct connection to a remote database
|
|
| 1311 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=sans service web (moins performant)
|
|
| 1312 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Use a remote web service
|
|
| 1313 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Use a remote ObServe web service to connect to a central database with better performances than with a direct connection
|
|
| 1314 | 1294 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Connexion failed
|
| 1315 | 1295 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=The connexion failed for following reason\:
|
| 1316 | 1296 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Connexion success
|
| ... | ... | @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Only data |
| 1387 | 1367 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Only data
|
| 1388 | 1368 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Only referentials
|
| 1389 | 1369 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Only referentials
|
| 1390 |
-observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline gear type
|
|
| 1391 |
-observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne gear type
|
|
| 1392 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Disabled
|
|
| 1393 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Enabled
|
|
| 1394 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Activity
|
|
| 1395 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour
|
|
| 1396 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end
|
|
| 1397 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start
|
|
| 1398 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encounter
|
|
| 1399 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end
|
|
| 1400 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start
|
|
| 1401 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
|
|
| 1402 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure
|
|
| 1403 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Harbour landing
|
|
| 1404 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Activity
|
|
| 1405 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=In harbour
|
|
| 1406 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
|
|
| 1407 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
|
|
| 1408 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Harbour departure
|
|
| 1409 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Harbour landing
|
|
| 1410 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data
|
|
| 1411 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential
|
|
| 1412 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples
|
|
| 1413 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Moderate
|
|
| 1414 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Perfect
|
|
| 1415 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Bad
|
|
| 1416 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Unknown
|
|
| 1417 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Other vessel
|
|
| 1418 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=This vessel
|
|
| 1419 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Unknown
|
|
| 1420 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Free school type
|
|
| 1421 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Object school type
|
|
| 1422 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Undefined school type
|
|
| 1423 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
|
|
| 1424 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Posing
|
|
| 1425 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab
|
|
| 1426 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
|
|
| 1427 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit
|
|
| 1428 | 1370 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Without trips
|
| 1429 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Display programs with no trip
|
|
| 1430 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline
|
|
| 1431 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Display Palangre's programs
|
|
| 1432 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine
|
|
| 1433 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Display Seine's programs
|
|
| 1371 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Display programs with no trip
|
|
| 1434 | 1372 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referential
|
| 1435 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Display referential
|
|
| 1373 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Display referential
|
|
| 1436 | 1374 |
observe.error.can.not.create.directory=Can't create directory %&$s\!
|
| 1437 | 1375 |
observe.error.no.activity.6=Activity of type 6 was not found.
|
| 1438 | 1376 |
observe.error.storage.could.not.backup.unsane.local.db=Can not save an borken database
|
| ... | ... | @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=New fishing operation |
| 1739 | 1677 |
observe.type.setSeine.unsaved=New set
|
| 1740 | 1678 |
observe.type.tripLongline.unsaved=New trip
|
| 1741 | 1679 |
observe.type.tripSeine.unsaved=New trip
|
| 1680 |
+observe.ui.objectMaterial.legacyCodeStandardCode=Legacy code / Standard code
|
|
| 1742 | 1681 |
observe.usage.action.shouldReplace=Remplace desactivated referential ?
|
| 1743 | 1682 |
observe.usage.replaceTitle=Replacement object
|
| 1744 | 1683 |
observe.usage.usageTitle=Founded references
|
| ... | ... | @@ -1291,26 +1291,6 @@ observe.converter.error.float.format=Formato de decimal incorrecto para el valor |
| 1291 | 1291 |
observe.converter.error.no.convertor=Impossible de convertir el decimal %s con el convertidor %s
|
| 1292 | 1292 |
observe.converter.error.noValue=Ningún valor necesita ser convertida con el convertidor %s
|
| 1293 | 1293 |
observe.entity.message.updating=Se está modificando el objeto actual '%1$s'.
|
| 1294 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Generar una base vacía
|
|
| 1295 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Generar una nueva base local vacía.\nEsta base no tendrá referencial y usted tendrá que importar lo posteriormente...
|
|
| 1296 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Cargar una copia de seguridad de la base local (*.sql.gz)
|
|
| 1297 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Crear una nueva base local a partir\nde una copia de seguridad anterior de la aplicación
|
|
| 1298 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Cargar la base de datos incrustada
|
|
| 1299 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Generar una nueva base local a partir\nde la última versión de la base incrustada.
|
|
| 1300 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importar el referencial de una base local
|
|
| 1301 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Generar una nueva base local e importar el referencial de una otra base local.
|
|
| 1302 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importar el referencial de una base remota
|
|
| 1303 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Generar una nueva base locale e importar el referencial e una otra base remota.
|
|
| 1304 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importar el referencial de un servidor remoto
|
|
| 1305 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Generar una nueva base local e importar el referencial de un servidor remoto.
|
|
| 1306 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Crear una base local
|
|
| 1307 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Crear una base local de tipo H2
|
|
| 1308 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utilizar une base local
|
|
| 1309 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utilizar una base local de tipo H2
|
|
| 1310 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utilizar una conexión directa a une base remota
|
|
| 1311 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Use a remote database (PostgreSQL)\= without web service (less efficient)\=Utilizar una base remota de tipo PostgreSQL\= sin servicio web (menos eficiente)
|
|
| 1312 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utilizar un servicio web remoto
|
|
| 1313 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utilizar un servicio web remoto para obtener un mejor rendimiento
|
|
| 1314 | 1294 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Conexión falló
|
| 1315 | 1295 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=La conexión falló por la razón siguiente \:\n %1$s
|
| 1316 | 1296 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Conexión con éxito
|
| ... | ... | @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Datos del |
| 1387 | 1367 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Datos del observador
|
| 1388 | 1368 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Referencial
|
| 1389 | 1369 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Todos los referenciales
|
| 1390 |
-observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre
|
|
| 1391 |
-observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
|
|
| 1392 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Desactivado
|
|
| 1393 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Activo
|
|
| 1394 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Actividad
|
|
| 1395 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=En el puerto
|
|
| 1396 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre
|
|
| 1397 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre
|
|
| 1398 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro
|
|
| 1399 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada
|
|
| 1400 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada
|
|
| 1401 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
|
|
| 1402 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida
|
|
| 1403 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada
|
|
| 1404 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Actividad
|
|
| 1405 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=En el puerto
|
|
| 1406 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
|
|
| 1407 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
|
|
| 1408 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida
|
|
| 1409 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada
|
|
| 1410 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos
|
|
| 1411 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial
|
|
| 1412 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras
|
|
| 1413 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré \#TODO
|
|
| 1414 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait \#TODO
|
|
| 1415 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère \#TODO
|
|
| 1416 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu \#TODO
|
|
| 1417 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Barco ajeno
|
|
| 1418 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador
|
|
| 1419 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Desconocido
|
|
| 1420 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banco libre
|
|
| 1421 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banco a objeto
|
|
| 1422 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banco indeterminado
|
|
| 1423 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
|
|
| 1424 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
|
|
| 1425 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
|
|
| 1426 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
|
|
| 1427 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza
|
|
| 1428 | 1370 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée\#TODO
|
| 1429 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO
|
|
| 1430 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre
|
|
| 1431 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO
|
|
| 1432 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne
|
|
| 1433 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Senne \#TODO
|
|
| 1371 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Voir les programmes sans marée \#TODO
|
|
| 1434 | 1372 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referencial
|
| 1435 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel \#TODO
|
|
| 1373 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Voir le référentiel \#TODO
|
|
| 1436 | 1374 |
observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\!
|
| 1437 | 1375 |
observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos.
|
| 1438 | 1376 |
observe.error.storage.could.not.backup.unsane.local.db=Impossible grabar una base dañada
|
| ... | ... | @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=Nuevo lance |
| 1739 | 1677 |
observe.type.setSeine.unsaved=Nuevo lance
|
| 1740 | 1678 |
observe.type.tripLongline.unsaved=Nueva marea
|
| 1741 | 1679 |
observe.type.tripSeine.unsaved=Nueva marea
|
| 1680 |
+observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard \#TODO
|
|
| 1742 | 1681 |
observe.usage.action.shouldReplace=Reemplaza referencial desactivado?
|
| 1743 | 1682 |
observe.usage.replaceTitle=Objeto de sustitución
|
| 1744 | 1683 |
observe.usage.usageTitle=Referencias encontradas
|
| ... | ... | @@ -1291,32 +1291,12 @@ observe.converter.error.float.format=Format de décimal incorrecte pour la valeu |
| 1291 | 1291 |
observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s
|
| 1292 | 1292 |
observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s
|
| 1293 | 1293 |
observe.entity.message.updating=L'objet '%1$s' est en cours de modification.
|
| 1294 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY=Générer une base vide
|
|
| 1295 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.EMPTY.description=Générer une nouvelle base locale vide.
|
|
| 1296 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP=Charger une sauvegarde de base locale (*.sql.gz)
|
|
| 1297 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_EXTERNAL_DUMP.description=Créer une nouvelle base locale à partir
|
|
| 1298 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP=Charger la base embarquée
|
|
| 1299 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_INTERNAL_DUMP.description=Générer une nouvelle base locale à partir
|
|
| 1300 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE=Importer le référentiel d'une base locale
|
|
| 1301 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_LOCAL_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base locale.
|
|
| 1302 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE=Importer le référentiel d'une base distante
|
|
| 1303 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_REMOTE_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'une autre base distante.
|
|
| 1304 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE=Importer le référentiel dun serveur distant
|
|
| 1305 |
-observe.enum.fr.ird.observe.client.configuration.constants.CreationMode.IMPORT_SERVER_STORAGE.description=Générer une nouvelle base locale et y importer le référentiel d'un serveur distant.
|
|
| 1306 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL=Créer une base locale
|
|
| 1307 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.CREATE_LOCAL.description=Créer une base locale de type H2
|
|
| 1308 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL=Utiliser une base locale
|
|
| 1309 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_LOCAL.description=Utiliser une base locale de type H2
|
|
| 1310 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE=Utiliser une base distante en connexion directe
|
|
| 1311 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_REMOTE.description=Utiliser une base distante de type PostgreSQL en connexion directe
|
|
| 1312 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER=Utiliser un service web distant
|
|
| 1313 |
-observe.enum.fr.ird.observe.client.configuration.constants.DbMode.USE_SERVER.description=Utiliser un service web ObServe distant pour se connecter à une base centrale avec de meilleures performances qu'en connexion directe
|
|
| 1314 | 1294 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED=Connexion échouée
|
| 1315 | 1295 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.FAILED.description=La connexion a échouée pour la raison suivante \:
|
| 1316 | 1296 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS=Connexion réussie
|
| 1317 | 1297 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.SUCCESS.description=Information sur la connexion \:
|
| 1318 | 1298 |
observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED=Connexion non validée
|
| 1319 |
-observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée,
|
|
| 1299 |
+observe.enum.fr.ird.observe.client.db.constants.ConnexionStatus.UNTESTED.description=La connexion n'a jamais été validée,
|
|
| 1320 | 1300 |
observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONFIG=Configuration
|
| 1321 | 1301 |
observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONFIG.description=Configuration des opérations et sources de données à utiliser.
|
| 1322 | 1302 |
observe.enum.fr.ird.observe.client.ui.admin.AdminStep.CONSOLIDATE=Calculer les données
|
| ... | ... | @@ -1387,52 +1367,10 @@ observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA=Données |
| 1387 | 1367 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.DATA.description=Données observées
|
| 1388 | 1368 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL=Référentiel
|
| 1389 | 1369 |
observe.enum.fr.ird.observe.client.validation.ValidationModelMode.REFERENTIEL.description=Tous les référentiels
|
| 1390 |
-observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre
|
|
| 1391 |
-observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
|
|
| 1392 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Désactivé
|
|
| 1393 |
-observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Actif
|
|
| 1394 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=point d'activité
|
|
| 1395 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au port
|
|
| 1396 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage
|
|
| 1397 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage
|
|
| 1398 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre
|
|
| 1399 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage
|
|
| 1400 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage
|
|
| 1401 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station océanographique
|
|
| 1402 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Port de départ
|
|
| 1403 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée
|
|
| 1404 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=point d'activité
|
|
| 1405 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=Au port
|
|
| 1406 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
|
|
| 1407 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
|
|
| 1408 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Port de départ
|
|
| 1409 |
-observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée
|
|
| 1410 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données
|
|
| 1411 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel
|
|
| 1412 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons
|
|
| 1413 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré
|
|
| 1414 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait
|
|
| 1415 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère
|
|
| 1416 |
-observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu
|
|
| 1417 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Navire d'un autre armement
|
|
| 1418 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Ce navire ou cet armement
|
|
| 1419 |
-observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Inconnue
|
|
| 1420 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banc libre
|
|
| 1421 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banc objet
|
|
| 1422 |
-observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banc indéterminé
|
|
| 1423 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
|
|
| 1424 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
|
|
| 1425 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
|
|
| 1426 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
|
|
| 1427 |
-observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise
|
|
| 1428 | 1370 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée
|
| 1429 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée
|
|
| 1430 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre
|
|
| 1431 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre
|
|
| 1432 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne
|
|
| 1433 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Seine
|
|
| 1371 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.description=Voir les programmes sans marée
|
|
| 1434 | 1372 |
observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Référentiel
|
| 1435 |
-observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel
|
|
| 1373 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.description=Voir le référentiel
|
|
| 1436 | 1374 |
observe.error.can.not.create.directory=Création du répertoire %1$s impossible\!
|
| 1437 | 1375 |
observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base.
|
| 1438 | 1376 |
observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée
|
| ... | ... | @@ -1739,6 +1677,7 @@ observe.type.setLongline.unsaved=Nouvelle opération de pêche |
| 1739 | 1677 |
observe.type.setSeine.unsaved=Nouvelle calée
|
| 1740 | 1678 |
observe.type.tripLongline.unsaved=Nouvelle marée
|
| 1741 | 1679 |
observe.type.tripSeine.unsaved=Nouvelle marée
|
| 1680 |
+observe.ui.objectMaterial.legacyCodeStandardCode=Ancien code / Code standard
|
|
| 1742 | 1681 |
observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ?
|
| 1743 | 1682 |
observe.usage.replaceTitle=Objet de remplacement
|
| 1744 | 1683 |
observe.usage.usageTitle=Références trouvées
|
| ... | ... | @@ -78,4 +78,55 @@ |
| 78 | 78 |
</dependency>
|
| 79 | 79 |
|
| 80 | 80 |
</dependencies>
|
| 81 |
+ |
|
| 82 |
+ <build>
|
|
| 83 |
+ <plugins>
|
|
| 84 |
+ <plugin>
|
|
| 85 |
+ <groupId>io.ultreia.java4all.i18n</groupId>
|
|
| 86 |
+ <artifactId>i18n-maven-plugin</artifactId>
|
|
| 87 |
+ <executions>
|
|
| 88 |
+ <execution>
|
|
| 89 |
+ <id>generateI18nEnumHelper</id>
|
|
| 90 |
+ <goals>
|
|
| 91 |
+ <goal>generateI18nEnumHelper</goal>
|
|
| 92 |
+ </goals>
|
|
| 93 |
+ <configuration>
|
|
| 94 |
+ <enumerationSets>
|
|
| 95 |
+ <enumerationSet>
|
|
| 96 |
+ <name>label</name>
|
|
| 97 |
+ <!--suppress MavenModelInspection -->
|
|
| 98 |
+ <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
|
|
| 99 |
+ <enums>
|
|
| 100 |
+ <enum>fr.ird.observe.common.constants.GearType</enum>
|
|
| 101 |
+ <enum>fr.ird.observe.common.constants.ReferenceStatus</enum>
|
|
| 102 |
+ <enum>fr.ird.observe.common.constants.TripMapPointType</enum>
|
|
| 103 |
+ <enum>fr.ird.observe.common.constants.seine.SchoolType</enum>
|
|
| 104 |
+ <enum>fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation</enum>
|
|
| 105 |
+ <enum>fr.ird.observe.common.constants.seine.Ownership</enum>
|
|
| 106 |
+ <enum>fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource</enum>
|
|
| 107 |
+ <enum>fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus</enum>
|
|
| 108 |
+ </enums>
|
|
| 109 |
+ </enumerationSet>
|
|
| 110 |
+ </enumerationSets>
|
|
| 111 |
+ </configuration>
|
|
| 112 |
+ </execution>
|
|
| 113 |
+ <execution>
|
|
| 114 |
+ <id>scan-sources</id>
|
|
| 115 |
+ <goals>
|
|
| 116 |
+ <goal>parserJava</goal>
|
|
| 117 |
+ <goal>gen</goal>
|
|
| 118 |
+ </goals>
|
|
| 119 |
+ <configuration>
|
|
| 120 |
+ <entries>
|
|
| 121 |
+ <entry>
|
|
| 122 |
+ <specificGoal>parserJava</specificGoal>
|
|
| 123 |
+ <basedir>${project.build.directory}/generated-sources/java/</basedir>
|
|
| 124 |
+ </entry>
|
|
| 125 |
+ </entries>
|
|
| 126 |
+ </configuration>
|
|
| 127 |
+ </execution>
|
|
| 128 |
+ </executions>
|
|
| 129 |
+ </plugin>
|
|
| 130 |
+ </plugins>
|
|
| 131 |
+ </build>
|
|
| 81 | 132 |
</project>
|
| 1 |
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline gear type
|
|
| 2 |
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne gear type
|
|
| 3 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Disabled
|
|
| 4 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Enabled
|
|
| 5 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Activity
|
|
| 6 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour
|
|
| 7 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end
|
|
| 8 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start
|
|
| 9 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encounter
|
|
| 10 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end
|
|
| 11 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start
|
|
| 12 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
|
|
| 13 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure
|
|
| 14 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Harbour landing
|
|
| 15 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Activity
|
|
| 16 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=In harbour
|
|
| 17 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
|
|
| 18 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
|
|
| 19 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Harbour departure
|
|
| 20 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Harbour landing
|
|
| 21 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data
|
|
| 22 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential
|
|
| 23 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples
|
|
| 24 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Moderate
|
|
| 25 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Perfect
|
|
| 26 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Bad
|
|
| 27 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Unknown
|
|
| 28 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Other vessel
|
|
| 29 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=This vessel
|
|
| 30 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Unknown
|
|
| 31 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Free school type
|
|
| 32 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Object school type
|
|
| 33 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Undefined school type
|
|
| 34 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
|
|
| 35 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Posing
|
|
| 36 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab
|
|
| 37 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
|
|
| 38 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit
|
| 1 |
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre
|
|
| 2 |
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
|
|
| 3 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Desactivado
|
|
| 4 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Activo
|
|
| 5 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Actividad
|
|
| 6 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=En el puerto
|
|
| 7 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre
|
|
| 8 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre
|
|
| 9 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro
|
|
| 10 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada
|
|
| 11 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada
|
|
| 12 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
|
|
| 13 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida
|
|
| 14 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada
|
|
| 15 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Actividad
|
|
| 16 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=En el puerto
|
|
| 17 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
|
|
| 18 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
|
|
| 19 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida
|
|
| 20 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada
|
|
| 21 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos
|
|
| 22 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial
|
|
| 23 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras
|
|
| 24 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré \#TODO
|
|
| 25 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait \#TODO
|
|
| 26 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère \#TODO
|
|
| 27 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu \#TODO
|
|
| 28 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Barco ajeno
|
|
| 29 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador
|
|
| 30 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Desconocido
|
|
| 31 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banco libre
|
|
| 32 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banco a objeto
|
|
| 33 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banco indeterminado
|
|
| 34 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
|
|
| 35 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
|
|
| 36 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
|
|
| 37 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
|
|
| 38 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza
|
| 1 |
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre
|
|
| 2 |
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
|
|
| 3 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Désactivé
|
|
| 4 |
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Actif
|
|
| 5 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=point d'activité
|
|
| 6 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au port
|
|
| 7 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage
|
|
| 8 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage
|
|
| 9 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre
|
|
| 10 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage
|
|
| 11 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage
|
|
| 12 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station océanographique
|
|
| 13 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Port de départ
|
|
| 14 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée
|
|
| 15 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=point d'activité
|
|
| 16 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=Au port
|
|
| 17 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
|
|
| 18 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
|
|
| 19 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Port de départ
|
|
| 20 |
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée
|
|
| 21 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données
|
|
| 22 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel
|
|
| 23 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons
|
|
| 24 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.M=Modéré
|
|
| 25 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.P=Parfait
|
|
| 26 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.S=Sévère
|
|
| 27 |
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchReleaseStatus.U=Inconnu
|
|
| 28 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Navire d'un autre armement
|
|
| 29 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Ce navire ou cet armement
|
|
| 30 |
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Inconnue
|
|
| 31 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banc libre
|
|
| 32 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banc objet
|
|
| 33 |
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banc indéterminé
|
|
| 34 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
|
|
| 35 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
|
|
| 36 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
|
|
| 37 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
|
|
| 38 |
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise
|
| ... | ... | @@ -55,18 +55,20 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit |
| 55 | 55 |
|
| 56 | 56 |
protected ReferentialReference<D> toReferentialReference(E entity, Serializable... values) {
|
| 57 | 57 |
|
| 58 |
- ReferentialReference<D> reference = new ReferentialReference<>();
|
|
| 59 |
- |
|
| 60 |
- reference.setId(entity.getTopiaId());
|
|
| 61 |
- reference.setCreateDate(entity.getTopiaCreateDate());
|
|
| 62 |
- reference.setVersion(entity.getTopiaVersion());
|
|
| 58 |
+ ReferentialReference<D> reference=null;
|
|
| 59 |
+ if (entity!=null) {
|
|
| 60 |
+ reference = new ReferentialReference<>();
|
|
| 63 | 61 |
|
| 64 |
- reference.setLastUpdateDate(entity.getLastUpdateDate());
|
|
| 65 |
- reference.setEnabled(entity.isEnabled());
|
|
| 66 |
- reference.setNeedComment(entity.isNeedComment());
|
|
| 62 |
+ reference.setId(entity.getTopiaId());
|
|
| 63 |
+ reference.setCreateDate(entity.getTopiaCreateDate());
|
|
| 64 |
+ reference.setVersion(entity.getTopiaVersion());
|
|
| 67 | 65 |
|
| 68 |
- reference.init(definition.getType(), definition.getPropertyNames(), values);
|
|
| 66 |
+ reference.setLastUpdateDate(entity.getLastUpdateDate());
|
|
| 67 |
+ reference.setEnabled(entity.isEnabled());
|
|
| 68 |
+ reference.setNeedComment(entity.isNeedComment());
|
|
| 69 | 69 |
|
| 70 |
+ reference.init(definition.getType(), definition.getPropertyNames(), values);
|
|
| 71 |
+ }
|
|
| 70 | 72 |
return reference;
|
| 71 | 73 |
}
|
| 72 | 74 |
|
| ... | ... | @@ -50,7 +50,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria |
| 50 | 50 |
copyDtoI18nFieldsToEntity(dto, entity);
|
| 51 | 51 |
entity.setLegacyCode(dto.getLegacyCode());
|
| 52 | 52 |
entity.setStandardCode(dto.getStandardCode());
|
| 53 |
- entity.setParent(dto.getParent() == null ? null : toEntity(dto.getParent(), ObjectMaterial.class));
|
|
| 53 |
+ entity.setParent(toEntity(dto.getParent(), ObjectMaterial.class));
|
|
| 54 | 54 |
entity.setObjectMaterialType(toEntity(dto.getObjectMaterialType(), ObjectMaterialType.class));
|
| 55 | 55 |
entity.setSelectable(dto.isSelectable());
|
| 56 | 56 |
entity.setValidation(dto.getValidation());
|
| ... | ... | @@ -66,7 +66,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria |
| 66 | 66 |
|
| 67 | 67 |
dto.setLegacyCode(entity.getLegacyCode());
|
| 68 | 68 |
dto.setStandardCode(entity.getStandardCode());
|
| 69 |
- dto.setParent(entity.getParent() == null ? null : toReferentialReference(referentialLocale, entity.getParent()));
|
|
| 69 |
+ dto.setParent(toReferentialReference(referentialLocale, entity.getParent()));
|
|
| 70 | 70 |
dto.setObjectMaterialType(toReferentialReference(referentialLocale, entity.getObjectMaterialType(), ObjectMaterialTypeDto.class));
|
| 71 | 71 |
dto.setValidation(entity.getValidation());
|
| 72 | 72 |
dto.setSelectable(entity.isSelectable());
|
| ... | ... | @@ -91,7 +91,7 @@ public class ObjectMaterialBinder extends ReferentialBinderSupport<ObjectMateria |
| 91 | 91 |
|
| 92 | 92 |
return toReferentialReference(dto,
|
| 93 | 93 |
dto.getCode(), getLabel(referentialLocale, dto),
|
| 94 |
- Optional.ofNullable(dto.getParent()).map(r -> r.getPropertyValue("parent")).orElse(null),
|
|
| 94 |
+ Optional.ofNullable(dto.getParent()).map(r -> r.getPropertyValue(ObjectMaterialDto.PROPERTY_PARENT)).orElse(null),
|
|
| 95 | 95 |
dto.getObjectMaterialType().getId(),
|
| 96 | 96 |
dto.getValidation());
|
| 97 | 97 |
|
| ... | ... | @@ -229,15 +229,48 @@ |
| 229 | 229 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 230 | 230 |
<executions>
|
| 231 | 231 |
<execution>
|
| 232 |
+ <id>generateI18nEnumHelper</id>
|
|
| 233 |
+ <goals>
|
|
| 234 |
+ <goal>generateI18nEnumHelper</goal>
|
|
| 235 |
+ </goals>
|
|
| 236 |
+ <configuration>
|
|
| 237 |
+ <enumerationSets>
|
|
| 238 |
+ <enumerationSet>
|
|
| 239 |
+ <name>label</name>
|
|
| 240 |
+ <!--suppress MavenModelInspection -->
|
|
| 241 |
+ <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
|
|
| 242 |
+ <enums>
|
|
| 243 |
+ <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum>
|
|
| 244 |
+ </enums>
|
|
| 245 |
+ </enumerationSet>
|
|
| 246 |
+ <enumerationSet>
|
|
| 247 |
+ <name>description</name>
|
|
| 248 |
+ <!--suppress MavenModelInspection -->
|
|
| 249 |
+ <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern>
|
|
| 250 |
+ <enums>
|
|
| 251 |
+ <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum>
|
|
| 252 |
+ </enums>
|
|
| 253 |
+ </enumerationSet>
|
|
| 254 |
+ </enumerationSets>
|
|
| 255 |
+ </configuration>
|
|
| 256 |
+ </execution>
|
|
| 257 |
+ <execution>
|
|
| 232 | 258 |
<id>scan-sources</id>
|
| 233 | 259 |
<goals>
|
| 234 | 260 |
<goal>parserJava</goal>
|
| 235 | 261 |
<goal>gen</goal>
|
| 236 | 262 |
</goals>
|
| 263 |
+ <configuration>
|
|
| 264 |
+ <entries>
|
|
| 265 |
+ <entry>
|
|
| 266 |
+ <specificGoal>parserJava</specificGoal>
|
|
| 267 |
+ <basedir>${project.build.directory}/generated-sources/java/</basedir>
|
|
| 268 |
+ </entry>
|
|
| 269 |
+ </entries>
|
|
| 270 |
+ </configuration>
|
|
| 237 | 271 |
</execution>
|
| 238 | 272 |
</executions>
|
| 239 | 273 |
</plugin>
|
| 240 | 274 |
</plugins>
|
| 241 |
- |
|
| 242 | 275 |
</build>
|
| 243 | 276 |
</project>
|
| ... | ... | @@ -1761,9 +1761,8 @@ class ObserveDtoInitializer { |
| 1761 | 1761 |
|
| 1762 | 1762 |
|
| 1763 | 1763 |
flushReferential(referentialFormBuilder((ObjectMaterialDto.class))
|
| 1764 |
- .addKey("parentCode", referenceSetDefinition(ObjectMaterialDto.class))
|
|
| 1765 |
- .
|
|
| 1766 |
- addKey(ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE, referenceSetDefinition(ObjectMaterialTypeDto.class)));
|
|
| 1764 |
+ .addKey(ObjectMaterialDto.PROPERTY_PARENT, referenceSetDefinition(ObjectMaterialDto.class))
|
|
| 1765 |
+ .addKey(ObjectMaterialDto.PROPERTY_OBJECT_MATERIAL_TYPE, referenceSetDefinition(ObjectMaterialTypeDto.class)));
|
|
| 1767 | 1766 |
}
|
| 1768 | 1767 |
|
| 1769 | 1768 |
@Override
|
| ... | ... | @@ -219,6 +219,9 @@ public class ObserveI18nDecoratorHelper { |
| 219 | 219 |
n("observe.common.lightsticksPerBasketCount");
|
| 220 | 220 |
n("observe.common.lightsticksType");
|
| 221 | 221 |
n("observe.common.lineType");
|
| 222 |
+ n("observe.common.parent");
|
|
| 223 |
+ n("observe.common.legacyCode");
|
|
| 224 |
+ n("observe.common.standardCode");
|
|
| 222 | 225 |
n("observe.common.locode");
|
| 223 | 226 |
n("observe.common.longitude");
|
| 224 | 227 |
n("observe.common.maturityStatus");
|
| ... | ... | @@ -103,6 +103,7 @@ observe.common.label3=Spanish label |
| 103 | 103 |
observe.common.landingHarbour=Landing harbour
|
| 104 | 104 |
observe.common.lastName=Last name
|
| 105 | 105 |
observe.common.latitude=Latitude
|
| 106 |
+observe.common.legacyCode=Legacy code
|
|
| 106 | 107 |
observe.common.length=Length
|
| 107 | 108 |
observe.common.lengthWeightFormula=Length weight formula
|
| 108 | 109 |
observe.common.lightsticksColor=Lightsticks color
|
| ... | ... | @@ -145,6 +146,7 @@ observe.common.ocean/label8=Ocean |
| 145 | 146 |
observe.common.organism=Organism
|
| 146 | 147 |
observe.common.outputInputFormula=Output to Input formula
|
| 147 | 148 |
observe.common.outputSizeMeasureType=Output size measure type
|
| 149 |
+observe.common.parent=Parent
|
|
| 148 | 150 |
observe.common.power=Power
|
| 149 | 151 |
observe.common.previousFpaZone=Previous Fpa zone
|
| 150 | 152 |
observe.common.program=Program
|
| ... | ... | @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Release mode |
| 193 | 195 |
observe.common.speciesGroupReleaseStatus=Release state
|
| 194 | 196 |
observe.common.speciesStatus=Species status
|
| 195 | 197 |
observe.common.speedRange=Speed range
|
| 198 |
+observe.common.standardCode=Standard code
|
|
| 196 | 199 |
observe.common.startDate=Start date
|
| 197 | 200 |
observe.common.startLogValue=Start log value
|
| 198 | 201 |
observe.common.startTime=Sart time
|
| ... | ... | @@ -249,6 +252,10 @@ observe.common.whenLeaving=When leaving |
| 249 | 252 |
observe.common.wind=Wind
|
| 250 | 253 |
observe.common.wormsId=Worms id
|
| 251 | 254 |
observe.common.yearService=Year service
|
| 255 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline
|
|
| 256 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Display Palangre's programs
|
|
| 257 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine
|
|
| 258 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Display Seine's programs
|
|
| 252 | 259 |
observe.type.activityLongline=Activity
|
| 253 | 260 |
observe.type.activityLonglineEncounter=Encounter
|
| 254 | 261 |
observe.type.activityLonglineEncounters=Encounters
|
| ... | ... | @@ -103,6 +103,7 @@ observe.common.label3=Nombre |
| 103 | 103 |
observe.common.landingHarbour=Puerto de desembarque
|
| 104 | 104 |
observe.common.lastName=Nombre
|
| 105 | 105 |
observe.common.latitude=Latitud
|
| 106 |
+observe.common.legacyCode=Ancien code \#TODO
|
|
| 106 | 107 |
observe.common.length=Longitud eslora total
|
| 107 | 108 |
observe.common.lengthWeightFormula=Relación de peso
|
| 108 | 109 |
observe.common.lightsticksColor=Color de barrita de luz
|
| ... | ... | @@ -145,6 +146,7 @@ observe.common.ocean/label8=Océano |
| 145 | 146 |
observe.common.organism=Organismo
|
| 146 | 147 |
observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO
|
| 147 | 148 |
observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO
|
| 149 |
+observe.common.parent=Parent \#TODO
|
|
| 148 | 150 |
observe.common.power=Potencia del motor principal
|
| 149 | 151 |
observe.common.previousFpaZone=La zona FPA de que se salió
|
| 150 | 152 |
observe.common.program=Programa
|
| ... | ... | @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Mode de libération \#TODO |
| 193 | 195 |
observe.common.speciesGroupReleaseStatus=État à la libération \#TODO
|
| 194 | 196 |
observe.common.speciesStatus=Estado de especie
|
| 195 | 197 |
observe.common.speedRange=Texto velocidad del viento
|
| 198 |
+observe.common.standardCode=Code standard \#TODO
|
|
| 196 | 199 |
observe.common.startDate=Fecha de comienzo
|
| 197 | 200 |
observe.common.startLogValue=Corredera de mañana (millas)
|
| 198 | 201 |
observe.common.startTime=Fecha - Heuro de inicio de validez
|
| ... | ... | @@ -249,6 +252,10 @@ observe.common.whenLeaving=Au départ \#TODO |
| 249 | 252 |
observe.common.wind=Fuerza del viento
|
| 250 | 253 |
observe.common.wormsId=Worms
|
| 251 | 254 |
observe.common.yearService=año de entrada en servicio
|
| 255 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre
|
|
| 256 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre \#TODO
|
|
| 257 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne
|
|
| 258 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Voir les programmes Senne \#TODO
|
|
| 252 | 259 |
observe.type.activityLongline=Actividad
|
| 253 | 260 |
observe.type.activityLonglineEncounter=Encuentro
|
| 254 | 261 |
observe.type.activityLonglineEncounters=Encuentros
|
| ... | ... | @@ -103,6 +103,7 @@ observe.common.label3=Libellé espagnol |
| 103 | 103 |
observe.common.landingHarbour=Port d'arrivée
|
| 104 | 104 |
observe.common.lastName=Nom
|
| 105 | 105 |
observe.common.latitude=Latitude
|
| 106 |
+observe.common.legacyCode=Ancien code
|
|
| 106 | 107 |
observe.common.length=Longueur hors tout
|
| 107 | 108 |
observe.common.lengthWeightFormula=Relation Poids
|
| 108 | 109 |
observe.common.lightsticksColor=Couleur de cyalumes
|
| ... | ... | @@ -145,6 +146,7 @@ observe.common.ocean/label8=Océan |
| 145 | 146 |
observe.common.organism=Organisme
|
| 146 | 147 |
observe.common.outputInputFormula=Formule sortie -> entrée
|
| 147 | 148 |
observe.common.outputSizeMeasureType=Type de mensuration de sortie
|
| 149 |
+observe.common.parent=Parent
|
|
| 148 | 150 |
observe.common.power=Puissance moteur principal
|
| 149 | 151 |
observe.common.previousFpaZone=Zone FPA quittée
|
| 150 | 152 |
observe.common.program=Programme
|
| ... | ... | @@ -193,6 +195,7 @@ observe.common.speciesGroupReleaseMode=Mode de libération |
| 193 | 195 |
observe.common.speciesGroupReleaseStatus=État à la libération
|
| 194 | 196 |
observe.common.speciesStatus=Statut faune observée
|
| 195 | 197 |
observe.common.speedRange=Libellé vitesse vent
|
| 198 |
+observe.common.standardCode=Code standard
|
|
| 196 | 199 |
observe.common.startDate=Début de validité
|
| 197 | 200 |
observe.common.startLogValue=Loch du matin (milles)
|
| 198 | 201 |
observe.common.startTime=Date - Heure de début de validité
|
| ... | ... | @@ -249,6 +252,10 @@ observe.common.whenLeaving=Au départ |
| 249 | 252 |
observe.common.wind=Vent Beaufort
|
| 250 | 253 |
observe.common.wormsId=Worms
|
| 251 | 254 |
observe.common.yearService=Année de mise en service
|
| 255 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre
|
|
| 256 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre
|
|
| 257 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne
|
|
| 258 |
+observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.description=Voir les programmes Seine
|
|
| 252 | 259 |
observe.type.activityLongline=Activité
|
| 253 | 260 |
observe.type.activityLonglineEncounter=Rencontre
|
| 254 | 261 |
observe.type.activityLonglineEncounters=Rencontres
|