Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
15 changed files:
- client-core/src/main/i18n/getters/jaxx.getter
- client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUI.jaxx
- dto/src/main/models/Observe-01-referential-common.model
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
- persistence/src/main/java/fr/ird/observe/binder/referential/common/VesselEntityDtoBinder.java
- persistence/src/main/models/Observe-01-referential-common.model
- persistence/src/main/resources/db/migration/8.0/101_create_common_schema-common.sql
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
- test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
- test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
- test/src/main/resources/db/8.0/empty_h2.sql.gz
- test/src/main/resources/db/8.0/empty_pg.sql.gz
- test/src/main/resources/db/8.0/referentiel.sql.gz
Changes:
| ... | ... | @@ -876,10 +876,10 @@ observe.common.VesselActivitySeineDto.allowFad |
| 876 | 876 |
observe.common.VesselDto.capacity
|
| 877 | 877 |
observe.common.VesselDto.changeDate
|
| 878 | 878 |
observe.common.VesselDto.comId
|
| 879 |
-observe.common.VesselDto.ctoiId
|
|
| 879 |
+observe.common.VesselDto.iotcId
|
|
| 880 | 880 |
observe.common.VesselDto.flagCountry
|
| 881 | 881 |
observe.common.VesselDto.generalTab
|
| 882 |
-observe.common.VesselDto.iattcId
|
|
| 882 |
+observe.common.VesselDto.iccat
|
|
| 883 | 883 |
observe.common.VesselDto.imoId
|
| 884 | 884 |
observe.common.VesselDto.keelCodeFlotte
|
| 885 | 885 |
observe.common.VesselDto.length
|
| ... | ... | @@ -220,13 +220,13 @@ fr.ird.observe.client.ui.util.BeanCheckBox |
| 220 | 220 |
</cell>
|
| 221 | 221 |
</row>
|
| 222 | 222 |
|
| 223 |
- <!-- ctoiId -->
|
|
| 223 |
+ <!-- iotcId -->
|
|
| 224 | 224 |
<row>
|
| 225 | 225 |
<cell anchor="west">
|
| 226 |
- <JLabel id='ctoiIdLabel'/>
|
|
| 226 |
+ <JLabel id='iotcIdLabel'/>
|
|
| 227 | 227 |
</cell>
|
| 228 | 228 |
<cell anchor='east' weightx="1" fill="both">
|
| 229 |
- <NormalTextEditor id='ctoiId'/>
|
|
| 229 |
+ <NormalTextEditor id='iotcId'/>
|
|
| 230 | 230 |
</cell>
|
| 231 | 231 |
</row>
|
| 232 | 232 |
|
| ... | ... | @@ -240,13 +240,13 @@ fr.ird.observe.client.ui.util.BeanCheckBox |
| 240 | 240 |
</cell>
|
| 241 | 241 |
</row>
|
| 242 | 242 |
|
| 243 |
- <!-- iattcId -->
|
|
| 243 |
+ <!-- iccat -->
|
|
| 244 | 244 |
<row>
|
| 245 | 245 |
<cell anchor="west">
|
| 246 |
- <JLabel id='iattcIdLabel'/>
|
|
| 246 |
+ <JLabel id='iccatLabel'/>
|
|
| 247 | 247 |
</cell>
|
| 248 | 248 |
<cell anchor='east' weightx="1" fill="both">
|
| 249 |
- <NormalTextEditor id='iattcId'/>
|
|
| 249 |
+ <NormalTextEditor id='iccat'/>
|
|
| 250 | 250 |
</cell>
|
| 251 | 251 |
</row>
|
| 252 | 252 |
|
| ... | ... | @@ -148,8 +148,8 @@ capacity + {*:1} Float |
| 148 | 148 |
power + {*:1} Integer
|
| 149 | 149 |
searchMaximum + {*:1} Float
|
| 150 | 150 |
comment + {*:1} String
|
| 151 |
-iattcId + {*:1} String
|
|
| 152 |
-ctoiId + {*:1} String
|
|
| 151 |
+iccat + {*:1} String
|
|
| 152 |
+iotcId + {*:1} String
|
|
| 153 | 153 |
nationalId + {*:1} String
|
| 154 | 154 |
comId + {*:1} String
|
| 155 | 155 |
tuviId + {*:1} String
|
| ... | ... | @@ -2500,11 +2500,11 @@ observe.common.VesselActivitySeineDto.types=Vessel activities (Seine) |
| 2500 | 2500 |
observe.common.VesselDto.capacity=Capacity
|
| 2501 | 2501 |
observe.common.VesselDto.changeDate=Change date
|
| 2502 | 2502 |
observe.common.VesselDto.comId=EU Id
|
| 2503 |
-observe.common.VesselDto.ctoiId=IOTC id
|
|
| 2503 |
+observe.common.VesselDto.iotcId=IOTC id
|
|
| 2504 | 2504 |
observe.common.VesselDto.flagCountry=Flag country
|
| 2505 | 2505 |
observe.common.VesselDto.fleetCountry=Fleet country
|
| 2506 | 2506 |
observe.common.VesselDto.generalTab=General caracteristics
|
| 2507 |
-observe.common.VesselDto.iattcId=ICCAT Id
|
|
| 2507 |
+observe.common.VesselDto.iccat=ICCAT Id
|
|
| 2508 | 2508 |
observe.common.VesselDto.imoId=IMO Id
|
| 2509 | 2509 |
observe.common.VesselDto.keelCode=Keel code
|
| 2510 | 2510 |
observe.common.VesselDto.keelCodeFlotte=Keel / Flotte
|
| ... | ... | @@ -2500,11 +2500,11 @@ observe.common.VesselActivitySeineDto.types=Actividades buque \#TODO-SP |
| 2500 | 2500 |
observe.common.VesselDto.capacity=Capacidad de transporte
|
| 2501 | 2501 |
observe.common.VesselDto.changeDate=Fecha de carga
|
| 2502 | 2502 |
observe.common.VesselDto.comId=Id EU
|
| 2503 |
-observe.common.VesselDto.ctoiId=Id IOTC
|
|
| 2503 |
+observe.common.VesselDto.iotcId=Id IOTC
|
|
| 2504 | 2504 |
observe.common.VesselDto.flagCountry=Bandera
|
| 2505 | 2505 |
observe.common.VesselDto.fleetCountry=País
|
| 2506 | 2506 |
observe.common.VesselDto.generalTab=Características generales
|
| 2507 |
-observe.common.VesselDto.iattcId=Id CICAA
|
|
| 2507 |
+observe.common.VesselDto.iccat=Id CICAA
|
|
| 2508 | 2508 |
observe.common.VesselDto.imoId=Id IMO
|
| 2509 | 2509 |
observe.common.VesselDto.keelCode=Código de Quilla
|
| 2510 | 2510 |
observe.common.VesselDto.keelCodeFlotte=Código de Quilla / Flota
|
| ... | ... | @@ -2500,11 +2500,11 @@ observe.common.VesselActivitySeineDto.types=Activités bateau (Senne) |
| 2500 | 2500 |
observe.common.VesselDto.capacity=Capacité transport (m³)
|
| 2501 | 2501 |
observe.common.VesselDto.changeDate=Date changement pavillon
|
| 2502 | 2502 |
observe.common.VesselDto.comId=Id EU
|
| 2503 |
-observe.common.VesselDto.ctoiId=Id CTOI
|
|
| 2503 |
+observe.common.VesselDto.iotcId=Id CTOI
|
|
| 2504 | 2504 |
observe.common.VesselDto.flagCountry=Pavillon
|
| 2505 | 2505 |
observe.common.VesselDto.fleetCountry=Flotte
|
| 2506 | 2506 |
observe.common.VesselDto.generalTab=Caractéristiques générales
|
| 2507 |
-observe.common.VesselDto.iattcId=Id CICTA
|
|
| 2507 |
+observe.common.VesselDto.iccat=Id CICTA
|
|
| 2508 | 2508 |
observe.common.VesselDto.imoId=Id IMO
|
| 2509 | 2509 |
observe.common.VesselDto.keelCode=Code quille
|
| 2510 | 2510 |
observe.common.VesselDto.keelCodeFlotte=Code quille /Code flotte
|
| ... | ... | @@ -56,8 +56,8 @@ public class VesselEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Ves |
| 56 | 56 |
entity.setSearchMaximum(dto.getSearchMaximum());
|
| 57 | 57 |
entity.setComment(dto.getComment());
|
| 58 | 58 |
entity.setComId(dto.getComId());
|
| 59 |
- entity.setCtoiId(dto.getCtoiId());
|
|
| 60 |
- entity.setIattcId(dto.getIattcId());
|
|
| 59 |
+ entity.setIotcId(dto.getIotcId());
|
|
| 60 |
+ entity.setIccat(dto.getIccat());
|
|
| 61 | 61 |
entity.setImoId(dto.getImoId());
|
| 62 | 62 |
entity.setNationalId(dto.getNationalId());
|
| 63 | 63 |
entity.setRadioCallSignId(dto.getRadioCallSignId());
|
| ... | ... | @@ -83,8 +83,8 @@ public class VesselEntityDtoBinder extends ReferentialEntityDtoBinderSupport<Ves |
| 83 | 83 |
dto.setSearchMaximum(entity.getSearchMaximum());
|
| 84 | 84 |
dto.setComment(entity.getComment());
|
| 85 | 85 |
dto.setComId(entity.getComId());
|
| 86 |
- dto.setCtoiId(entity.getCtoiId());
|
|
| 87 |
- dto.setIattcId(entity.getIattcId());
|
|
| 86 |
+ dto.setIotcId(entity.getIotcId());
|
|
| 87 |
+ dto.setIccat(entity.getIccat());
|
|
| 88 | 88 |
dto.setImoId(entity.getImoId());
|
| 89 | 89 |
dto.setNationalId(entity.getNationalId());
|
| 90 | 90 |
dto.setRadioCallSignId(entity.getRadioCallSignId());
|
| ... | ... | @@ -163,8 +163,8 @@ capacity + {*:1} Float | sqlType=numeric |
| 163 | 163 |
power + {*:1} Integer
|
| 164 | 164 |
searchMaximum + {*:1} Float | sqlType=numeric
|
| 165 | 165 |
comment + {*:1} String | hibernateAttributeType=text
|
| 166 |
-iattcId + {*:1} String
|
|
| 167 |
-ctoiId + {*:1} String
|
|
| 166 |
+iccat + {*:1} String
|
|
| 167 |
+iotcId + {*:1} String
|
|
| 168 | 168 |
nationalId + {*:1} String
|
| 169 | 169 |
comId + {*:1} String
|
| 170 | 170 |
tuviId + {*:1} String
|
| ... | ... | @@ -46,7 +46,7 @@ CREATE TABLE common.speciesgroupreleasemode(topiaid VARCHAR(255) NOT NULL CONSTR |
| 46 | 46 |
CREATE TABLE common.specieslist(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_specieslist PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
|
| 47 | 47 |
CREATE TABLE common.vesselsizecategory(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vesselsizecategory PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, capacitylabel VARCHAR(255), gaugelabel VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
|
| 48 | 48 |
CREATE TABLE common.vesseltype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vesseltype PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
|
| 49 |
-CREATE TABLE common.vessel(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vessel PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), keelcode INTEGER, fleetcountry INTEGER, changedate TIMESTAMP, yearservice INTEGER, length NUMERIC, capacity NUMERIC, power INTEGER, searchmaximum NUMERIC, uri VARCHAR(255), status INTEGER DEFAULT 1, comment VARCHAR(1025), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), flagcountry VARCHAR(255), vesseltype VARCHAR(255), vesselsizecategory VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, comid VARCHAR(255), ctoiid VARCHAR(255), iattcid VARCHAR(255), imoid VARCHAR(255), nationalid VARCHAR(255), radiocallsignid VARCHAR(255), tuviid VARCHAR(255), shipowner VARCHAR(255));
|
|
| 49 |
+CREATE TABLE common.vessel(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_vessel PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), keelcode INTEGER, fleetcountry INTEGER, changedate TIMESTAMP, yearservice INTEGER, length NUMERIC, capacity NUMERIC, power INTEGER, searchmaximum NUMERIC, uri VARCHAR(255), status INTEGER DEFAULT 1, comment VARCHAR(1025), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), flagcountry VARCHAR(255), vesseltype VARCHAR(255), vesselsizecategory VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL, comid VARCHAR(255), iotcId VARCHAR(255), iccat VARCHAR(255), imoid VARCHAR(255), nationalid VARCHAR(255), radiocallsignid VARCHAR(255), tuviid VARCHAR(255), shipowner VARCHAR(255));
|
|
| 50 | 50 |
CREATE TABLE common.weightmeasuremethod(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_weightmeasuremethod PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255));
|
| 51 | 51 |
CREATE TABLE common.weightmeasuretype(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_weightmeasuretype PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needcomment BOOLEAN DEFAULT FALSE, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255));
|
| 52 | 52 |
CREATE TABLE common.wind(topiaid VARCHAR(255) NOT NULL CONSTRAINT pk_wind PRIMARY KEY, topiaversion BIGINT NOT NULL, topiacreatedate DATE NOT NULL, code VARCHAR(255), speedrange VARCHAR(255), waveheight VARCHAR(255), uri VARCHAR(255), status INTEGER DEFAULT 1, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), needcomment BOOLEAN DEFAULT FALSE, lastupdatedate TIMESTAMP DEFAULT now() NOT NULL);
|
| ... | ... | @@ -79,7 +79,7 @@ INSERT INTO common.speciesgroupreleasemode(topiaid, topiaversion, topiacreatedat |
| 79 | 79 |
INSERT INTO common.specieslist(topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.specieslist;
|
| 80 | 80 |
INSERT INTO common.vesselsizecategory(topiaid, topiaversion, topiacreatedate, code, uri, status, capacitylabel, gaugelabel, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, capacitylabel, gaugelabel, needcomment, lastupdatedate FROM observe_common.vesselsizecategory;
|
| 81 | 81 |
INSERT INTO common.vesseltype(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.vesseltype;
|
| 82 |
-INSERT INTO common.vessel(topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner) SELECT topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner FROM observe_common.vessel;
|
|
| 82 |
+INSERT INTO common.vessel(topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, iotcId, iccat, imoid, nationalid, radiocallsignid, tuviid, shipowner) SELECT topiaid, topiaversion, topiacreatedate, code, keelcode, fleetcountry, changedate, yearservice, length, capacity, power, searchmaximum, uri, status, comment, label1, label2, label3, label4, label5, label6, label7, label8, flagcountry, vesseltype, vesselsizecategory, needcomment, lastupdatedate, comid, ctoiid, iattcid, imoid, nationalid, radiocallsignid, tuviid, shipowner FROM observe_common.vessel;
|
|
| 83 | 83 |
INSERT INTO common.weightmeasuremethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.weightmeasuremethod;
|
| 84 | 84 |
INSERT INTO common.weightmeasuretype(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8) SELECT topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8 FROM observe_common.weightmeasuretype;
|
| 85 | 85 |
INSERT INTO common.wind(topiaid, topiaversion, topiacreatedate, code, speedrange, waveheight, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) SELECT topiaid, topiaversion, topiacreatedate, code, speedrange, waveheight, uri, status, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate FROM observe_common.wind;
|
| ... | ... | @@ -695,10 +695,6 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 695 | 695 |
}
|
| 696 | 696 |
|
| 697 | 697 |
SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType();
|
| 698 |
- if (outputSizeMeasureType == null) {
|
|
| 699 |
- log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId()));
|
|
| 700 |
- outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType();
|
|
| 701 |
- }
|
|
| 702 | 698 |
if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) {
|
| 703 | 699 |
|
| 704 | 700 |
// on doit effectuer une conversion taille - taille avant de convertir en poids
|
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type