branch develop updated (012ae4a -> b96f52e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 012ae4a Fix code mapping (Fixes #8391) new 9dd2350 Ajout champs sur vessel (persistence) new e1dabcc Ajout champs sur vessel (service) new 438b00e Ajout champs sur vessel (ui) new b96f52e [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b96f52e5dd4c729464bb442aaac836874023657d Merge: 012ae4a 438b00e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:45 2016 +0100 [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop commit 438b00e74a5696a4d5ef9f1d6197a974a820532e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:42 2016 +0100 Ajout champs sur vessel (ui) commit e1dabcce66e2797f00b43ab49a7ffc4a6e3d9a7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:27 2016 +0100 Ajout champs sur vessel (service) commit 9dd23505c2a043f67c79d0f3669d30d60464d6c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:17 2016 +0100 Ajout champs sur vessel (persistence) Summary of changes: .../swing/ui/content/ref/impl/VesselUI.jaxx | 70 +++++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUI.jcss | 63 +++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUIModel.java | 40 ++++++++---- .../i18n/application-swing_en_GB.properties | 7 +++ .../i18n/application-swing_es_ES.properties | 7 +++ .../i18n/application-swing_fr_FR.properties | 7 +++ .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 7 +++ .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 7 +++ entities/src/main/xmi/observe-common.zargo | Bin 38441 -> 38794 bytes .../src/main/xmi/observe-services-dto-common.zargo | Bin 42688 -> 43074 bytes .../topia/binder/referential/VesselBinder.java | 15 ++++- 12 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9dd23505c2a043f67c79d0f3669d30d60464d6c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:17 2016 +0100 Ajout champs sur vessel (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 7 +++++++ .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 7 +++++++ entities/src/main/xmi/observe-common.zargo | Bin 38441 -> 38794 bytes 4 files changed, 15 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 5db832a..910bd53 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -55,6 +55,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("10", "evol_8391_species_add_sizeMeasureType", queries); evol8391(topiaSqlSupport, queries); addScript("11", "evol_8571_length_add_tagNumber", queries); + addScript("12", "evol_8475_vessel_add_fields", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql new file mode 100644 index 0000000..5625202 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql @@ -0,0 +1,7 @@ +ALTER TABLE observe_common.vessel ADD COLUMN comId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN ctoiId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN iattcId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN imoId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN nationalId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN radioCallSignId VARCHAR(255); +ALTER TABLE observe_common.vessel ADD COLUMN tuviId VARCHAR(255); diff --git a/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql new file mode 100644 index 0000000..b27dc2e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql @@ -0,0 +1,7 @@ +ALTER TABLE observe_common.vessel ADD COLUMN comId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN ctoiId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN iattcId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN imoId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN nationalId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN radioCallSignId character varying(255); +ALTER TABLE observe_common.vessel ADD COLUMN tuviId character varying(255); diff --git a/entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo index 395eb83..545ea18 100644 Binary files a/entities/src/main/xmi/observe-common.zargo and b/entities/src/main/xmi/observe-common.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e1dabcce66e2797f00b43ab49a7ffc4a6e3d9a7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:27 2016 +0100 Ajout champs sur vessel (service) --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42688 -> 43074 bytes .../topia/binder/referential/VesselBinder.java | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 960fb61..9c907f0 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java index d313ef6..e464b64 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java @@ -62,6 +62,13 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { entity.setPower(dto.getPower()); entity.setSearchMaximum(dto.getSearchMaximum()); entity.setComment(dto.getComment()); + entity.setComId(dto.getComId()); + entity.setCtoiId(dto.getCtoiId()); + entity.setIattcId(dto.getIattcId()); + entity.setImoId(dto.getImoId()); + entity.setNationalId(dto.getNationalId()); + entity.setRadioCallSignId(dto.getRadioCallSignId()); + entity.setTuviId(dto.getTuviId()); } @@ -83,7 +90,13 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { dto.setPower(entity.getPower()); dto.setSearchMaximum(entity.getSearchMaximum()); dto.setComment(entity.getComment()); - + dto.setComId(entity.getComId()); + dto.setCtoiId(entity.getCtoiId()); + dto.setIattcId(entity.getIattcId()); + dto.setImoId(entity.getImoId()); + dto.setNationalId(entity.getNationalId()); + dto.setRadioCallSignId(entity.getRadioCallSignId()); + dto.setTuviId(entity.getTuviId()); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 438b00e74a5696a4d5ef9f1d6197a974a820532e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:42 2016 +0100 Ajout champs sur vessel (ui) --- .../swing/ui/content/ref/impl/VesselUI.jaxx | 70 ++++++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUI.jcss | 63 +++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUIModel.java | 40 +++++++++---- .../i18n/application-swing_en_GB.properties | 7 +++ .../i18n/application-swing_es_ES.properties | 7 +++ .../i18n/application-swing_fr_FR.properties | 7 +++ 6 files changed, 181 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx index f89fa68..6858c74 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx @@ -273,6 +273,76 @@ <JLabel/> </cell> </row> + + <!-- ctoiId --> + <row> + <cell anchor="west"> + <JLabel id='ctoiIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='ctoiId' onKeyReleased='getBean().setCtoiId(ctoiId.getText())'/> + </cell> + </row> + + <!-- comId --> + <row> + <cell anchor="west"> + <JLabel id='comIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='comId' onKeyReleased='getBean().setComId(comId.getText())'/> + </cell> + </row> + + <!-- iattcId --> + <row> + <cell anchor="west"> + <JLabel id='iattcIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='iattcId' onKeyReleased='getBean().setIattcId(iattcId.getText())'/> + </cell> + </row> + + <!-- imoId --> + <row> + <cell anchor="west"> + <JLabel id='imoIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='imoId' onKeyReleased='getBean().setImoId(imoId.getText())'/> + </cell> + </row> + + <!-- nationalId --> + <row> + <cell anchor="west"> + <JLabel id='nationalIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='nationalId' onKeyReleased='getBean().setNationalId(nationalId.getText())'/> + </cell> + </row> + + <!-- radioCallSignId --> + <row> + <cell anchor="west"> + <JLabel id='radioCallSignIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='radioCallSignId' onKeyReleased='getBean().setRadioCallSignId(radioCallSignId.getText())'/> + </cell> + </row> + + <!-- tuviId --> + <row> + <cell anchor="west"> + <JLabel id='tuviIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='tuviId' onKeyReleased='getBean().setTuviId(tuviId.getText())'/> + </cell> + </row> </Table> </tab> </JTabbedPane> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss index 2299b2a..0ceb74e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jcss @@ -142,3 +142,66 @@ #changeDate { date:{bean.getChangeDate()}; } + +#comIdLabel { + text:"observe.common.comId"; + labelFor:{comId}; +} + +#comId { + text:{getStringValue(bean.getComId())}; +} + +#ctoiIdLabel { + text:"observe.common.ctoiId"; + labelFor:{ctoiId}; +} + +#ctoiId { + text:{getStringValue(bean.getCtoiId())}; +} + +#iattcIdLabel { + text:"observe.common.iattcId"; + labelFor:{iattcId}; +} + +#iattcId { + text:{getStringValue(bean.getIattcId())}; +} + +#imoIdLabel { + text:"observe.common.imoId"; + labelFor:{imoId}; +} + +#imoId { + text:{getStringValue(bean.getImoId())}; +} + +#nationalIdLabel { + text:"observe.common.nationalId"; + labelFor:{nationalId}; +} + +#nationalId { + text:{getStringValue(bean.getNationalId())}; +} + +#radioCallSignIdLabel { + text:"observe.common.radioCallSignId"; + labelFor:{radioCallSignId}; +} + +#radioCallSignId { + text:{getStringValue(bean.getRadioCallSignId())}; +} + +#tuviIdLabel { + text:"observe.common.tuviId"; + labelFor:{tuviId}; +} + +#tuviId { + text:{getStringValue(bean.getTuviId())}; +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java index 6d14971..3461ea3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.VesselDto; import java.util.Set; @@ -67,7 +67,14 @@ public class VesselUIModel extends ContentReferenceUIModel<VesselDto> { VesselDto.PROPERTY_LENGTH, VesselDto.PROPERTY_POWER, VesselDto.PROPERTY_SEARCH_MAXIMUM, - VesselDto.PROPERTY_YEAR_SERVICE).build(); + VesselDto.PROPERTY_YEAR_SERVICE, + VesselDto.PROPERTY_COM_ID, + VesselDto.PROPERTY_CTOI_ID, + VesselDto.PROPERTY_IATTC_ID, + VesselDto.PROPERTY_IMO_ID, + VesselDto.PROPERTY_NATIONAL_ID, + VesselDto.PROPERTY_RADIO_CALL_SIGN_ID, + VesselDto.PROPERTY_TUVI_ID).build(); private static final long serialVersionUID = 1L; @@ -88,18 +95,25 @@ public class VesselUIModel extends ContentReferenceUIModel<VesselDto> { VesselDto.PROPERTY_CAPACITY, VesselDto.PROPERTY_POWER, VesselDto.PROPERTY_SEARCH_MAXIMUM, - VesselDto.PROPERTY_CHANGE_DATE}, + VesselDto.PROPERTY_CHANGE_DATE, + VesselDto.PROPERTY_COM_ID, + VesselDto.PROPERTY_CTOI_ID, + VesselDto.PROPERTY_IATTC_ID, + VesselDto.PROPERTY_IMO_ID, + VesselDto.PROPERTY_NATIONAL_ID, + VesselDto.PROPERTY_RADIO_CALL_SIGN_ID, + VesselDto.PROPERTY_TUVI_ID}, new String[]{VesselUI.BINDING_VESSEL_TYPE_SELECTED_ITEM, - VesselUI.BINDING_VESSEL_SIZE_CATEGORY_SELECTED_ITEM, - VesselUI.BINDING_FLAG_COUNTRY_SELECTED_ITEM, - VesselUI.BINDING_KEEL_CODE_MODEL, - VesselUI.BINDING_FLEET_COUNTRY_MODEL, - VesselUI.BINDING_YEAR_SERVICE_MODEL, - VesselUI.BINDING_LENGTH_MODEL, - VesselUI.BINDING_CAPACITY_MODEL, - VesselUI.BINDING_POWER_MODEL, - VesselUI.BINDING_SEARCH_MAXIMUM_MODEL, - VesselUI.BINDING_CHANGE_DATE_DATE} + VesselUI.BINDING_VESSEL_SIZE_CATEGORY_SELECTED_ITEM, + VesselUI.BINDING_FLAG_COUNTRY_SELECTED_ITEM, + VesselUI.BINDING_KEEL_CODE_MODEL, + VesselUI.BINDING_FLEET_COUNTRY_MODEL, + VesselUI.BINDING_YEAR_SERVICE_MODEL, + VesselUI.BINDING_LENGTH_MODEL, + VesselUI.BINDING_CAPACITY_MODEL, + VesselUI.BINDING_POWER_MODEL, + VesselUI.BINDING_SEARCH_MAXIMUM_MODEL, + VesselUI.BINDING_CHANGE_DATE_DATE} ); } diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index da89e82..68ce77b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -358,6 +358,7 @@ observe.common.changeDate=Change date observe.common.code=Code observe.common.codeAndStatus=Code / Status observe.common.coefficients=Coefficients +observe.common.comId=EU Id observe.common.comment=Comment observe.common.comment.activity=Activity comment observe.common.comment.floatingObject=Floating object comment @@ -369,6 +370,7 @@ observe.common.comment.targetDiscarded=Target discarded catch comment observe.common.comment.targetSample=Target sample comment observe.common.count=Count observe.common.country=Country +observe.common.ctoiId=IOTC id observe.common.currentFpaZone=current Fpa zone observe.common.dataEntryOperator=Data entry operator observe.common.date=Date @@ -395,6 +397,8 @@ observe.common.global.progression.description=Global progression observe.common.heureobservation=Observation time observe.common.homeId=Home id observe.common.homeIdFAOWormsId=Home id / Fao / Worms +observe.common.iattcId=ICCAT Id +observe.common.imoId=IMO Id observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.keelCodeFlotte=Keel / Flotte @@ -434,6 +438,7 @@ observe.common.minLength=Min length observe.common.minLengthMax=Min length maximum observe.common.minWeight=Min weight observe.common.minWeightMax=Min weight maximum +observe.common.nationalId=National id observe.common.needComment=Need comment observe.common.nextFpaZone=Next Fpa zone observe.common.no.balise=No buoy @@ -458,6 +463,7 @@ observe.common.ownership=Ownership observe.common.picturesReferences=Pictures references observe.common.power=Power observe.common.previousFpaZone=Previous Fpa zone +observe.common.radioCallSignId=Radio call signal observe.common.reasonForDiscard=Reason for discad observe.common.reportsUrl=Reports url observe.common.resume=Summary @@ -506,6 +512,7 @@ observe.common.totalWeight=Total weight observe.common.transmittingBuoyOperation=Transmitting buoy operation observe.common.transmittingBuoyType=Transmitting buoy type observe.common.trips.list=List of trips +observe.common.tuviId=TUVI Id observe.common.typeTransmittingBuoyOperation=Transmitting buoy operation type observe.common.uri=Uri observe.common.vessel=Boat diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index fc25e7b..704c15a 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -358,6 +358,7 @@ observe.common.changeDate=Fecha de carga observe.common.code=Identificación observe.common.codeAndStatus=Código observe.common.coefficients=Coeficientes +observe.common.comId=Id EU observe.common.comment=Comentarios observe.common.comment.activity=Comentario de la actividad observe.common.comment.floatingObject=Comentarios de objeto @@ -369,6 +370,7 @@ observe.common.comment.targetDiscarded=Comentarios de descarte observe.common.comment.targetSample=Comentarios de muestreo de atún observe.common.count=Número observe.common.country=País +observe.common.ctoiId=Id IOTC observe.common.currentFpaZone=Zona FPA actual observe.common.dataEntryOperator=Operador de captación de datos observe.common.date=Día de observación @@ -395,6 +397,8 @@ observe.common.global.progression.description=Progresión global observe.common.heureobservation=Hora de la observación observe.common.homeId=Identificador observe.common.homeIdFAOWormsId=Código 3L / FAO / Worms +observe.common.iattcId=Id CICAA +observe.common.imoId=Id IMO observe.common.iso2Code=Código ISO-2 observe.common.iso3Code=Código ISO-3 observe.common.keelCodeFlotte=Código de Quilla / Flota @@ -434,6 +438,7 @@ observe.common.minLength=Talla mínima (en cm) observe.common.minLengthMax=Talla min-max (en cm) observe.common.minWeight=Peso mínimo observe.common.minWeightMax=Peso min-max (en Kg) +observe.common.nationalId=id nacional observe.common.needComment=Se requiere un comentario observe.common.nextFpaZone=Zona FPA penetrada observe.common.no.balise=Ninguna baliza @@ -458,6 +463,7 @@ observe.common.ownership=Pertenece a observe.common.picturesReferences=Referencia de foto observe.common.power=Potencia del motor principal observe.common.previousFpaZone=La zona FPA de que se salió +observe.common.radioCallSignId=Indicativo radio observe.common.reasonForDiscard=Razon de descarte observe.common.reportsUrl=URL del informe observe.common.resume=Resumen de la configuración @@ -506,6 +512,7 @@ observe.common.totalWeight=Peso observe.common.transmittingBuoyOperation=Operación sobre baliza observe.common.transmittingBuoyType=Tipo de baliza observe.common.trips.list=Lista de mareas +observe.common.tuviId=TUVI id observe.common.typeTransmittingBuoyOperation=Tipo de operación sobre baliza observe.common.uri=URI observe.common.vessel=Barco diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 45a9612..8642fa7 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -358,6 +358,7 @@ observe.common.changeDate=Date changement pavillon observe.common.code=Identifiant observe.common.codeAndStatus=Code / Statut observe.common.coefficients=Coefficients +observe.common.comId=Id EU observe.common.comment=Commentaire observe.common.comment.activity=Commentaire de l'activité observe.common.comment.floatingObject=Commentaire sur l'objet flottant @@ -369,6 +370,7 @@ observe.common.comment.targetDiscarded=Commentaire du rejet observe.common.comment.targetSample=Commentaire de l'échantillonage thon observe.common.count=Nombre observe.common.country=Pays +observe.common.ctoiId=Id CTOI observe.common.currentFpaZone=Zone FPA actuelle observe.common.dataEntryOperator=Saisisseur observe.common.date=Jour d'observation @@ -395,6 +397,8 @@ observe.common.global.progression.description=Progression globale observe.common.heureobservation=Heure d'observation observe.common.homeId=Identifiant observe.common.homeIdFAOWormsId=Code 3L / FAO / Worms +observe.common.iattcId=Id CICTA +observe.common.imoId=Id IMO observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.keelCodeFlotte=Code quille /Code flotte @@ -434,6 +438,7 @@ observe.common.minLength=Taile minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeight=Poids minimum (en Kg) observe.common.minWeightMax=Poids min-max (en Kg) +observe.common.nationalId=Id national observe.common.needComment=Nécessite un commentaire observe.common.nextFpaZone=Zone FPA pénétrée observe.common.no.balise=Aucune balise lue @@ -458,6 +463,7 @@ observe.common.ownership=Appartenance observe.common.picturesReferences=Référence Photo observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone FPA quitée +observe.common.radioCallSignId=Indicatif radio observe.common.reasonForDiscard=Raison rejet observe.common.reportsUrl=URL de rapport observe.common.resume=Résumé de la configuration @@ -506,6 +512,7 @@ observe.common.totalWeight=Poids observe.common.transmittingBuoyOperation=Opération balise observe.common.transmittingBuoyType=Type de balise observe.common.trips.list=Liste des marées +observe.common.tuviId=Id TUVI observe.common.typeTransmittingBuoyOperation=Type d'opération sur balise observe.common.uri=URI observe.common.vessel=Bateau -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b96f52e5dd4c729464bb442aaac836874023657d Merge: 012ae4a 438b00e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 17:39:45 2016 +0100 [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop .../swing/ui/content/ref/impl/VesselUI.jaxx | 70 +++++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUI.jcss | 63 +++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUIModel.java | 40 ++++++++---- .../i18n/application-swing_en_GB.properties | 7 +++ .../i18n/application-swing_es_ES.properties | 7 +++ .../i18n/application-swing_fr_FR.properties | 7 +++ .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 7 +++ .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 7 +++ entities/src/main/xmi/observe-common.zargo | Bin 38441 -> 38794 bytes .../src/main/xmi/observe-services-dto-common.zargo | Bin 42688 -> 43074 bytes .../topia/binder/referential/VesselBinder.java | 15 ++++- 12 files changed, 210 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm