Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
12 changed files:
- client-core/src/main/i18n/getters/jaxx.getter
- client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss
- 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
- services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java
- test/src/main/resources/db/7.0/dataForTestLongline.sql.gz
- test/src/main/resources/db/7.0/dataForTestSeine.sql.gz
- test/src/main/resources/db/7.0/empty_h2.sql.gz
- test/src/main/resources/db/7.0/empty_pg.sql.gz
- test/src/main/resources/db/7.0/referentiel.sql.gz
Changes:
| ... | ... | @@ -356,9 +356,11 @@ observe.common.NonTargetSampleDto.action.create.tip |
| 356 | 356 |
observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip
|
| 357 | 357 |
observe.common.NonTargetSampleDto.message.cantAdd
|
| 358 | 358 |
observe.common.NonTargetSampleDto.title
|
| 359 |
+observe.common.ObjectMaterialDto.biodegradable
|
|
| 359 | 360 |
observe.common.ObjectMaterialDto.childSelectionMandatory
|
| 360 | 361 |
observe.common.ObjectMaterialDto.childrenMultiSelectable
|
| 361 | 362 |
observe.common.ObjectMaterialDto.legacyCodeStandardCode
|
| 363 |
+observe.common.ObjectMaterialDto.nonEntangling
|
|
| 362 | 364 |
observe.common.ObjectMaterialDto.objectMaterialType
|
| 363 | 365 |
observe.common.ObjectMaterialDto.parentCode
|
| 364 | 366 |
observe.common.ObjectMaterialDto.validation
|
| ... | ... | @@ -30,7 +30,8 @@ |
| 30 | 30 |
fr.ird.observe.dto.referential.seine.ObjectMaterialDto
|
| 31 | 31 |
fr.ird.observe.dto.referential.seine.ObjectMaterialReference
|
| 32 | 32 |
fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference
|
| 33 |
- |
|
| 33 |
+ fr.ird.observe.client.ui.util.BooleanEditor
|
|
| 34 |
+
|
|
| 34 | 35 |
org.nuiton.jaxx.widgets.select.BeanFilterableComboBox
|
| 35 | 36 |
|
| 36 | 37 |
static fr.ird.observe.client.ui.util.UIHelper.getStringValue
|
| ... | ... | @@ -114,8 +115,26 @@ |
| 114 | 115 |
</cell>
|
| 115 | 116 |
</row>
|
| 116 | 117 |
|
| 118 |
+ <!--biodegradable-->
|
|
| 119 |
+ <row>
|
|
| 120 |
+ <cell anchor="west">
|
|
| 121 |
+ <JLabel id='biodegradableLabel'/>
|
|
| 122 |
+ </cell>
|
|
| 123 |
+ <cell anchor='east' weightx="1" fill="both">
|
|
| 124 |
+ <BooleanEditor id='biodegradable'/>
|
|
| 125 |
+ </cell>
|
|
| 126 |
+ </row>
|
|
| 127 |
+ <!--nonEntangling-->
|
|
| 128 |
+ <row>
|
|
| 129 |
+ <cell anchor="west">
|
|
| 130 |
+ <JLabel id='nonEntanglingLabel'/>
|
|
| 131 |
+ </cell>
|
|
| 132 |
+ <cell anchor='east' weightx="1" fill="both">
|
|
| 133 |
+ <BooleanEditor id='nonEntangling'/>
|
|
| 134 |
+ </cell>
|
|
| 135 |
+ </row>
|
|
| 136 |
+ |
|
| 117 | 137 |
<!-- validation -->
|
| 118 |
- <!-- coefficients -->
|
|
| 119 | 138 |
<row>
|
| 120 | 139 |
<cell anchor='west' columns="2">
|
| 121 | 140 |
<JLabel id='validationInformation'/>
|
| ... | ... | @@ -57,3 +57,11 @@ |
| 57 | 57 |
#childSelectionMandatory {
|
| 58 | 58 |
selected:{bean.isChildSelectionMandatory()};
|
| 59 | 59 |
}
|
| 60 |
+ |
|
| 61 |
+#nonEntangling {
|
|
| 62 |
+ booleanValue:{bean.getNonEntangling()};
|
|
| 63 |
+}
|
|
| 64 |
+ |
|
| 65 |
+#biodegradable {
|
|
| 66 |
+ booleanValue:{bean.getBiodegradable()};
|
|
| 67 |
+}
|
| ... | ... | @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insert this non target sampl |
| 949 | 949 |
observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reset
|
| 950 | 950 |
observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Can not add non target samples</strong>(no rejected non target catch)</body></html>
|
| 951 | 951 |
observe.common.NonTargetSampleDto.title=Non target sample
|
| 952 |
+observe.common.ObjectMaterialDto.biodegradable=Biodegradable
|
|
| 952 | 953 |
observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandatory
|
| 953 | 954 |
observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable
|
| 954 | 955 |
observe.common.ObjectMaterialDto.legacyCode=Legacy code
|
| 955 | 956 |
observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code
|
| 957 |
+observe.common.ObjectMaterialDto.nonEntangling=Non entangling
|
|
| 956 | 958 |
observe.common.ObjectMaterialDto.objectMaterialType=Type
|
| 957 | 959 |
observe.common.ObjectMaterialDto.parent=Parent
|
| 958 | 960 |
observe.common.ObjectMaterialDto.parentCode=Parent
|
| ... | ... | @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insertar el muestreo de faun |
| 949 | 949 |
observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reiniciar
|
| 950 | 950 |
observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Imposible añadir los muestreos de fauna accesoria</strong>(no hay descartes de fauna)</body></html>
|
| 951 | 951 |
observe.common.NonTargetSampleDto.title=Muestreo fauna accesoria
|
| 952 |
+observe.common.ObjectMaterialDto.biodegradable=Biodegradable
|
|
| 952 | 953 |
observe.common.ObjectMaterialDto.childSelectionMandatory=Obligatorio seleccionar un campo
|
| 953 | 954 |
observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da campos
|
| 954 | 955 |
observe.common.ObjectMaterialDto.legacyCode=Código antiguo
|
| 955 | 956 |
observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar
|
| 957 |
+observe.common.ObjectMaterialDto.nonEntangling=No enmallante
|
|
| 956 | 958 |
observe.common.ObjectMaterialDto.objectMaterialType=Tipo
|
| 957 | 959 |
observe.common.ObjectMaterialDto.parent=Componente asociado
|
| 958 | 960 |
observe.common.ObjectMaterialDto.parentCode=Código de componente asociado
|
| ... | ... | @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insérer cet échantillon d' |
| 949 | 949 |
observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Réinitialiser
|
| 950 | 950 |
observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des échantillons</strong>(pas de rejet faune)</body></html>
|
| 951 | 951 |
observe.common.NonTargetSampleDto.title=Échantillons espèces accessoires
|
| 952 |
+observe.common.ObjectMaterialDto.biodegradable=Biodégradable
|
|
| 952 | 953 |
observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire
|
| 953 | 954 |
observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils
|
| 954 | 955 |
observe.common.ObjectMaterialDto.legacyCode=Ancien code
|
| 955 | 956 |
observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard
|
| 957 |
+observe.common.ObjectMaterialDto.nonEntangling=Non maillant
|
|
| 956 | 958 |
observe.common.ObjectMaterialDto.objectMaterialType=Type
|
| 957 | 959 |
observe.common.ObjectMaterialDto.parent=Parent
|
| 958 | 960 |
observe.common.ObjectMaterialDto.parentCode=Parent
|
| ... | ... | @@ -183,7 +183,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { |
| 183 | 183 |
assertValidateResult(result, GearCaracteristicTypeDto.class, 2);
|
| 184 | 184 |
assertValidateResult(result, ObjectOperationDto.class, 2);
|
| 185 | 185 |
assertValidateResult(result, SpeciesListDto.class, 2);
|
| 186 |
- assertValidateResult(result, ObjectMaterialDto.class, 11);
|
|
| 186 |
+ assertValidateResult(result, ObjectMaterialDto.class, 10);
|
|
| 187 | 187 |
assertValidateResult(result, TransmittingBuoyOperationDto.class, 3);
|
| 188 | 188 |
assertValidateResult(result, HookPositionDto.class, 1);
|
| 189 | 189 |
assertValidateResult(result, FpaZoneDto.class, 5);
|
| ... | ... | @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not |
| 89 | 89 |
create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
|
| 90 | 90 |
create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId));
|
| 91 | 91 |
create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId));
|
| 92 |
-create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
|
|
| 92 |
+create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
|
|
| 93 | 93 |
create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
|
| 94 | 94 |
create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
|
| 95 | 95 |
create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
|
| ... | ... | @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not |
| 89 | 89 |
create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
|
| 90 | 90 |
create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId));
|
| 91 | 91 |
create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId));
|
| 92 |
-create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
|
|
| 92 |
+create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
|
|
| 93 | 93 |
create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
|
| 94 | 94 |
create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
|
| 95 | 95 |
create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));
|