Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 42ebd1c5 by tchemit at 2018-11-21T12:24:38Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test) - - - - - 50ab4210 by tchemit at 2018-11-21T12:24:45Z Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176 - - - - - 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: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -356,9 +356,11 @@ observe.common.NonTargetSampleDto.action.create.tip observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip observe.common.NonTargetSampleDto.message.cantAdd observe.common.NonTargetSampleDto.title +observe.common.ObjectMaterialDto.biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory observe.common.ObjectMaterialDto.childrenMultiSelectable observe.common.ObjectMaterialDto.legacyCodeStandardCode +observe.common.ObjectMaterialDto.nonEntangling observe.common.ObjectMaterialDto.objectMaterialType observe.common.ObjectMaterialDto.parentCode observe.common.ObjectMaterialDto.validation ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx ===================================== @@ -30,7 +30,8 @@ fr.ird.observe.dto.referential.seine.ObjectMaterialDto fr.ird.observe.dto.referential.seine.ObjectMaterialReference fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference - + fr.ird.observe.client.ui.util.BooleanEditor + org.nuiton.jaxx.widgets.select.BeanFilterableComboBox static fr.ird.observe.client.ui.util.UIHelper.getStringValue @@ -114,8 +115,26 @@ </cell> </row> + <!--biodegradable--> + <row> + <cell anchor="west"> + <JLabel id='biodegradableLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='biodegradable'/> + </cell> + </row> + <!--nonEntangling--> + <row> + <cell anchor="west"> + <JLabel id='nonEntanglingLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='nonEntangling'/> + </cell> + </row> + <!-- validation --> - <!-- coefficients --> <row> <cell anchor='west' columns="2"> <JLabel id='validationInformation'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss ===================================== @@ -57,3 +57,11 @@ #childSelectionMandatory { selected:{bean.isChildSelectionMandatory()}; } + +#nonEntangling { + booleanValue:{bean.getNonEntangling()}; +} + +#biodegradable { + booleanValue:{bean.getBiodegradable()}; +} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insert this non target sampl observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reset observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Can not add non target samples</strong>(no rejected non target catch)</body></html> observe.common.NonTargetSampleDto.title=Non target sample +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandatory observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable observe.common.ObjectMaterialDto.legacyCode=Legacy code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code +observe.common.ObjectMaterialDto.nonEntangling=Non entangling observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insertar el muestreo de faun observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reiniciar observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Imposible añadir los muestreos de fauna accesoria</strong>(no hay descartes de fauna)</body></html> observe.common.NonTargetSampleDto.title=Muestreo fauna accesoria +observe.common.ObjectMaterialDto.biodegradable=Biodegradable observe.common.ObjectMaterialDto.childSelectionMandatory=Obligatorio seleccionar un campo observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da campos observe.common.ObjectMaterialDto.legacyCode=Código antiguo observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar +observe.common.ObjectMaterialDto.nonEntangling=No enmallante observe.common.ObjectMaterialDto.objectMaterialType=Tipo observe.common.ObjectMaterialDto.parent=Componente asociado observe.common.ObjectMaterialDto.parentCode=Código de componente asociado ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insérer cet échantillon d' observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Réinitialiser observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des échantillons</strong>(pas de rejet faune)</body></html> observe.common.NonTargetSampleDto.title=Échantillons espèces accessoires +observe.common.ObjectMaterialDto.biodegradable=Biodégradable observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils observe.common.ObjectMaterialDto.legacyCode=Ancien code observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard +observe.common.ObjectMaterialDto.nonEntangling=Non maillant observe.common.ObjectMaterialDto.objectMaterialType=Type observe.common.ObjectMaterialDto.parent=Parent observe.common.ObjectMaterialDto.parentCode=Parent ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -183,7 +183,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { assertValidateResult(result, GearCaracteristicTypeDto.class, 2); assertValidateResult(result, ObjectOperationDto.class, 2); assertValidateResult(result, SpeciesListDto.class, 2); - assertValidateResult(result, ObjectMaterialDto.class, 11); + assertValidateResult(result, ObjectMaterialDto.class, 10); assertValidateResult(result, TransmittingBuoyOperationDto.class, 3); assertValidateResult(result, HookPositionDto.class, 1); assertValidateResult(result, FpaZoneDto.class, 5); ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/empty_h2.sql.gz ===================================== @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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)); ===================================== test/src/main/resources/db/7.0/empty_pg.sql.gz ===================================== @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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)); ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e4f6bfc0fc8098bb955c3bf63d9... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e4f6bfc0fc8098bb955c3bf63d9... You're receiving this email because of your account on gitlab.com.