June 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch develop-7.x
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT deleted branch develop-7.x at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: prepare version 7.0 init dev states
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf7af55d by Tony CHEMIT at 2017-06-09T13:24:32+02:00 prepare version 7.0 init dev states - - - - - 7bec2b33 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 transformation de ObjectOperation et suppression de ObjectFate - - - - - 95c465a4 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 Fix migrate dbs - - - - - 24a8ad38 by Tony CHEMIT at 2017-06-09T13:24:32+02:00 Add ObjectMaterial referential (See #577) - - - - - 3c7bdbbf by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add FloatingObjectPart data (See #577) - - - - - a3fcb665 by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add FloatingObjectPart ui (See #577) - - - - - d956dca7 by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Remove dcp fields (See #711) - - - - - ff689c2e by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add SpeciesGroupRelease referentials (See #612) - - - - - 84b2f01e by Tony CHEMIT at 2017-06-09T13:25:27+02:00 Add NonTargetCatchReleased data (See #612) - - - - - 03d529b6 by Tony CHEMIT at 2017-06-09T13:27:25+02:00 Add NonTargetCatchReleased ui (See #612) - - - - - 76c69f07 by Tony CHEMIT at 2017-06-09T13:27:25+02:00 Fix migration scripts for pg (See #612) - - - - - 04e16116 by Tony CHEMIT at 2017-06-09T13:30:24+02:00 realign pom to develop git branch - - - - - 30 changed files: - .gitlab-ci.yml - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - + application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchReleasedDecorator.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseModeDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupReleaseStateDto-ui-update-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleasedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9efd24a096e9df575774ff7890… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9efd24a096e9df575774ff7890… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [Report v6] Amélioration des libellés espagnols (See #775)
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9efd24a0 by Tony CHEMIT at 2017-06-09T13:22:13+02:00 [Report v6] Amélioration des libellés espagnols (See #775) - - - - - 4 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - services-validation/src/main/resources/i18n/services-validation_es_ES.properties Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -79,8 +79,8 @@ observe.type.encounterTypes=Tipos de encuentro observe.type.encounters=Encuentros observe.type.floatingObject=Objeto flotante observe.type.floatingObjectObservedSpecies=Especies observadas sobre el banco -observe.type.floatingObjectSchoolEstimate=Estimación del banco objeto -observe.type.floatingObjectSchoolEstimates=Estimaciones del banco objeto +observe.type.floatingObjectSchoolEstimate=Estimación del banco +observe.type.floatingObjectSchoolEstimates=Estimaciones del banco observe.type.floatingObjectTransmittingBuoy=Operación sobre la baliza observe.type.floatingObjectTransmittingBuoys=Operaciones sobre la baliza observe.type.floatingObjects=Objetos flotantes ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -15,7 +15,7 @@ observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta observe.common.brandName=Marca observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.catchFateLongline=Futuro de la captura observe.common.catchHealthness=Salud a la captura observe.common.catchWeight=Peso estimado (en t) @@ -31,7 +31,7 @@ observe.common.currentSpeed=Velocidad del corriente (nd) observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.deployementEnd=Fin de despliegue observe.common.description=Descripción observe.common.detectionMode=Modo de detección @@ -94,9 +94,9 @@ observe.common.label=Texto observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación Peso observe.common.lightsticksColor=Color de barrita de luz ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -364,7 +364,7 @@ observe.common.brandName=Marca observe.common.broughtOnDeck=Izado a bordo observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.caracteristics=Características observe.common.catchWeight=Peso estimado (en t) observe.common.catchWeightComputed.computed.tip=Peso estimado calculado @@ -390,7 +390,7 @@ observe.common.currentFpaZone=Zona FPA actual observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección @@ -429,10 +429,10 @@ observe.common.label5=Texto 5 observe.common.label6=Texto 6 observe.common.label7=Texto 7 observe.common.label8=Texto 8 -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre observe.common.lastUpdateDate=Last update date -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) @@ -460,7 +460,7 @@ observe.common.needComment=Se requiere un comentario observe.common.nextFpaZone=Zona FPA penetrada observe.common.no.balise=Ninguna baliza observe.common.nonCoupSenne=Razón de no lance -observe.common.nonTargetCatch=Fauna asociada conservada o descartada +observe.common.nonTargetCatch=Fauna accesoria conservada o descartada observe.common.nonTargetObservation=Fauna asociada observe.common.nonTargetSample=Muestreo fauna asociada observe.common.objectFate=Devenir de objeto @@ -1122,9 +1122,9 @@ observe.content.setLongline.basketsPerSectionCount=Número de cestas por secció observe.content.setLongline.branchlinesPerBasketCount=Número de anzuelos por cesta observe.content.setLongline.haulingBreaks=Número de cortes observe.content.setLongline.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.content.setLongline.haulingEndCoordinates=Coordinadas del fin de arrastre +observe.content.setLongline.haulingEndCoordinates=Coordenadas del fin de arrastre observe.content.setLongline.haulingEndTimeStamp=Timestamp de fin -observe.content.setLongline.haulingStartCoordinates=Coordinadas del inicio de arrastre +observe.content.setLongline.haulingStartCoordinates=Coordenadas del inicio de arrastre observe.content.setLongline.haulingStartTimeStamp=Timestamp del inicio observe.content.setLongline.homeId=Id de negocio observe.content.setLongline.lightsticksColor=Color de barrita de luz @@ -1136,10 +1136,10 @@ observe.content.setLongline.message.creating=Lance en proceso de creación. observe.content.setLongline.message.updating=La operación de pesca está en proceso de modificación. observe.content.setLongline.monitored=Instrumentada observe.content.setLongline.number=Número -observe.content.setLongline.settingEndCoordinates=Coordinadas de fin de calada +observe.content.setLongline.settingEndCoordinates=Coordenadas de fin de calada observe.content.setLongline.settingEndTimeStamp=Timestamp de fin observe.content.setLongline.settingShape=Forma de la calada -observe.content.setLongline.settingStartCoordinates=Coordinadas del inicio de calada +observe.content.setLongline.settingStartCoordinates=Coordenadas del inicio de calada observe.content.setLongline.settingStartTimeStamp=Timestamp de inicio observe.content.setLongline.settingVesselSpeed=Velocidad del barco (nd) observe.content.setLongline.shooterSpeed=Velocidad shooter (nd) @@ -1158,31 +1158,31 @@ observe.content.setLongline.totalHooksCount=Número total d'arponcillos observe.content.setLongline.totalSectionsCount=Número total de secciones observe.content.setLongline.weightedSnap=Snap lesté observe.content.setLongline.weightedSwivel=Émerillon lesté -observe.content.setSeine.currentDirection=Direction du courant (°) -observe.content.setSeine.currentMeasureDepth=Profundidad de medida du courant (m) -observe.content.setSeine.currentSpeed=Velocidad del corriente (nd) -observe.content.setSeine.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.content.setSeine.endSetTimeStamp=Fecha - Hora de fin de validez -observe.content.setSeine.maxGearDepth=Profundidad máxima (m) +observe.content.setSeine.currentDirection=Dirección de corriente (°) +observe.content.setSeine.currentMeasureDepth=Profundidad de corriente (m) +observe.content.setSeine.currentSpeed=Velocidad de corriente (nd) +observe.content.setSeine.endPursingTimeStamp=Fecha - Hora de fin de recogida de jareta +observe.content.setSeine.endSetTimeStamp=Fecha - Hora final lance +observe.content.setSeine.maxGearDepth=Profundidad de cierre del arte (m) observe.content.setSeine.message.creating=Lance en proceso de creación. observe.content.setSeine.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. observe.content.setSeine.message.no.nonTargetDiscarded=El lance no tiene descarte de fauna. observe.content.setSeine.message.no.targetCatch=Para los muestreos de atunes capturados, se necesita al menos una captura. observe.content.setSeine.message.no.targetDiscarded=Para muestreos de atunes, se necesita al menos un descarte de atún izado a bordo. observe.content.setSeine.message.updating=Se está modificando el lance actual. -observe.content.setSeine.nonTargetDiscarded=Rechazo de fauna -observe.content.setSeine.reasonForNullSet=Causas de lance nulo +observe.content.setSeine.nonTargetDiscarded=Descarte de fauna +observe.content.setSeine.reasonForNullSet=Causa de lance nulo observe.content.setSeine.schoolMeanDepth=Profundidad media (m) -observe.content.setSeine.schoolThickness=Grossor del banco (m) -observe.content.setSeine.schoolTopDepth=Profundidad de la cumbre (m) +observe.content.setSeine.schoolThickness=Esperor del banco (m) +observe.content.setSeine.schoolTopDepth=Profundidad comienzo (m) observe.content.setSeine.schoolType=Tipo de banco observe.content.setSeine.schoolType.not.fill=vacío observe.content.setSeine.sonarUsedAvantSet=Utilización del sonar antes del lance -observe.content.setSeine.startTime=Fecha - Heuro de inicio de validez -observe.content.setSeine.supportVesselName=Nombre supply +observe.content.setSeine.startTime=Fecha - Hora comienzo lance +observe.content.setSeine.supportVesselName=Nombre Macicero observe.content.setSeine.tab.general=Características generales -observe.content.setSeine.tab.measurements=Medidas -observe.content.setSeine.targetDiscarded=Rechazo de atún +observe.content.setSeine.tab.measurements=Parámetros +observe.content.setSeine.targetDiscarded=Descarte de atún observe.content.setSeine.title=Lance observe.content.sizeMeasure.delete.message=Confirmar la eliminación de la medida del tamaño seleccionado. observe.content.species.availableOcean=Oceanos disponibles @@ -1289,7 +1289,7 @@ observe.content.tdr.table.sensorBrand.tip=Marca del sensor observe.content.tdr.table.serialNo=N° observe.content.tdr.table.serialNo.tip=Número de serie observe.content.tdr.title=Registrador de profundidad -observe.content.tripLongline.captain=Capitán +observe.content.tripLongline.captain=Patrón observe.content.tripLongline.dataEntryOperator=Operador de captación de datos observe.content.tripLongline.endDate=Fecha de fin observe.content.tripLongline.homeId=Id de negocio @@ -1575,7 +1575,7 @@ observe.storage.action.apply=Utilizar observe.storage.action.apply.tip=Utilizar la fuente de datos configuarada observe.storage.action.cancel=Cancelar el cambio de la fuente de datos observe.storage.action.cancel.tip=Cancelar el cambio de la fuente de datos -observe.storage.activityLongline.coordinate=Coordinadas +observe.storage.activityLongline.coordinate=Coordenadas observe.storage.activityLongline.fpaZone=Zona FPA observe.storage.activityLongline.message.active.found=Actividad abierta observe.storage.activityLongline.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -1598,8 +1598,8 @@ observe.storage.activitySeine.message.no.active.found=Ninguna actividad abierta, observe.storage.activitySeine.message.no.active.found.for.other.route=Ninguna actividad abierta en esta ruta. observe.storage.activitySeine.message.not.open=La actividad no está abierta, imposible modificar. observe.storage.activitySeine.message.updating=Se está modificando la actividad actual. -observe.storage.activitySeine.tab.general=Características generales -observe.storage.activitySeine.tab.measurements=Medidas +observe.storage.activitySeine.tab.general=Actividad y Posición +observe.storage.activitySeine.tab.measurements=Parámetros observe.storage.activitySeine.tab.observedSystem=Sistema observado observe.storage.activitySeine.title=Actividad observe.storage.activitySeines.title=Actividades ===================================== services-validation/src/main/resources/i18n/services-validation_es_ES.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_es_ES.properties +++ b/services-validation/src/main/resources/i18n/services-validation_es_ES.properties @@ -14,7 +14,7 @@ observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta observe.common.brandName=Marca observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.catchFateLongline=Futuro de la captura observe.common.catchHealthness=Salud a la captura observe.common.catchWeight=Peso estimado (en t) @@ -29,7 +29,7 @@ observe.common.currentSpeed=Velocidad del corriente (nd) observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.deployementEnd=Fin de despliegue observe.common.description=Descripción observe.common.detectionMode=Modo de detección @@ -89,9 +89,9 @@ observe.common.label=Texto observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación Peso observe.common.lightsticksColor=Color de barrita de luz View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9efd24a096e9df575774ff78908… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9efd24a096e9df575774ff78908… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Impossible d'enregistrer une connexion dans les préférences depuis les interface…
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc8df484 by Tony CHEMIT at 2017-06-09T12:25:05+02:00 Impossible d'enregistrer une connexion dans les préférences depuis les interfaces d'administration obtuna (See #778) - - - - - 7eb5fb2d by Tony CHEMIT at 2017-06-09T12:58:43+02:00 Problème de migration de base de v5 vers v6 sur observe_longline.sizemeasuretype (See #779) - - - - - e2d2ebcd by Tony CHEMIT at 2017-06-09T13:05:16+02:00 [Report v6] Erreur lors de synchros avec la base IEO (See #772) - - - - - 268d6af6 by Tony CHEMIT at 2017-06-09T13:17:09+02:00 [Report v6] Problème lors de la synchro de relation taille-poids entre la base française et la base espagnole (See #77) - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java - topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ +import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; @@ -121,7 +122,7 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { configuration.setLogin(model.getRemoteLogin()); configuration.setPassword(new String(model.getRemotePassword())); configuration.setUseSsl(model.isUseSsl()); - getMainUI().getConfig().addRemoteDataSourceConfiguration(configuration); + ObserveSwingApplicationContext.get().getConfig().addRemoteDataSourceConfiguration(configuration); configUI.getHandler().addRemoteConfiguration(configuration); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -118,6 +118,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC .put("LC", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928") .put("LT", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") .put("", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") + .put(" ", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") .put("FL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336") .put("CFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541") .put("PAL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359") @@ -145,7 +146,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { // Attention à ce moment là ce référentiel est encore dans le schema longline - return connection.prepareStatement("SELECT code, topiaid FROM observe_longline.sizemeasuretype "); + return connection.prepareStatement("SELECT code, topiaid FROM observe_longline.sizemeasuretype WHERE code IS NOT NULL"); } @Override ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java @@ -142,7 +142,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { Class<E> entityType = binderEngine.getReferentialEntityType(type); TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); List<E> insertEntities = loadEntities(entityType, tasks); - if (metadata.withShell()) { + if (metadata.withEntities()) { InsertSqlWithCascadeStatementGenerator<R> insertGenerator = new InsertSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) { @@ -189,7 +189,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { Class<E> entityType = binderEngine.getReferentialEntityType(type); List<E> updateEntities = loadEntities(entityType, tasks); - if (metadata.withShell()) { + if (metadata.withEntities()) { UpdateSqlWithCascadeStatementGenerator<R> updateGenerator = new UpdateSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) { @Override ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java @@ -101,6 +101,8 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { public ImmutableList<String> generateSql(R referentialDto) { + ImmutableList.Builder<String> result = ImmutableList.builder(); + List<String> parameters = new LinkedList<>(); addStringParameter(referentialDto.getId(), parameters); @@ -156,15 +158,15 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { continue; } if (parameterValue instanceof ReferentialDto) { - addReferentialDtoParameter((ReferentialDto) parameterValue, parameters); + addReferentialDtoParameter((ReferentialDto) parameterValue, parameters, result); continue; } if (parameterValue instanceof ReferentialReference) { - addReferentialReferenceParameter((ReferentialReference) parameterValue, parameters); + addReferentialReferenceParameter((ReferentialReference) parameterValue, parameters,result); } } - ImmutableList.Builder<String> result = ImmutableList.builder(); + result.add(String.format(INSERT_STATEMENT, schemaName, @@ -278,11 +280,11 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { parameters.add("" + parameter); } - protected void addReferentialReferenceParameter(ReferentialReference<?> parameter, List<String> parameters) { + protected void addReferentialReferenceParameter(ReferentialReference<?> parameter, List<String> parameters, ImmutableList.Builder<String> result) { addStringParameter(parameter.getId(), parameters); } - protected void addReferentialDtoParameter(ReferentialDto parameter, List<String> parameters) { + protected void addReferentialDtoParameter(ReferentialDto parameter, List<String> parameters, ImmutableList.Builder<String> result) { addStringParameter(parameter.getId(), parameters); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java @@ -26,15 +26,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialDto; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import java.util.List; - /** * Pour générer une requète sql d'ajout à partir d'un référentiel donné et aussi tous les inserts manquants - * + * <p> * Created on 29/06/16. * * @author Tony Chemit - dev(a)tchemit.fr @@ -57,19 +56,19 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti @Override protected <D extends ReferentialDto> void addMnAssociation(String nmAssociationTableName, String nmAssociationDbColumnName, String referentialDtoId, Class<? extends ReferentialDto> associationType, String associationId, ImmutableList.Builder<String> builder) { super.addMnAssociation(nmAssociationTableName, nmAssociationDbColumnName, referentialDtoId, associationType, associationId, builder); - addMissingReferentialIfNecessary(associationType, associationId); + addMissingReferentialIfNecessary(associationType, associationId, builder); } @Override - protected void addReferentialReferenceParameter(ReferentialReference<?> parameter, List<String> parameters) { - super.addReferentialReferenceParameter(parameter, parameters); - addMissingReferentialIfNecessary(parameter.getType(), parameter.getId()); + protected void addReferentialReferenceParameter(ReferentialReference<?> parameter, List<String> parameters, ImmutableList.Builder<String> result) { + super.addReferentialReferenceParameter(parameter, parameters, result); + addMissingReferentialIfNecessary(parameter.getType(), parameter.getId(), result); } @Override - protected void addReferentialDtoParameter(ReferentialDto parameter, List<String> parameters) { - super.addReferentialDtoParameter(parameter, parameters); - addMissingReferentialIfNecessary(parameter.getClass(), parameter.getId()); + protected void addReferentialDtoParameter(ReferentialDto parameter, List<String> parameters, ImmutableList.Builder<String> result) { + super.addReferentialDtoParameter(parameter, parameters, result); + addMissingReferentialIfNecessary(parameter.getClass(), parameter.getId(), result); } }; } @@ -82,20 +81,19 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti } - private <D extends ReferentialDto> ImmutableList<String> addMissingReferentialIfNecessary(Class<D> associationType, String associationId) { + private <D extends ReferentialDto> void addMissingReferentialIfNecessary(Class<D> associationType, String associationId, ImmutableList.Builder<String> builder) { if (idsOnlyExistingOnThisSide.containsEntry(associationType, associationId)) { // il faut insérer aussi ce référentiel ImmutableList<String> sql = insertMissingReferential(associationType, associationId); + builder.addAll(sql); + // ce référentiel est désormais présent dans les deux sources idsOnlyExistingOnThisSide.remove(associationType, associationId); - return sql; - } - return null; } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java @@ -23,16 +23,8 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; */ import com.google.common.collect.ImmutableList; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.reference.ReferentialReference; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.sql.Timestamp; import java.util.Collection; import java.util.Date; @@ -40,10 +32,17 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.TreeMap; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; /** * Pour générer une requète sql de mise à jour à partir d'un référentiel donné. - * + * <p> * Created on 29/06/16. * * @author Tony Chemit - dev(a)tchemit.fr @@ -152,6 +151,8 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { } + ImmutableList.Builder<String> result = ImmutableList.builder(); + if (manyToOneAssociationNames.length > 0) { Map<String, Object> manyToOneAssociations = binder.obtainProperties(referentialDto, true, manyToOneAssociationNames); @@ -166,18 +167,17 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { continue; } if (manyToOneAssociationValue instanceof ReferentialDto) { - addReferentialDtoParameter(columnName, (ReferentialDto) manyToOneAssociationValue, parameters); + addReferentialDtoParameter(columnName, (ReferentialDto) manyToOneAssociationValue, parameters, result); continue; } if (manyToOneAssociationValue instanceof ReferentialReference) { - addReferentialReferenceParameter(columnName, (ReferentialReference) manyToOneAssociationValue, parameters); + addReferentialReferenceParameter(columnName, (ReferentialReference) manyToOneAssociationValue, parameters, result); } } } - ImmutableList.Builder<String> result = ImmutableList.builder(); String sql = String.format(UPDATE_STATEMENT, schemaName, @@ -190,17 +190,14 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { } for (ManyToManyAssociationStruct manyToManyAssociation : manyToManyAssociations) { - String manyToManyAssociationSql = generateManyToManyAssociationSql(referentialDto, manyToManyAssociation); - result.add(manyToManyAssociationSql); + generateManyToManyAssociationSql(referentialDto, manyToManyAssociation, result); } return result.build(); } - private String generateManyToManyAssociationSql(R referentialDto, ManyToManyAssociationStruct manyToManyAssociation) { - - StringBuilder builder = new StringBuilder(); + private void generateManyToManyAssociationSql(R referentialDto, ManyToManyAssociationStruct manyToManyAssociation, ImmutableList.Builder<String> result) { String referentialDtoId = referentialDto.getId(); String manyToManyAssociationTableName = manyToManyAssociation.tableName; @@ -211,7 +208,7 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { manyToManyAssociationTableName, tableName, referentialDtoId); - builder.append(deleteSql); + result.add(deleteSql); if (log.isDebugEnabled()) { log.debug("sql: " + deleteSql); } @@ -231,13 +228,11 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { referentialDtoId, manyToManyAssociationValue.getType(), manyToManyAssociationValue.getId(), - builder + result ); } } - return builder.toString(); - } protected <D extends ReferentialDto> void addMnAssociation(String nmAssociationTableName, @@ -245,7 +240,7 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { String referentialDtoId, Class<D> associationType, String associationId, - StringBuilder builder) { + ImmutableList.Builder<String> builder) { String sql = String.format(MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT, schemaName, @@ -257,7 +252,7 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { if (log.isDebugEnabled()) { log.debug("sql: " + sql); } - builder.append(sql); + builder.add(sql); } @@ -299,11 +294,11 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { addParameter0(columnName, "" + parameter, parameters); } - protected void addReferentialReferenceParameter(String columnName, ReferentialReference parameter, StringBuilder parameters) { + protected void addReferentialReferenceParameter(String columnName, ReferentialReference parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { addStringParameter(columnName, parameter.getId(), parameters); } - protected void addReferentialDtoParameter(String columnName, ReferentialDto parameter, StringBuilder parameters) { + protected void addReferentialDtoParameter(String columnName, ReferentialDto parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { addStringParameter(columnName, parameter.getId(), parameters); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java @@ -32,7 +32,7 @@ import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; /** * Pour générer une requète sql d'ajout à partir d'un référentiel donné et aussi tous les inserts manquants. - * + * <p> * Created on 29/06/16. * * @author Tony Chemit - dev(a)tchemit.fr @@ -53,21 +53,21 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti this.delegateGenerator = new UpdateSqlStatementGenerator<R>(metadataEntity, dtoType) { @Override - protected <D extends ReferentialDto> void addMnAssociation(String nmAssociationTableName, String nmAssociationDbColumnName, String referentialDtoId, Class<D> associationType, String associationId, StringBuilder builder) { - super.addMnAssociation(nmAssociationTableName, nmAssociationDbColumnName, referentialDtoId, associationType, associationId, builder); - addMissingReferentialIfNecessary(associationType, associationId); + protected <D extends ReferentialDto> void addMnAssociation(String nmAssociationTableName, String nmAssociationDbColumnName, String referentialDtoId, Class<D> associationType, String associationId, ImmutableList.Builder<String> result) { + super.addMnAssociation(nmAssociationTableName, nmAssociationDbColumnName, referentialDtoId, associationType, associationId, result); + addMissingReferentialIfNecessary(associationType, associationId, result); } @Override - protected void addReferentialReferenceParameter(String columnName, ReferentialReference parameter, StringBuilder parameters) { - super.addReferentialReferenceParameter(columnName, parameter, parameters); - addMissingReferentialIfNecessary(parameter.getType(), parameter.getId()); + protected void addReferentialReferenceParameter(String columnName, ReferentialReference parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { + super.addReferentialReferenceParameter(columnName, parameter, parameters, result); + addMissingReferentialIfNecessary(parameter.getType(), parameter.getId(), result); } @Override - protected void addReferentialDtoParameter(String columnName, ReferentialDto parameter, StringBuilder parameters) { - super.addReferentialDtoParameter(columnName, parameter, parameters); - addMissingReferentialIfNecessary(parameter.getClass(), parameter.getId()); + protected void addReferentialDtoParameter(String columnName, ReferentialDto parameter, StringBuilder parameters, ImmutableList.Builder<String> result) { + super.addReferentialDtoParameter(columnName, parameter, parameters, result); + addMissingReferentialIfNecessary(parameter.getClass(), parameter.getId(), result); } }; } @@ -80,20 +80,17 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti } - private <D extends ReferentialDto> ImmutableList<String> addMissingReferentialIfNecessary(Class<D> associationType, String associationId) { + private <D extends ReferentialDto> void addMissingReferentialIfNecessary(Class<D> associationType, String associationId, ImmutableList.Builder<String> result) { if (idsOnlyExistingOnThisSide.containsEntry(associationType, associationId)) { // il faut insérer aussi ce référentiel ImmutableList<String> sqls = insertMissingReferential(associationType, associationId); - + result.addAll(sqls); // ce référentiel est désormais présent dans les deux sources idsOnlyExistingOnThisSide.remove(associationType, associationId); - return sqls; - } - return null; } } ===================================== topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java ===================================== --- a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java +++ b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java @@ -347,4 +347,7 @@ public class TopiaMetadataEntity { } } + public boolean withEntities() { + return withShell() || !manyToOneAssociations.isEmpty(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eae7f32c4aaac70a71ee45c071… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eae7f32c4aaac70a71ee45c071… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Amélioration des libellés espagnols (See #775)
by Tony CHEMIT 09 Jun '17

09 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 74581618 by Tony CHEMIT at 2017-06-09T10:21:38+02:00 Amélioration des libellés espagnols (See #775) - - - - - 4 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -53,8 +53,8 @@ observe.type.encounterTypes=Tipos de encuentro observe.type.encounters=Encuentros observe.type.floatingObject=Objeto flotante observe.type.floatingObjectObservedSpecies=Especies observadas sobre el banco -observe.type.floatingObjectSchoolEstimate=Estimación del banco objeto -observe.type.floatingObjectSchoolEstimates=Estimaciones del banco objeto +observe.type.floatingObjectSchoolEstimate=Estimación del banco +observe.type.floatingObjectSchoolEstimates=Estimaciones del banco observe.type.floatingObjectTransmittingBuoy=Operación sobre la baliza observe.type.floatingObjectTransmittingBuoys=Operaciones sobre la baliza observe.type.floatingObjects=Objetos flotantes ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -15,7 +15,7 @@ observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta observe.common.brandName=Marca observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.catchFateLongline=Futuro de la captura observe.common.catchHealthness=Salud a la captura observe.common.catchWeight=Peso estimado (en t) @@ -31,7 +31,7 @@ observe.common.currentSpeed=Velocidad del corriente (nd) observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.deployementEnd=Fin de despliegue observe.common.description=Descripción observe.common.detectionMode=Modo de detección @@ -91,9 +91,9 @@ observe.common.keelCode=Código de Quilla observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación Peso observe.common.lightsticksColor=Color de barrita de luz ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -352,7 +352,7 @@ observe.common.brandName=Marca observe.common.broughtOnDeck=Izado a bordo observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.caracteristics=Características observe.common.catchWeight=Peso estimado (en t) observe.common.catchWeightComputed.computed.tip=Peso estimado calculado @@ -376,7 +376,7 @@ observe.common.currentFpaZone=Zona FPA actual observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección @@ -409,10 +409,10 @@ observe.common.label5=Texto 5 observe.common.label6=Texto 6 observe.common.label7=Texto 7 observe.common.label8=Texto 8 -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre observe.common.lastUpdateDate=Last update date -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) @@ -441,7 +441,7 @@ observe.common.needComment=Se requiere un comentario observe.common.nextFpaZone=Zona FPA penetrada observe.common.no.balise=Ninguna baliza observe.common.nonCoupSenne=Razón de no lance -observe.common.nonTargetCatch=Fauna asociada conservada o descartada +observe.common.nonTargetCatch=Fauna accesoria conservada o descartada observe.common.nonTargetObservation=Fauna asociada observe.common.nonTargetSample=Muestreo fauna asociada observe.common.objectFate=Devenir de objeto @@ -1083,9 +1083,9 @@ observe.content.setLongline.basketsPerSectionCount=Número de cestas por secció observe.content.setLongline.branchlinesPerBasketCount=Número de anzuelos por cesta observe.content.setLongline.haulingBreaks=Número de cortes observe.content.setLongline.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.content.setLongline.haulingEndCoordinates=Coordinadas del fin de arrastre +observe.content.setLongline.haulingEndCoordinates=Coordenadas del fin de arrastre observe.content.setLongline.haulingEndTimeStamp=Timestamp de fin -observe.content.setLongline.haulingStartCoordinates=Coordinadas del inicio de arrastre +observe.content.setLongline.haulingStartCoordinates=Coordenadas del inicio de arrastre observe.content.setLongline.haulingStartTimeStamp=Timestamp del inicio observe.content.setLongline.homeId=Id de negocio observe.content.setLongline.lightsticksColor=Color de barrita de luz @@ -1097,10 +1097,10 @@ observe.content.setLongline.message.creating=Lance en proceso de creación. observe.content.setLongline.message.updating=La operación de pesca está en proceso de modificación. observe.content.setLongline.monitored=Instrumentada observe.content.setLongline.number=Número -observe.content.setLongline.settingEndCoordinates=Coordinadas de fin de calada +observe.content.setLongline.settingEndCoordinates=Coordenadas de fin de calada observe.content.setLongline.settingEndTimeStamp=Timestamp de fin observe.content.setLongline.settingShape=Forma de la calada -observe.content.setLongline.settingStartCoordinates=Coordinadas del inicio de calada +observe.content.setLongline.settingStartCoordinates=Coordenadas del inicio de calada observe.content.setLongline.settingStartTimeStamp=Timestamp de inicio observe.content.setLongline.settingVesselSpeed=Velocidad del barco (nd) observe.content.setLongline.shooterSpeed=Velocidad shooter (nd) @@ -1117,32 +1117,32 @@ observe.content.setLongline.totalHooksCount=Número total d'arponcillos observe.content.setLongline.totalSectionsCount=Número total de secciones observe.content.setLongline.weightedSnap=Snap lesté observe.content.setLongline.weightedSwivel=Émerillon lesté -observe.content.setSeine.currentDirection=Direction du courant (°) -observe.content.setSeine.currentMeasureDepth=Profundidad de medida du courant (m) -observe.content.setSeine.currentSpeed=Velocidad del corriente (nd) -observe.content.setSeine.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.content.setSeine.endSetTimeStamp=Fecha - Hora de fin de validez -observe.content.setSeine.maxGearDepth=Profundidad máxima (m) +observe.content.setSeine.currentDirection=Dirección de corriente (°) +observe.content.setSeine.currentMeasureDepth=Profundidad de corriente (m) +observe.content.setSeine.currentSpeed=Velocidad de corriente (nd) +observe.content.setSeine.endPursingTimeStamp=Fecha - Hora de fin de recogida de jareta +observe.content.setSeine.endSetTimeStamp=Fecha - Hora final lance +observe.content.setSeine.maxGearDepth=Profundidad de cierre del arte (m) observe.content.setSeine.message.creating=Lance en proceso de creación. observe.content.setSeine.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. observe.content.setSeine.message.no.nonTargetDiscarded=El lance no tiene descarte de fauna. observe.content.setSeine.message.no.targetCatch=Para los muestreos de atunes capturados, se necesita al menos una captura. observe.content.setSeine.message.no.targetDiscarded=Para muestreos de atunes, se necesita al menos un descarte de atún izado a bordo. observe.content.setSeine.message.updating=Se está modificando el lance actual. -observe.content.setSeine.nonTargetDiscarded=Rechazo de fauna -observe.content.setSeine.reasonForNullSet=Causas de lance nulo +observe.content.setSeine.nonTargetDiscarded=Descarte de fauna +observe.content.setSeine.reasonForNullSet=Causa de lance nulo observe.content.setSeine.schoolMeanDepth=Profundidad media (m) -observe.content.setSeine.schoolThickness=Grossor del banco (m) -observe.content.setSeine.schoolTopDepth=Profundidad de la cumbre (m) +observe.content.setSeine.schoolThickness=Esperor del banco (m) +observe.content.setSeine.schoolTopDepth=Profundidad comienzo (m) observe.content.setSeine.schoolType=Tipo de banco observe.content.setSeine.schoolType.not.fill=vacío observe.content.setSeine.sonarUsed=Utilización del sonar durante el lance observe.content.setSeine.sonarUsedAvantSet=Utilización del sonar antes del lance -observe.content.setSeine.startTime=Fecha - Heuro de inicio de validez -observe.content.setSeine.supportVesselName=Nombre supply +observe.content.setSeine.startTime=Fecha - Hora comienzo lance +observe.content.setSeine.supportVesselName=Nombre Macicero observe.content.setSeine.tab.general=Características generales -observe.content.setSeine.tab.measurements=Medidas -observe.content.setSeine.targetDiscarded=Rechazo de atún +observe.content.setSeine.tab.measurements=Parámetros +observe.content.setSeine.targetDiscarded=Descarte de atún observe.content.setSeine.title=Lance observe.content.sizeMeasure.delete.message=Confirmar la eliminación de la medida del tamaño seleccionado. observe.content.species.availableOcean=Oceanos disponibles @@ -1247,7 +1247,7 @@ observe.content.tdr.table.sensorBrand.tip=Marca del sensor observe.content.tdr.table.serialNo=N° observe.content.tdr.table.serialNo.tip=Número de serie observe.content.tdr.title=Registrador de profundidad -observe.content.tripLongline.captain=Capitán +observe.content.tripLongline.captain=Patrón observe.content.tripLongline.dataEntryOperator=Operador de captación de datos observe.content.tripLongline.endDate=Fecha de fin observe.content.tripLongline.homeId=Id de negocio @@ -1523,7 +1523,7 @@ observe.storage.action.apply.tip=Utilizar la fuente de datos configuarada observe.storage.action.canMigrate=Actualización de la base (versión actual %1$s) observe.storage.action.cancel=Cancelar el cambio de la fuente de datos observe.storage.action.cancel.tip=Cancelar el cambio de la fuente de datos -observe.storage.activityLongline.coordinate=Coordinadas +observe.storage.activityLongline.coordinate=Coordenadas observe.storage.activityLongline.fpaZone=Zona FPA observe.storage.activityLongline.message.active.found=Actividad abierta observe.storage.activityLongline.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -1546,8 +1546,8 @@ observe.storage.activitySeine.message.no.active.found=Ninguna actividad abierta, observe.storage.activitySeine.message.no.active.found.for.other.route=Ninguna actividad abierta en esta ruta. observe.storage.activitySeine.message.not.open=La actividad no está abierta, imposible modificar. observe.storage.activitySeine.message.updating=Se está modificando la actividad actual. -observe.storage.activitySeine.tab.general=Características generales -observe.storage.activitySeine.tab.measurements=Medidas +observe.storage.activitySeine.tab.general=Actividad y Posición +observe.storage.activitySeine.tab.measurements=Parámetros observe.storage.activitySeine.tab.observedSystem=Sistema observado observe.storage.activitySeine.title=Actividad observe.storage.activitySeines.title=Actividades ===================================== services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties ===================================== --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -14,7 +14,7 @@ observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta observe.common.brandName=Marca observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad -observe.common.captain=Capitán +observe.common.captain=Patrón observe.common.catchFateLongline=Futuro de la captura observe.common.catchHealthness=Salud a la captura observe.common.catchWeight=Peso estimado (en t) @@ -29,7 +29,7 @@ observe.common.currentSpeed=Velocidad del corriente (nd) observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de origen +observe.common.departureHarbour=Puerto de embarque observe.common.deployementEnd=Fin de despliegue observe.common.description=Descripción observe.common.detectionMode=Modo de detección @@ -87,9 +87,9 @@ observe.common.keelCode=Código de Quilla observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre -observe.common.landingHarbour=Puerto de destino +observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre -observe.common.latitude=Latitude +observe.common.latitude=Latitud observe.common.length=Longitud eslora total observe.common.lengthWeightFormula=Relación Peso observe.common.lightsticksColor=Color de barrita de luz View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/74581618fd96b9602de77637ca9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/74581618fd96b9602de77637ca9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] improve builds
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: ca983d25 by Tony CHEMIT at 2017-06-08T11:23:58+02:00 improve builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ deploy-snapshot: <<: *test_manual script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DskipTests -DperformRelease/' | bash latest-site: <<: *env_test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ca983d258972b781d169cb629a7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ca983d258972b781d169cb629a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] improve builds
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: b9037f26 by Tony CHEMIT at 2017-06-08T11:10:20+02:00 improve builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,6 @@ stage: deploy-snapshot: <<: *env_staging <<: *test_manual - <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b9037f263c73f54660003caeddc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b9037f263c73f54660003caeddc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve builds
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eae7f32c by Tony CHEMIT at 2017-06-08T10:59:03+02:00 improve builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,6 @@ stage: deploy-snapshot: <<: *env_staging <<: *test_manual - <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eae7f32c4aaac70a71ee45c0718… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eae7f32c4aaac70a71ee45c0718… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-5.x] improve builds
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: c0a9625f by Tony CHEMIT at 2017-06-08T10:20:28+02:00 improve builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,9 +57,11 @@ build: stage: Build <<: *before_script_default script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean verify/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify/' | bash only: - develop + - develop-5.x + - develop-7.x - feature/* except: - triggers @@ -69,18 +71,12 @@ build: <<: *before_script_default only: - develop + - develop-5.x + - develop-7.x except: - triggers when: manual -deploy_snapshot: - <<: *env_staging - <<: *test_manual - <<: *before_script_clone - script: - - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash - stage: <<: *env_staging <<: *test_manual @@ -93,6 +89,14 @@ stage: - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +deploy-snapshot: + <<: *env_staging + <<: *test_manual + <<: *before_script_clone + script: + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash + latest-site: <<: *env_test <<: *test_manual @@ -113,7 +117,7 @@ nightly-build: <<: *nightly script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean verify -DperformRelease/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DperformRelease/' | bash nightly-site: stage: Test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0a9625feae7df93f7520d249bc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0a9625feae7df93f7520d249bc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve builds
by Tony CHEMIT 08 Jun '17

08 Jun '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e08aa859 by Tony CHEMIT at 2017-06-08T10:18:26+02:00 improve builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,21 +45,22 @@ stages: .deploy_site: &deploy_site script: - - mvn clean install site -DperformRelease scm-publish:publish-scm + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install site -DperformRelease scm-publish:publish-scm/' | bash .deploy_demo_latest: &deploy_demo_latest stage: Test script: - - mvn -Padd-git-commit-id-to-project-version -N - - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/-Padd-git-commit-id-to-project-version -N/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest/' | bash build: stage: Build <<: *before_script_default script: - - mvn clean verify + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify/' | bash only: - develop + - develop-5.x - develop-7.x - feature/* except: @@ -70,6 +71,7 @@ build: <<: *before_script_default only: - develop + - develop-5.x - develop-7.x except: - triggers @@ -87,6 +89,14 @@ stage: - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +deploy-snapshot: + <<: *env_staging + <<: *test_manual + <<: *before_script_clone + script: + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash + latest-site: <<: *env_test <<: *test_manual @@ -107,7 +117,7 @@ nightly-build: <<: *nightly script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - mvn clean verify -DperformRelease + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DperformRelease/' | bash nightly-site: stage: Test @@ -131,7 +141,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease/' | bash staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e08aa8594b1cda6a04ac727db75… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e08aa8594b1cda6a04ac727db75… You're receiving this email because of your account on gitlab.com.

1 0