November 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling,…
by Tony CHEMIT 21 Nov '18

21 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 124041ee by tchemit at 2018-11-21T12:07:10Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 - - - - - bf85dfe3 by tchemit at 2018-11-21T12:07:17Z [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test) - - - - - e4f6bfc0 by tchemit at 2018-11-21T12:07:21Z Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176 - - - - - 19 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 - dto/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialDtoReferenceBinder.java - dto/src/main/models/Observe.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/seine/ObjectMaterialEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityReferenceBinder.java - persistence/src/main/models/Observe.model - persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.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> +  + <row> + <cell anchor="west"> + <JLabel id='biodegradableLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='biodegradable'/> + </cell> + </row> +  + <row> + <cell anchor="west"> + <JLabel id='nonEntanglingLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BooleanEditor id='nonEntangling'/> + </cell> + </row> +  -  <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()}; +} ===================================== dto/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialDtoReferenceBinder.java ===================================== @@ -48,8 +48,8 @@ public class ObjectMaterialDtoReferenceBinder extends ReferentialDtoReferenceBin Optional.ofNullable(dto.getParent()).map(GeneratedObjectMaterialReference::getParentId).orElse(null), Optional.ofNullable(dto.getObjectMaterialType()).map(ReferentialDtoReference::getId).orElse(null), dto.getValidation(), - dto.isBiodegradable(), - dto.isNonEntangling()); + dto.getBiodegradable(), + dto.getNonEntangling()); } } ===================================== dto/src/main/models/Observe.model ===================================== @@ -553,8 +553,8 @@ referential.seine.NonTargetCatchReleasingTime > referential.I18nReferential referential.seine.ObjectMaterial > referential.I18nReferential | references=code,label,uri,parentId,objectMaterialTypeId,validation,biodegradable,nonEntangling legacyCode + {*:1} String standardCode + {*:1} String -biodegradable + {*:1} boolean -nonEntangling + {*:1} boolean +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean childSelectionMandatory + {*:1} boolean parent {*:0..1} fr.ird.observe.dto.referential.seine.ObjectMaterialReference ===================================== 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 ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityDtoBinder.java ===================================== @@ -50,6 +50,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup entity.setValidation(dto.getValidation()); entity.setChildrenMultiSelectable(dto.isChildrenMultiSelectable()); entity.setChildSelectionMandatory(dto.isChildSelectionMandatory()); + entity.setBiodegradable(dto.getBiodegradable()); + entity.setNonEntangling(dto.getNonEntangling()); } @Override @@ -65,6 +67,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup dto.setValidation(entity.getValidation()); dto.setChildrenMultiSelectable(entity.isChildrenMultiSelectable()); dto.setChildSelectionMandatory(entity.isChildSelectionMandatory()); + dto.setBiodegradable(entity.getBiodegradable()); + dto.setNonEntangling(entity.getNonEntangling()); } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityReferenceBinder.java ===================================== @@ -48,8 +48,8 @@ public class ObjectMaterialEntityReferenceBinder extends ReferentialEntityRefere Optional.ofNullable(dto.getParent()).map(TopiaEntity::getTopiaId).orElse(null), Optional.ofNullable(dto.getObjectMaterialType()).map(TopiaEntity::getTopiaId).orElse(null), dto.getValidation(), - dto.isBiodegradable(), - dto.isNonEntangling()); + dto.getBiodegradable(), + dto.getNonEntangling()); } } ===================================== persistence/src/main/models/Observe.model ===================================== @@ -594,8 +594,8 @@ referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntit referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity legacyCode + {*:1} String | hibernateAttributeType=text standardCode + {*:1} String -biodegradable + {*:1} boolean | notNull -nonEntangling + {*:1} boolean | notNull +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean | notNull childSelectionMandatory + {*:1} boolean | notNull parent {*:0..1} referentiel.seine.ObjectMaterial ===================================== persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql ===================================== @@ -30,7 +30,7 @@ INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreated INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, label1, label2) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '4', 'Text', 'Texte'); UPDATE observe_seine.objectMaterialType set label3 = label2 || ' TODO'; -CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN DEFAULT false, nonEntangling BOOLEAN DEFAULT false, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255)); +CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN, nonEntangling BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255)); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMARY KEY(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid); ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid); ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java ===================================== @@ -124,12 +124,16 @@ public class FloatingObjectConsolidateEngine { private DcpComputedValue computeDcpBiodegradable0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { DcpComputedValue result = DcpComputedValue.UNKNOWN; if (!FloatingObjectPartDtos.isEmpty()) { - result = DcpComputedValue.TRUE; for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - if (!FloatingObjectPartDto.getObjectMaterial().isBiodegradable()) { + Boolean biodegradable = FloatingObjectPartDto.getObjectMaterial().getBiodegradable(); + if (biodegradable==null) { + continue; + } + if (!biodegradable) { result = DcpComputedValue.FALSE; break; } + result = DcpComputedValue.TRUE; } } return result; @@ -146,12 +150,16 @@ public class FloatingObjectConsolidateEngine { private DcpComputedValue computeDcpNonEntangling0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) { DcpComputedValue result = DcpComputedValue.UNKNOWN; if (!FloatingObjectPartDtos.isEmpty()) { - result = DcpComputedValue.TRUE; for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) { - if (!FloatingObjectPartDto.getObjectMaterial().isNonEntangling()) { + Boolean nonEntangling = FloatingObjectPartDto.getObjectMaterial().getNonEntangling(); + if (nonEntangling==null) { + continue; + } + if (!nonEntangling) { result = DcpComputedValue.FALSE; break; } + result = DcpComputedValue.TRUE; } } return result; ===================================== 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/9904a4b28ca90add7bba36f4a3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9904a4b28ca90add7bba36f4a3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Spanish translations - Closes #1173
by Tony CHEMIT 21 Nov '18

21 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9904a4b2 by tchemit at 2018-11-21T10:58:12Z Spanish translations - Closes #1173 - - - - - 12 changed files: - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-core/src/main/i18n/templates/validationReport_es_ES.ftl - observe-i18n/src/main/i18n/translations/observe_es_ES.properties Changes: ===================================== client-core/src/main/i18n/templates/about_en_GB.ftl ===================================== @@ -34,12 +34,12 @@ <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projet…">project spirale</a>.</p> <p> - Il a été réalisé par la société <a href="http://codelutin.com">Code Lutin</a> en 2009. + Il a été réalisé par la société <a href="https://ultreia.io">Ultreia.io</a> en 2009. </p> <br/> <hr/> <p> - Pour plus d'informations, vous pouvez visiter le <a href="http://observe.codelutin.com">site du projet</a>. + Pour plus d'informations, vous pouvez visiter le <a href="https://gitlab.com/ultreiaio/ird-observe">site du projet</a>. </p> <h4>Version du locigiel</h4> @@ -49,7 +49,7 @@ <dt>Date</dt> <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> <dt>Numéro de build</dt> - <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> + <dd><a href="https://gitlab.com/ultreiaio/ird-observe/commit/${buildNumber}">${buildNumber}</a></dd> </dl> </body> ===================================== client-core/src/main/i18n/templates/about_es_ES.ftl ===================================== @@ -22,34 +22,34 @@ <html> <body> <h3>ObServe</h3> -<a href="http://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, - d'Observation et de Suivi des pêches thonières tropicales de surface.</a> +<a href="http://www.ird.fr/informatique-scientifique/projets/observe/">Sistema de información, + observación y seguimiento de las pesquerías de superficie de atún tropical tropical.</a> <hr/> <p> - Aplicación de introducción de datos de observadores y consulta de los mismos desde una base <i>Obstuna</i>. + Aplicación de introducción de datos de observadores y consulta de los mismos desde una base <i>Obstuna</i>. </p> <p> - El proyecto se inició en 2008 por la unidad US 007-OSIRIS de <a href="http://www.ird.fr">l'IRD</a> en el marco - de un - <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projet…">project - spirale</a>.</p> + El proyecto se inició en 2008 por la unidad US 007-OSIRIS de <a href="http://www.ird.fr">l'IRD</a> en el marco + de un + <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projet…">proyecto + spirale</a>.</p> <p> - Ha siso realizado por la sociedad <a href="http://codelutin.com">Code Lutin</a> en 2009. + Ha sido realizado por la sociedad <a href="https://ultreia.io">Ultreia.io</a> en 2009. </p> <br/> <hr/> <p> - Para más información, puede visistar la <a href="http://observe.codelutin.com">site du projet</a>. + Para más información, puede visitar la <a href="https://gitlab.com/ultreiaio/ird-observe">sitio del proyecto </a>. </p> <h4>Versión de software</h4> <dl> - <dt>Versión</dt> - <dd>${buildVersion}</dd> - <dt>Fecha</dt> - <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> - <dt>Número de registro</dt> - <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> + <dt>Versión</dt> + <dd>${buildVersión}</dd> + <dt>Fecha</dt> + <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> + <dt>Número de registro</dt> + <dd><a href="https://gitlab.com/ultreiaio/ird-observe/commit/${buildNumber}">${buildNumber}</a></dd> </dl> </body> ===================================== client-core/src/main/i18n/templates/about_fr_FR.ftl ===================================== @@ -34,12 +34,12 @@ <a href="http://www.ird.fr/informatique-scientifique/soutien/spirales/anciens_projet…">project spirale</a>.</p> <p> - Il a été réalisé par la société <a href="http://codelutin.com">Code Lutin</a> en 2009. + Il a été réalisé par la société <a href="https://ultreia.io">Ultreia.io</a> en 2009. </p> <br/> <hr/> <p> - Pour plus d'informations, vous pouvez visiter le <a href="http://observe.codelutin.com">site du projet</a>. + Pour plus d'informations, vous pouvez visiter le <a href="https://gitlab.com/ultreiaio/ird-observe">site du projet</a>. </p> <h4>Version du locigiel</h4> @@ -49,7 +49,7 @@ <dt>Date</dt> <dd>${buildDate?string('dd.MM.yyyy HH:mm:ss')}</dd> <dt>Numéro de build</dt> - <dd><a href="https://gitlab.nuiton.org/codelutin/observe/commit/${buildNumber}">${buildNumber}</a></dd> + <dd><a href="https://gitlab.com/ultreiaio/ird-observe/commit/${buildNumber}">${buildNumber}</a></dd> </dl> </body> ===================================== client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl ===================================== @@ -23,11 +23,11 @@ <body> <#if connexionStatus.name() == "UNTESTED"> - <h3>La conexión no fue validada o ha sido modificada desde el último test de conexión.</h3> + <h3>La conexión no fue validada o ha sido modificada desde el último test de conexión.</h3> <#elseif connexionStatus.name() == "FAILED"> - <h3>La conexión falló por la razon siguiente:</h3> + <h3>La conexión falló por la razón siguiente:</h3> <ul> <li>${connexionStatusError}</li> ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -26,7 +26,7 @@ <h2> <#if local> - Copia de seguridad de la base local + Copia de seguridad de la base local <#elseif remote> Copia de seguridad de la base remota <#elseif server> @@ -37,43 +37,36 @@ <hr/> <h3> - Ubicación de la copia de seguridad: - <ul> - <li>${backupFile.absolutePath}</li> - </ul> + Ubicación de la copia de seguridad: + <ul> + <li>${backupFile.absolutePath}</li> + </ul> </h3> <#if useSelectData && selectDataModel??> - <h3>Datos a esportar:</h3> + <h3>Datos a exportar:</h3> <ul> <li> - <#if selectDataModel.isEmpty()> + <#if selectDataModel.isEmpty()> No hay datos de observaciones a exportar - <#elseif selectDataModel.isDataFull()> - -<<<<<<< HEAD - Todos los datos de observador deben ser exportados - (<#if selectDataModel.getSelectCedount() == 1> -======= - Todos los datos del observador deben ser exportados + <#elseif selectDataModel.isDataFull()> + Todos los datos de observador deben ser exportados (<#if selectDataModel.selectDataSize() == 1> ->>>>>>> 64a0649... Templates de traduction mis à jour (fixes #8967) - 1 marea - <#else> - ${selectDataModel.getSelectedCount()} mareas - </#if>). + <#else> + ${selectDataModel.getSelectedCount()} mareas + </#if>). - <#else> + <#else> - <#if selectDataModel.getSelectedCount() == 1> + <#if selectDataModel.getSelectedCount() == 1> 1 marea - <#else> - ${selectDataModel.getSelectedCount()} mareas - </#if> + <#else> + ${selectDataModel.getSelectedCount()} mareas + </#if> a exportar @@ -81,41 +74,41 @@ <#list selectDataModel.getSelectedProgram() as program> - <li> -  - [${program.getGearTypePrefix()}] Programa ${program.getLabel()} - <ul> + <li> +  + [${program.getGearTypePrefix()}] Programa ${program.getLabel()} + <ul> <#list selectDataModel.getSelectedTripsByProgram(program) as trip> - <li> -  - ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()} - </li> + <li> +  + ${trip.getStartDate()?date?string.short} - ${trip.getEndDate()?date?string.short} - ${trip.getVesselLabel()} - ${trip.getObserverLabel()} + </li> </#list> - </ul> + </ul> - </li> + </li> </#list> </ul> - </#if> + </#if> </li> <li>El referencial va a ser exportado</li> </ul> - </#if> + </#if> -<#else> + <#else> - <#if dbMode.name() == "USE_LOCAL"> + <#if dbMode.name() == "USE_LOCAL"> <h2>Conexión a la base local</h2> <hr/> @@ -123,237 +116,237 @@ <h3>Ubicación de la base local:</h3> <ul> - <li>${h2Config.directory.absolutePath}</li> + <li>${h2Config.directory.absolutePath}</li> </ul> - <#elseif dbMode.name() == "CREATE_LOCAL"> + <#elseif dbMode.name() == "CREATE_LOCAL"> - <#if doBackup> + <#if doBackup> <h2>Copia de seguridad de la base local</h2> <hr/> <h3>Ubicación de la copia de seguridad:</h3> <ul> - <li>${backupFile.absolutePath}</li> + <li>${backupFile.absolutePath}</li> </ul> - </#if> + </#if> <h2>Creación de la base local</h2> <hr/> - <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> + <#if creationMode.name() == "IMPORT_INTERNAL_DUMP"> <h3>Importación con el último referencial descargado:</h3> <ul> - <li>${initialDbDump.absolutePath}</li> + <li>${initialDbDump.absolutePath}</li> </ul> - <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> + <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> <h3>Importación con una copia de seguridad:</h3> <ul> - <li>${dumpFile.absolutePath}</li> + <li>${dumpFile.absolutePath}</li> </ul> - <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> + <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> <h3>Importación del referencial con una base remota:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> + <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> <h3>Importación del referencial con un servicio web remoto:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - </#if> + </#if> - <#elseif dbMode.name() == "USE_REMOTE"> - <#if !adminAction??> + <#elseif dbMode.name() == "USE_REMOTE"> + <#if !adminAction??> <h2>Conexión a una base remota</h2> <hr/> <h3>Informaciones sobre la base remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - <#else> + <#else> <h2>${adminActionLabel}</h2> <hr/> - <h3>Informaciones sobre la conexión remota a utilisar:</h3> + <h3>Informaciones sobre la conexión remota a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - <#if adminAction.name() == "CREATE"> + <#if adminAction.name() == "CREATE"> - <#if importReferentiel> + <#if importReferentiel> - <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> - <h3>Importación del reférencial con una copia de seguridad:</h3> + <h3>Importación del referencial con una copia de seguridad:</h3> <ul> - <li>${centralSourceModel.dumpFile.absolutePath}</li> + <li>${centralSourceModel.dumpFile.absolutePath}</li> </ul> - <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> <h3>Importación del referencial con una base remota:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> <h3>Importación del referencial con un servicio web remoto:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - </#if> + </#if> - <#else> + <#else> <h3>No Importación de referencial</h3> - </#if> + </#if> - <#if importData> + <#if importData> - <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + <#if dataImportMode.name() == "IMPORT_EXTERNAL_DUMP"> <h3>Importación de datos con una copia de seguridad:</h3> <ul> - <li>${dataSourceModel.dumpFile.absolutePath}</li> + <li>${dataSourceModel.dumpFile.absolutePath}</li> </ul> - <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> + <#elseif dataImportMode.name() == "IMPORT_REMOTE_STORAGE"> <h3>Importación de datos con una base remota:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> - <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> + <#elseif dataImportMode.name() == "IMPORT_SERVER_STORAGE"> <h3>Importación de datos con un servicio web remoto:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=dataSourceModel /> - </#if> + </#if> - <#else> + <#else> <h3>No Importación de datos</h3> - </#if> + </#if> - </#if> + </#if> <h3>Seguridad</h3> <ul> - <li><strong>Proprietario: </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Propietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> - </#if> + </#if> - <#elseif dbMode.name() == "USE_SERVER"> - <#if !adminAction??> + <#elseif dbMode.name() == "USE_SERVER"> + <#if !adminAction??> <h2>Connexion a un servicio web remoto</h2> <hr/> <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - <#else> + <#else> <h2>${adminAction.label}</h2> <hr/> <h3>Informaciones sobre el servicio web remoto a utilizar:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> + <@storageInfo.storageModelDataSourceInformation storageModel=.data_model /> - <#if adminAction.name() == "CREATE"> + <#if adminAction.name() == "CREATE"> - <#if importReferentiel> + <#if importReferentiel> - <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> <h3>Importación del referencial con una copia de seguridad:</h3> <ul> - <li>${centralSourceModel.dumpFile.absolutePath}</li> + <li>${centralSourceModel.dumpFile.absolutePath}</li> </ul> - <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> <h3>Importación del referencial con una base remota:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> <h3>Importación del referencial con un servicio web remoto:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - </#if> + </#if> - <#else> + <#else> <h3>No importación de referencial</h3> - </#if> + </#if> - <#if importData> + <#if importData> - <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> + <#if referentielImportMode.name() == "IMPORT_EXTERNAL_DUMP"> <h3>Importación del referencial con una copia de seguridad:</h3> <ul> - <li>${centralSourceModel.dumpFile.absolutePath}</li> + <li>${centralSourceModel.dumpFile.absolutePath}</li> </ul> - <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_REMOTE_STORAGE"> <h3>Importación del referencial con una base remota:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> + <#elseif referentielImportMode.name() == "IMPORT_SERVER_STORAGE"> <h3>Importación del referencial con un servicio web remoto:</h3> - <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> + <@storageInfo.storageModelDataSourceInformation storageModel=centralSourceModel /> - </#if> + </#if> - <#else> - <h3>No importación de datos</h3> + <#else> + <h3>Ninguna importación de datos</h3> - </#if> + </#if> - </#if> + </#if> <h3>Seguridad</h3> <ul> - <li><strong>Propietario: </strong>${securityModel.administrateur.name}</li> - <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> - <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> - <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> + <li><strong>Propietario: </strong>${securityModel.administrateur.name}</li> + <li><strong>Técnicos: </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lectores: </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Referenciales: </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> - </#if> + </#if> - </#if> + </#if> <h3>Política de actualización</h3> @@ -361,7 +354,7 @@ <#if canMigrate> - <li>Actualización si se necesita (versión actual: ${modelVersion})</li> + <li>Actualización si se necesita (versión actual: ${modelVersion})</li> <#if showMigrationProgression> @@ -377,11 +370,11 @@ <#else> - <li>No actualización posible</li> + <li>Ninguna actualización posible</li> </#if> </ul> -</#if> + </#if> </body> -</html> +</html> \ No newline at end of file ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -23,8 +23,8 @@ <body> <#if configuration??> - <h3>${label}</h3> - <ul> +<h3>${label}</h3> +<ul> <#if isSqlDataSource() > <#if configuration.h2Database??> <li><strong>Usuario: </strong>${configuration.username}</li> @@ -40,9 +40,9 @@ <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> - </ul> - <h3>Droits</h3> - <ul> +</ul> +<h3>Derechos</h3> +<ul> <li><strong>Referencial: </strong> <#if canReadReferential() > Lectura @@ -67,12 +67,12 @@ No tiene derecho </#if> </li> - </ul> - <h3>Version</h3> - v ${connection.version} +</ul> +<h3>Versión</h3> +v ${connection.version} <#else> Ninguna fuente de datos cargada </#if> </body> -</html> +</html> \ No newline at end of file ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl ===================================== @@ -23,15 +23,15 @@ <body> Permisos: -<strong> • Datos de referencias: </strong> +<strong> • Datos referenciales: </strong> <#if canReadReferential() > Lectura <#if canWriteReferential() > / Escritura </#if> - <#elseif canWriteReferential()> +<#elseif canWriteReferential()> Escritura - <#else> +<#else> No tiene derecho </#if> @@ -41,13 +41,13 @@ Permisos: <#if canWriteData() > / Escritura </#if> - <#elseif canWriteData() > +<#elseif canWriteData() > Escritura - <#else> +<#else> No tiene derecho </#if> -<Strong> • Version: </Strong> - v ${version} +<Strong> • Versión: </Strong> +v ${version} </body> -</html> +</html> \ No newline at end of file ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl ===================================== @@ -22,7 +22,7 @@ <html> <body> - <h3>Tipo de fuentes de datos seleccionado</h3> +<h3>Tipo de fuente de datos seleccionado</h3> <#if dbMode.name() == "USE_LOCAL"> Utilizar una base local de tipo H2 @@ -36,21 +36,21 @@ Ningún tipo de fuente de datos seleccionado </#if> - <h3>Modo de creación seleccionado</h3> +<h3>Modo de creación seleccionado</h3> <#if dbMode.name() == "CREATE_LOCAL"> <#if !creationMode??> Ningún modo de creación seleccionado <#elseif creationMode.name() == "EMPTY"> - Generar una nueva base local vacía. Esta base no va a tener un referencial así que luego se necesitara que procede a una importación de referentcial... + Generar una nueva base local vacía. Esta base no va a tener un referencial, así que luego se requerirá una importación de referencial... <#elseif creationMode.name() == "IMPORT_INTERNAL_DUMP"> - Generar una nueva base local a partir de la última versión de la base incrustada. + Generar una nueva base local a partir de la última versión de la base importada. <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> Crear una nueva base local a partir de la última copia de seguridad de la aplicación. <#elseif creationMode.name() == "IMPORT_LOCAL_STORAGE"> - Generar una nueva base local e importar el referencial de una otra base local. + Generar una nueva base local e importar el referencial de otra base local. <#elseif creationMode.name() == "IMPORT_REMOTE_STORAGE"> - Generar una nueva base local e importar el referencial de una otra base remota. + Generar una nueva base local e importar el referencial de otra base remota. <#elseif creationMode.name() == "IMPORT_SERVER_STORAGE"> Generar una nueva base local e importar el referencial de un servicio web remoto. </#if> @@ -58,4 +58,4 @@ No es necesario. </#if> </body> -</html> +</html> \ No newline at end of file ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -22,7 +22,7 @@ <html> <body> -<h3>Chargement d'une source de donnée</h3> +<h3>Importar una base de datos</h3> <p> La base local no existe (ruta ${localDb.absolutePath}). @@ -32,7 +32,7 @@ Ahora puede: <ul> <#if withBackup> - <li>utilizar la última copia de seguridad automática (${backupDate})</li> + <li>Utilizar la última copia de seguridad automática (${backupDate})</li> </#if> <li>Crear una base local nueva</li> <li>Conectar a una base remota</li> ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl ===================================== @@ -27,50 +27,50 @@ <li><strong>Usuario: </strong>${storageModel.pgConfig.username}</li> <li><strong>Contraseña: </strong>*****</li> <li><strong>Modo SSL: </strong>${storageModel.pgConfig.useSsl?then('Si', 'No')}</li> - <#elseif storageModel.editServerConfig> + <#elseif storageModel.editServerConfig> <li><strong>URL del servicio web: </strong>${storageModel.restConfig.serverUrl}</li> <li><strong>Usuario: </strong>${storageModel.restConfig.login}</li> <li><strong>Contraseña: </strong>*****</li> - <#if storageModel.restConfig.optionalDatabaseName.present> + <#if storageModel.restConfig.optionalDatabaseName.present> <li><strong>Alias de la base: </strong>${storageModel.restConfig.optionalDatabaseName.get()}</li> - </#if> - <#else> + </#if> + <#else> <li><strong>Usuario: </strong>${storageModel.h2Config.username}</li> <li><strong>Contraseña: </strong>*****</li> </#if> - <li><strong>Derechos: </strong> - <ul> - <li> - <em>Referencial: </em> + <li><strong>Derechos: </strong> + <ul> + <li> + <em>Referencial: </em> <#if storageModel.dataSourceInformation.canReadReferential() > Lectura <#if storageModel.dataSourceInformation.canWriteReferential() > / Escritura </#if> - <#elseif storageModel.dataSourceInformation.canWriteReferential()> + <#elseif storageModel.dataSourceInformation.canWriteReferential()> Escritura - <#else> + <#else> No tiene derechos </#if> - </li> - <li> - <em>Datos observador: </em> + </li> + <li> + <em>Datos observador: </em> <#if storageModel.dataSourceInformation.canReadData() > Lectura <#if storageModel.dataSourceInformation.canWriteData() > / Escritura </#if> - <#elseif storageModel.dataSourceInformation.canWriteData() > + <#elseif storageModel.dataSourceInformation.canWriteData() > Escritura - <#else> + <#else> No tiene derechos </#if> - </li> - </ul> - </li> + </li> + </ul> + </li> </ul> -<#else> - NO STORAGE MODEL -</#if> -</#macro> + <#else> + NINGÚN MODELO DE ALMACENAMIENTO + </#if> +</#macro> \ No newline at end of file ===================================== client-core/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: Información al cliente %% Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io %% @@ -28,8 +28,8 @@ <ul> <li>Informe de validación generado el ${now}</li> - <li>Scopes : ${scopes?join(", ")}</li> - <li>Context : ${contextName}</li> + <li>Niveles: ${scopes?join(", ")}</li> + <li>Contexto: ${contextName}</li> </ul> <#list messageTypes as type> @@ -37,11 +37,11 @@ <table> <thead> <tr> - <th>Identifiant</th> - <th>Libellé</th> - <th>Scope</th> - <th>Champs</th> - <th>Message</th> + <th>Identificador</th> + <th>Elemento</th> + <th>Nivel</th> + <th>Campo</th> + <th>Mensaje</th> </tr> </thead> <#list validationResult.getDtosForType(type) as dto> ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9904a4b28ca90add7bba36f4a30… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9904a4b28ca90add7bba36f4a30… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Spanish translations - See #1173
by Tony CHEMIT 19 Nov '18

19 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5b166504 by tchemit at 2018-11-19T17:40:17Z Spanish translations - See #1173 - - - - - 10 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - dto/pom.xml - dto/src/main/i18n/getters/java-enumeration.getter - observe-i18n/pom.xml - 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 - pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -201,6 +201,47 @@ <artifactId>services</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-select</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-dto</artifactId> + <version>${observeToolkitVersion}</version> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-validation</artifactId> + <version>${observeToolkitVersion}</version> + <scope>compile</scope> + </dependency> </dependencies> </plugin> </plugins> ===================================== client-core/pom.xml ===================================== @@ -718,6 +718,47 @@ <artifactId>client-configuration</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-select</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-dto</artifactId> + <version>${observeToolkitVersion}</version> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-validation</artifactId> + <version>${observeToolkitVersion}</version> + <scope>compile</scope> + </dependency> </dependencies> </plugin> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -29,10 +29,10 @@ import fr.ird.observe.client.ui.ObserveUICallback; import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; import fr.ird.observe.client.ui.util.UIHelper; import io.ultreia.java4all.i18n.I18n; +import io.ultreia.java4all.i18n.editor.model.Project; +import io.ultreia.java4all.i18n.editor.ui.ProjectUI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.nuiton.i18n.editor.model.Project; -import org.nuiton.i18n.editor.ui.ProjectUI; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; ===================================== dto/pom.xml ===================================== @@ -232,6 +232,49 @@ </execution> </executions> + <dependencies> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-select</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${lib.version.java4all.jaxx}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-dto</artifactId> + <version>${observeToolkitVersion}</version> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-validation</artifactId> + <version>${observeToolkitVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin> </plugins> </pluginManagement> ===================================== dto/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -10,6 +10,8 @@ observe.constant.NonTargetCatchReleaseStatus.M observe.constant.NonTargetCatchReleaseStatus.P observe.constant.NonTargetCatchReleaseStatus.S observe.constant.NonTargetCatchReleaseStatus.U +observe.constant.ObserveModelType.LL.description +observe.constant.ObserveModelType.PS.description observe.constant.Ownership.autreVessel observe.constant.Ownership.ceVessel observe.constant.Ownership.unknown ===================================== observe-i18n/pom.xml ===================================== @@ -61,6 +61,19 @@ <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <dependencies> + + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-dto</artifactId> + <version>${observeToolkitVersion}</version> + </dependency> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-validation</artifactId> + <version>${observeToolkitVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activities observe.common.ActivityLonglineDto.type=Activity observe.common.ActivityLonglineDto.types=Activities observe.common.ActivityLonglineDto.vesselActivityLongline=Vessel activity -observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD +observe.common.ActivitySeineDto.action.addFloatingObject=Declare a new floatting object (FOB) observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity observe.common.ActivitySeineDto.action.addSet=Add a Set observe.common.ActivitySeineDto.action.addSet.tip=Add the set to the activity @@ -654,7 +654,7 @@ observe.common.FloatingObjectDto.notComputed=Not computed observe.common.FloatingObjectDto.objectOperation=Object operation observe.common.FloatingObjectDto.supportVesselName=Support vessel name observe.common.FloatingObjectDto.table.type=Type -observe.common.FloatingObjectDto.title=DCP +observe.common.FloatingObjectDto.title=Floatting object observe.common.FloatingObjectDto.type=Floating object observe.common.FloatingObjectDto.types=Floating objects observe.common.FloatingObjectPartDto.title=Floating object parts @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Security observe.constant.StorageStep.ROLES.description=Applya security on database roles observe.constant.StorageStep.SELECT_DATA=Data selection observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon associated to object observe.constant.TypeTransmittingBuoyOperation.pose=Posing observe.constant.TypeTransmittingBuoyOperation.recuperation=Grab observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change @@ -2171,7 +2171,7 @@ observe.type.action.save=Save %s observe.type.action.view=View selected %s observe.type.activityLongline.unsaved=New activity observe.type.activitySeine.unsaved=New activity -observe.type.floatingObject.unsaved=New DCP +observe.type.floatingObject.unsaved=New floating object (FOB) observe.type.list=List of %s observe.type.management=Management of %s observe.type.reference.common=Common Referential ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Actividades observe.common.ActivityLonglineDto.type=Actividad observe.common.ActivityLonglineDto.types=Actividades observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco -observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB +observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un objeto flotante (FOB) observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad observe.common.ActivitySeineDto.action.addSet=Añadir un lance observe.common.ActivitySeineDto.action.addSet.tip=Añadir el lance de la actividad @@ -954,8 +954,8 @@ observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da observe.common.ObjectMaterialDto.legacyCode=Código antiguo observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar observe.common.ObjectMaterialDto.objectMaterialType=Tipo -observe.common.ObjectMaterialDto.parent=Parent \#TODO -observe.common.ObjectMaterialDto.parentCode=Parent \#TODO +observe.common.ObjectMaterialDto.parent=Padre +observe.common.ObjectMaterialDto.parentCode=Padre observe.common.ObjectMaterialDto.standardCode=Código estándar observe.common.ObjectMaterialDto.type=Componente del objeto flotante observe.common.ObjectMaterialDto.types=Componentes del objeto flotante @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Seguridad observe.constant.StorageStep.ROLES.description=Configuración de la seguridad observe.constant.StorageStep.SELECT_DATA=Selección de datos observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Objeto sin baliza observe.constant.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza observe.constant.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza @@ -2171,7 +2171,7 @@ observe.type.action.save=Guardar las modificaciones sobre el elemento de tipo '% observe.type.action.view=Ver los detalles del objeto de tipo '%s' seleccionado observe.type.activityLongline.unsaved=Nueva actividad observe.type.activitySeine.unsaved=Nueva actividad -observe.type.floatingObject.unsaved=Nuevo FOB +observe.type.floatingObject.unsaved=Nuevo objeto flotante (FOB) observe.type.list=Lista de %s observe.type.management=Gestión de %s observe.type.reference.common=Referencial común ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activités observe.common.ActivityLonglineDto.type=Activité observe.common.ActivityLonglineDto.types=Activités observe.common.ActivityLonglineDto.vesselActivityLongline=Activité bateau -observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP +observe.common.ActivitySeineDto.action.addFloatingObject=Déclarer un objet flottant (FOB) observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité observe.common.ActivitySeineDto.action.addSet=Ajouter la calée observe.common.ActivitySeineDto.action.addSet.tip=Ajouter la calée de l'activité @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Sécurité observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité observe.constant.StorageStep.SELECT_DATA=Sélection données observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée à l'objet observe.constant.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise observe.constant.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise @@ -2171,7 +2171,7 @@ observe.type.action.save=Sauver les modifications sur l'objet de type '%s' observe.type.action.view=Voir les détails de l'objet de type '%s' sélectionné observe.type.activityLongline.unsaved=Nouvelle activité observe.type.activitySeine.unsaved=Nouvelle activité -observe.type.floatingObject.unsaved=Nouveau DCP +observe.type.floatingObject.unsaved=Nouvel objet flottant (FOB) observe.type.list=Liste des %s observe.type.management=Gestion des %s observe.type.reference.common=Référentiel commun ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.8</version> + <version>2018.8.10</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.13</observeToolkitVersion> + <observeToolkitVersion>3.7.14</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  @@ -164,7 +164,7 @@  <lib.version.h2>1.4.196</lib.version.h2>  -  +    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5b1665046f8b3588d8d733a1218… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5b1665046f8b3588d8d733a1218… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Echantillons : Petits ajustements (ne plus ajouter automatiquement un…
by Tony CHEMIT 19 Nov '18

19 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5fe8bfcc by tchemit at 2018-11-19T12:10:36Z [LL] Echantillons : Petits ajustements (ne plus ajouter automatiquement un echantillon sur la creation d'une activité) - Closes #1132 - - - - - 360a4e41 by tchemit at 2018-11-19T12:10:38Z Fix some validators - - - - - 26 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteSampleLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java - dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto.java - 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 - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineLogbookSampleService.java - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -289,6 +289,8 @@ observe.common.ActivityDto.action.goToOpen.short observe.common.ActivityDto.action.goToOpen.tip observe.common.ActivityLogbookDto.action.goToOpen.short observe.common.ActivityLogbookDto.action.goToOpen.tip +observe.common.ActivityLonglineLogbookDto.action.addSample +observe.common.ActivityLonglineLogbookDto.action.addSample.tip observe.common.ActivityLonglineLogbookDto.action.addSet observe.common.ActivityLonglineLogbookDto.action.addSet.tip observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -94,6 +94,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_GO_DOWN = KeyStroke.getKeyStroke("alt pressed D"); public static final KeyStroke KEY_STROKE_ADD_DCP = KeyStroke.getKeyStroke("ctrl pressed P"); public static final KeyStroke KEY_STROKE_ADD_SET_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed L"); + public static final KeyStroke KEY_STROKE_ADD_SAMPLE_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed M"); public static final KeyStroke KEY_STROKE_GO_UP = KeyStroke.getKeyStroke("alt pressed U"); public static final KeyStroke KEY_STROKE_EDIT_REFERENTIAL = KeyStroke.getKeyStroke("ctrl pressed M"); public static final KeyStroke KEY_STROKE_DETAIL_REFERENTIAL = KeyStroke.getKeyStroke("ctrl pressed D"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; import fr.ird.observe.navigation.tree.ReferenceNode; import fr.ird.observe.navigation.tree.SingleReferenceContainerNode; import fr.ird.observe.spi.DtoModelHelper; +import org.jetbrains.annotations.NotNull; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import javax.swing.KeyStroke; @@ -93,14 +94,7 @@ public abstract class SaveEditDataUIActionSupport<D extends DataDto, R extends D ReferenceNode<D, R> node = model.getReferenceNode(tree); NavigationTreeNodeSupport parent = (NavigationTreeNodeSupport) node.getParent(); - Function<R, ReferenceNode<D, R>> nodeFactory; - if (parent instanceof SingleReferenceContainerNode) { - //noinspection unchecked - nodeFactory = ((SingleReferenceContainerNode) parent)::newSingleChildNode; - } else { - //noinspection unchecked - nodeFactory = ((MultipleReferenceContainerNode) parent)::newChildNode; - } + Function<R, ReferenceNode<D, R>> nodeFactory = getNodeFactory(parent); ReferentialLocale referentialLocale = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialLocale(); @@ -132,5 +126,18 @@ public abstract class SaveEditDataUIActionSupport<D extends DataDto, R extends D // afterSave(ui, bean, node, notPersisted); } + @NotNull + protected Function<R, ReferenceNode<D, R>> getNodeFactory(NavigationTreeNodeSupport parent) { + Function<R, ReferenceNode<D, R>> nodeFactory; + if (parent instanceof SingleReferenceContainerNode) { + //noinspection unchecked + nodeFactory = ((SingleReferenceContainerNode) parent)::newSingleChildNode; + } else { + //noinspection unchecked + nodeFactory = ((MultipleReferenceContainerNode) parent)::newChildNode; + } + return nodeFactory; + } + } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSampleUIAction.java ===================================== @@ -0,0 +1,65 @@ +package fr.ird.observe.client.ui.actions.content.data.longline.add; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.content.api.AbstractContentUIAction; +import fr.ird.observe.client.ui.content.api.ContentUI; +import fr.ird.observe.client.ui.content.data.longline.logbook.ActivityLonglineLogbookUI; +import fr.ird.observe.client.ui.tree.navigation.NavigationTree; +import fr.ird.observe.client.ui.tree.navigation.nodes.longline.logbook.ActivityLonglineLogbookNavigationTreeNode; +import fr.ird.observe.client.ui.tree.navigation.nodes.longline.logbook.ActivityLonglineSampleLogbookNavigationTreeNode; +import fr.ird.observe.dto.data.longline.ActivityLonglineLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookReference; + +import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created by tchemit on 19/11/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class AddActivityLonglineLogbookSampleUIAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = AddActivityLonglineLogbookSampleUIAction.class.getName(); + + public AddActivityLonglineLogbookSampleUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.common.ActivityLonglineLogbookDto.action.addSample"), t("observe.common.ActivityLonglineLogbookDto.action.addSample.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE_LONGLINE); + } + + @Override + protected void actionPerformed(ContentUI contentUI) { + NavigationTree tree = getNavigationTree(); + ActivityLonglineLogbookNavigationTreeNode parentNode = (ActivityLonglineLogbookNavigationTreeNode) tree.getSelectedNode(); + ActivityLonglineLogbookUI ui = (ActivityLonglineLogbookUI) contentUI; + ActivityLonglineLogbookDto bean = ui.getBean(); + ActivityLonglineSampleLogbookNavigationTreeNode childNode = parentNode.newSampleChildNode(new SampleLogbookReference(new SampleLogbookDto(), + bean.getTimeStamp(), + bean.getLatitude(), + bean.getLongitude())); + tree.addUnsavedNode(parentNode, childNode); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteSampleLonglineLogbookUIAction.java ===================================== @@ -0,0 +1,32 @@ +package fr.ird.observe.client.ui.actions.content.data.longline.delete; + +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.content.api.data.edit.DeleteEditDataUIActionSupport; +import fr.ird.observe.client.ui.content.data.longline.logbook.ActivityLonglineLogbookSampleUI; +import fr.ird.observe.dto.data.longline.SampleLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookReference; +import fr.ird.observe.navigation.model.edit.ObserveEditNode; + +import static fr.ird.observe.client.ui.ObserveKeyStrokes.KEY_STROKE_DELETE_DATA_GLOBAL; +import static io.ultreia.java4all.i18n.I18n.n; + +/** + * Created by tchemit on 19/11/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class DeleteSampleLonglineLogbookUIAction extends DeleteEditDataUIActionSupport<SampleLogbookDto, SampleLogbookReference, ActivityLonglineLogbookSampleUI> { + + public static final String ACTION_NAME = DeleteSampleLonglineLogbookUIAction.class.getName(); + + public DeleteSampleLonglineLogbookUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.delete.tip"), KEY_STROKE_DELETE_DATA_GLOBAL); + } + + @Override + protected void doDelete(ActivityLonglineLogbookSampleUI ui, SampleLogbookDto bean, ObserveEditNode<?> parentEditNode) { + String parentId = parentEditNode.getId(); + getServicesProvider().getActivityLonglineLogbookSampleService().delete(parentId, bean.getId()); + } + +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookSampleUIAction.java ===================================== @@ -24,18 +24,25 @@ package fr.ird.observe.client.ui.actions.content.data.longline.save; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; -import fr.ird.observe.client.ui.actions.content.api.data.simple.SaveSimpleDataUIActionSupport; +import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.longline.logbook.ActivityLonglineLogbookSampleUI; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ui.tree.navigation.nodes.longline.logbook.ActivityLonglineLogbookNavigationTreeNode; import fr.ird.observe.dto.data.longline.SampleLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.ReferenceNode; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. * * @author Tony Chemit - dev(a)tchemit.fr */ -public class SaveActivityLonglineLogbookSampleUIAction extends SaveSimpleDataUIActionSupport<SampleLogbookDto, ActivityLonglineLogbookSampleUI> { +public class SaveActivityLonglineLogbookSampleUIAction extends SaveEditDataUIActionSupport<SampleLogbookDto, SampleLogbookReference, ActivityLonglineLogbookSampleUI> { public static final String ACTION_NAME = SaveActivityLonglineLogbookSampleUIAction.class.getName(); @@ -44,16 +51,16 @@ public class SaveActivityLonglineLogbookSampleUIAction extends SaveSimpleDataUIA } @Override - protected boolean doSave(ActivityLonglineLogbookSampleUI ui, SampleLogbookDto bean, ObserveEditNode<?> parentEditNode) { + protected boolean doSave(ActivityLonglineLogbookSampleUI ui, SampleLogbookDto bean, ObserveEditNode<?> parentEditNode, boolean notPersisted) { bean.setSamplePartLogbook(ui.getSamplePartLogbookModel().getBean().getSamplePartLogbook()); - SaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookSampleService().save(bean); + String parentId = parentEditNode.getId(); + SaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookSampleService().save(parentId, bean); saveResult.toDto(bean); return true; } @Override - protected void afterSave(ActivityLonglineLogbookSampleUI ui, SampleLogbookDto bean) { - super.afterSave(ui, bean); - ui.getSamplePartLogbookUI().resetEdit(); + protected @NotNull Function<SampleLogbookReference, ReferenceNode<SampleLogbookDto, SampleLogbookReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((ActivityLonglineLogbookNavigationTreeNode)parent)::newSampleChildNode; } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx ===================================== @@ -18,16 +18,18 @@ #L% --> -<fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI +<fr.ird.observe.client.ui.content.api.data.edit.ContentEditUI i18n="fr.ird.observe.dto.data.longline.SampleLogbookDto" - superGenericType='SampleLogbookDto, ActivityLonglineLogbookSampleUI' + superGenericType='SampleLogbookDto, SampleLogbookReference, ActivityLonglineLogbookSampleUI' contentTitle='{n("observe.common.SampleLogbookDto.title")}'> <style source="../../../Common.jcss"/> <import> fr.ird.observe.dto.data.longline.SampleLogbookDto + fr.ird.observe.dto.data.longline.SampleLogbookReference + fr.ird.observe.client.ui.actions.content.data.longline.delete.DeleteSampleLonglineLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.move.MoveSingleActivityLonglineSampleLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.save.SaveActivityLonglineLogbookSampleUIAction fr.ird.observe.client.ui.util.JComment @@ -67,7 +69,8 @@ <JButton id='reset'/> <JButton id='save'/> - <Table id="actions" fill='both' weightx='1' insets='0'> + <JButton id='delete'/> + <Table id="extraActions" fill='both' weightx='1' insets='0'> <row> <cell weightx="0.5" fill="both"> <JButton id='move'/> @@ -77,4 +80,4 @@ <Object id="delegateContentUI" initializer="samplePartLogbookPanel"/> <SamplePartLogbookUIModel id="samplePartLogbookModel" initializer="samplePartLogbookUI.getModel()" styleClass="contentTableStandalone"/> -</fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> +</fr.ird.observe.client.ui.content.api.data.edit.ContentEditUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jcss ===================================== @@ -29,6 +29,15 @@ _observeAction:{SaveActivityLonglineLogbookSampleUIAction.ACTION_NAME}; } + +#delete { + _observeAction:{DeleteSampleLonglineLogbookUIAction.ACTION_NAME}; +} + +#extraActions { + visible:{!model.isReadingMode()}; +} + #comment { title:"observe.common.TripLonglineSampleLogbookDto.comment"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -24,9 +24,10 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.api.ContentMode; -import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIHandler; +import fr.ird.observe.client.ui.content.api.data.edit.ContentEditUIHandler; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.dto.data.longline.SampleLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookReference; import fr.ird.observe.dto.form.Form; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -34,8 +35,6 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; import java.awt.Component; import java.awt.Container; -import java.awt.GridBagConstraints; -import java.awt.Insets; /** * Created on 12/5/14. @@ -43,7 +42,7 @@ import java.awt.Insets; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.8 */ -public class ActivityLonglineLogbookSampleUIHandler extends ContentSimpleUIHandler<SampleLogbookDto, ActivityLonglineLogbookSampleUI> implements UIHandler<ActivityLonglineLogbookSampleUI> { +public class ActivityLonglineLogbookSampleUIHandler extends ContentEditUIHandler<SampleLogbookDto, SampleLogbookReference, ActivityLonglineLogbookSampleUI> implements UIHandler<ActivityLonglineLogbookSampleUI> { private static final Logger log = LogManager.getLogger(ActivityLonglineLogbookSampleUIHandler.class); @@ -64,9 +63,6 @@ public class ActivityLonglineLogbookSampleUIHandler extends ContentSimpleUIHandl ObserveSwingApplicationContext.get().getMainUI().removeContextValue(Boolean.class, "fromActivity"); initTabUI(ui.getSamplePartLogbookUI(), ui.getSamplePartLogbookPanel()); ui.getSamplePartLogbookUI().getSelectToolbar().setVisible(true); - ui.getActions().add(ui.getReset(), new GridBagConstraints(0, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); - ui.getActions().add(ui.getSave(), new GridBagConstraints(1, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); - ui.getActions().add(ui.getMove(), new GridBagConstraints(2, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); } @Override @@ -90,9 +86,18 @@ public class ActivityLonglineLogbookSampleUIHandler extends ContentSimpleUIHandl public void onOpenModel() { super.onOpenModel(); ActivityLonglineLogbookSampleUIModel model = getModel(); - String activityId = model.getSelectedId(); + String sampleId = model.getSelectedId(); + String activityId = model.getSelectedParentId(); log.info(prefix + "activityId = " + activityId); - Form<SampleLogbookDto> form = getActivityLonglineLogbookSampleService().loadForm(activityId); + log.info(prefix + "sampleId = " + sampleId); + boolean create = sampleId == null; + + Form<SampleLogbookDto> form; + if (create) { + form = getActivityLonglineLogbookSampleService().preCreate(activityId); + } else { + form = getActivityLonglineLogbookSampleService().loadForm(activityId); + } model.openForm(form); onOpenTabUIModel(ui.getSamplePartLogbookUI(), form); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIModel.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -24,8 +24,10 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.content.api.ContentMode; -import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; +import fr.ird.observe.client.ui.content.api.data.edit.ContentEditUIModel; import fr.ird.observe.dto.data.longline.SampleLogbookDto; +import fr.ird.observe.dto.data.longline.SampleLogbookReference; +import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.model.select.ObserveSelectNode; /** @@ -33,7 +35,7 @@ import fr.ird.observe.navigation.model.select.ObserveSelectNode; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class ActivityLonglineLogbookSampleUIModel extends ContentSimpleUIModel<SampleLogbookDto> { +public class ActivityLonglineLogbookSampleUIModel extends ContentEditUIModel<SampleLogbookDto, SampleLogbookReference> { private static final long serialVersionUID = 1L; @@ -43,12 +45,16 @@ public class ActivityLonglineLogbookSampleUIModel extends ContentSimpleUIModel<S @Override protected ContentMode computeMode(boolean canWrite) { - return canWrite ? getContentModeFromSelf() : ContentMode.READ; + return canWrite ? getContentModeFromParent() : ContentMode.READ; } @Override protected ObserveSelectNode<?> computeSelectNode() { - return ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook(); + return ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSample(); + } + + protected ObserveEditNode<?> computeEditNode() { + return ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getActivityLogbook(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -38,6 +38,7 @@ fr.ird.observe.dto.referential.DataQualityReference fr.ird.observe.client.ui.actions.content.data.longline.add.AddActivityLonglineLogbookSetUIAction + fr.ird.observe.client.ui.actions.content.data.longline.add.AddActivityLonglineLogbookSampleUIAction fr.ird.observe.client.ui.actions.content.data.longline.delete.DeleteActivityLonglineLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.move.MoveSingleActivityLonglineLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.save.SaveActivityLonglineLogbookUIAction @@ -221,6 +222,9 @@ <cell weightx="0.5" fill="both"> <JButton id='addSet'/> </cell> + <cell weightx="0.5" fill="both"> + <JButton id='addSample'/> + </cell> </row> </Table> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -118,6 +118,11 @@ _observeAction:{AddActivityLonglineLogbookSetUIAction.ACTION_NAME}; } +#addSample { + enabled:{!model.isModified() && model.isValid() && !bean.isHasSample()}; + _observeAction:{AddActivityLonglineLogbookSampleUIAction.ACTION_NAME}; +} + #chooseRelatedObservedActivity { visible:{!model.isReadingMode()}; enabled:{model.isValid()}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -76,9 +76,9 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl boolean fromActivity = ui.getContextValue(Boolean.class, "fromActivity") != null; if (fromActivity) { ui.removeContextValue(Boolean.class, "fromActivity"); - ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook())); + ui.setContextValue(new SamplePartLogbookUIModel(ui, getDataSource(),ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook())); } else { - ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTripSampleLogbook())); + ui.setContextValue(new SamplePartLogbookUIModel(ui, getDataSource(),ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTripSampleLogbook())); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * #L% */ +import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.content.api.data.table.ContentTableMeta; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI; @@ -29,7 +30,6 @@ import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIModel; import fr.ird.observe.client.validation.ClientValidationContext; import fr.ird.observe.dto.data.longline.SampleLogbookDto; import fr.ird.observe.dto.data.longline.SamplePartLogbookDto; -import fr.ird.observe.dto.data.longline.SamplePartLogbookHelper; import fr.ird.observe.dto.referential.LengthMeasureMethodReference; import fr.ird.observe.dto.referential.SexReference; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; @@ -63,7 +63,7 @@ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookD private LengthMeasureMethodReference defaultLengthMeasureMethod; private WeightMeasureMethodReference defaultWeightMeasureMethod; - public SamplePartLogbookUIModel(SamplePartLogbookUI ui, ObserveSelectNode<?> selectNode) { + public SamplePartLogbookUIModel(SamplePartLogbookUI ui, ObserveSwingDataSource dataSource, ObserveSelectNode<?> selectNode) { super(SampleLogbookDto.class, SamplePartLogbookDto.class, selectNode, @@ -93,15 +93,11 @@ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookD ContentTableModel.newTableMeta(SamplePartLogbookDto.class, SamplePartLogbookDto.PROPERTY_SEX, false)); initModel(ui, metas); - setAddMessageOnOpen(false); - } - @Override - public void initModel(ContentTableUI<SampleLogbookDto, SamplePartLogbookDto, ?> ui, List<ContentTableMeta<SamplePartLogbookDto>> contentTableMetas) { - super.initModel(ui, contentTableMetas); - defaultSex = ui.getDataSource().getReferentialReferenceSet(SexReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID).orElseThrow(IllegalStateException::new); - defaultLengthMeasureMethod = ui.getDataSource().getReferentialReferenceSet(LengthMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); - defaultWeightMeasureMethod = ui.getDataSource().getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + defaultSex = dataSource.getReferentialReferenceSet(SexReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID).orElseThrow(IllegalStateException::new); + defaultLengthMeasureMethod = dataSource.getReferentialReferenceSet(LengthMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + defaultWeightMeasureMethod = dataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + setAddMessageOnOpen(false); } @Override @@ -143,7 +139,7 @@ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookD @Override protected void load(SamplePartLogbookDto source, SamplePartLogbookDto target) { - SamplePartLogbookHelper.copySamplePartLogbookDto(source, target); + source.copy(target); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== @@ -333,6 +333,11 @@ public class NavigationTree extends JXTree { afterAddUnsavedNode(parentNode, result); } + public void addUnsavedNode(MutableTreeNode parentNode, ReferenceNode<?,?> result) { + insertNode(parentNode, result, parentNode.getChildCount()); + afterAddUnsavedNode(parentNode, result); + } + private void afterAddUnsavedNode(MutableTreeNode parentNode, ReferenceNode result) { // refresh parent node (render of parent can have changed) ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java ===================================== @@ -94,6 +94,10 @@ public class ActivityLonglineLogbookNavigationTreeNode extends ReferenceNavigati return SetLonglineLogbookReference.class; } + public ActivityLonglineSampleLogbookNavigationTreeNode newSampleChildNode(SampleLogbookReference childrenReference) { + return new ActivityLonglineSampleLogbookNavigationTreeNode(childrenReference); + } + @Override public SetLonglineLogbookNavigationTreeNode newSingleChildNode(SetLonglineLogbookReference childrenReference) { return new SetLonglineLogbookNavigationTreeNode(childrenReference); ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.dto.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -74,4 +74,9 @@ public class ActivityLonglineLogbookDto extends GeneratedActivityLonglineLogbook public String getVesselActivityLonglineId() { return vesselActivityLongline == null ? null : vesselActivityLongline.getId(); } + + public boolean isHasSample() { + return sample != null; + } + } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -389,6 +389,8 @@ observe.common.ActivityLonglineDto.message.not.open=Activity is not opened, no e observe.common.ActivityLonglineDto.message.updating=Updating an activity observe.common.ActivityLonglineDto.timeStamp=timestamp observe.common.ActivityLonglineDto.titles=Activities +observe.common.ActivityLonglineLogbookDto.action.addSample=Add sample +observe.common.ActivityLonglineLogbookDto.action.addSample.tip=Add sample associated with this activity observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity=Choose activity ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -389,6 +389,8 @@ observe.common.ActivityLonglineDto.message.not.open=La actividad no está abiert observe.common.ActivityLonglineDto.message.updating=Se está modificando la actividad actual. observe.common.ActivityLonglineDto.timeStamp=FechaHora observe.common.ActivityLonglineDto.titles=Actividades +observe.common.ActivityLonglineLogbookDto.action.addSample=Add sample \#TODO +observe.common.ActivityLonglineLogbookDto.action.addSample.tip=Add sample associated with this activity \#TODO observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity=Choose activity \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -389,6 +389,8 @@ observe.common.ActivityLonglineDto.message.not.open=L'opération de pêche n'est observe.common.ActivityLonglineDto.message.updating=L'activité est en cours de modification. observe.common.ActivityLonglineDto.timeStamp=Horodatage observe.common.ActivityLonglineDto.titles=Activités +observe.common.ActivityLonglineLogbookDto.action.addSample=Ajouter l'échantillon +observe.common.ActivityLonglineLogbookDto.action.addSample.tip=Ajouter l'échantillon associé à cette activité observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity=Choisir l'activité ===================================== server-core/src/main/filtered-resources/mapping ===================================== @@ -95,9 +95,11 @@ POST /api/v1/data/longline/ActivityLongLineObsEncounterService/save GET /api/v1/data/longline/ActivityLongLineObsSensorUsedService/getDataFile v1.data.longline.ActivityLongLineObsSensorUsedServiceRestApi.getDataFile GET /api/v1/data/longline/ActivityLongLineObsSensorUsedService/loadForm v1.data.longline.ActivityLongLineObsSensorUsedServiceRestApi.loadForm POST /api/v1/data/longline/ActivityLongLineObsSensorUsedService/save v1.data.longline.ActivityLongLineObsSensorUsedServiceRestApi.save +DELETE /api/v1/data/longline/ActivityLonglineLogbookSampleService/delete v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.delete GET /api/v1/data/longline/ActivityLonglineLogbookSampleService/loadForm v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.loadForm POST /api/v1/data/longline/ActivityLonglineLogbookSampleService/moveToActivityLongline v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.moveToActivityLongline POST /api/v1/data/longline/ActivityLonglineLogbookSampleService/moveToTripLongline v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.moveToTripLongline +GET /api/v1/data/longline/ActivityLonglineLogbookSampleService/preCreate v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.preCreate POST /api/v1/data/longline/ActivityLonglineLogbookSampleService/save v1.data.longline.ActivityLonglineLogbookSampleServiceRestApi.save DELETE /api/v1/data/longline/ActivityLonglineLogbookService/delete v1.data.longline.ActivityLonglineLogbookServiceRestApi.delete GET /api/v1/data/longline/ActivityLonglineLogbookService/exists v1.data.longline.ActivityLonglineLogbookServiceRestApi.exists ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookSampleServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -45,13 +45,35 @@ public class ActivityLonglineLogbookSampleServiceLocal extends ObserveServiceLoc } @Override - public SaveResultDto save(SampleLogbookDto dto) { + public Form<SampleLogbookDto> preCreate(String activityLonglineId) { + ActivityLonglineLogbook activity = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId); + SampleLogbook preCreated = SAMPLE_LOGBOOK_SPI.newEntity(); + preCreated.setTimeStamp(activity.getTimeStamp()); + preCreated.setLatitude(activity.getLatitude()); + preCreated.setLongitude(activity.getLongitude()); + return SAMPLE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale()); + } + + @Override + public SaveResultDto save(String activityId, SampleLogbookDto dto) { + ActivityLonglineLogbook activity = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityId); SampleLogbook entity = SAMPLE_LOGBOOK_SPI.loadOrCreateEntityFromDataDto(getTopiaPersistenceContext(), dto); checkLastUpdateDate(entity, dto); SAMPLE_LOGBOOK_SPI.copyDataDtoToEntity(dto, entity, getReferentialLocale()); + if (activity.getSample() == null) { + activity.setSample(entity); + } return saveEntity(entity); } + @Override + public void delete(String activityLonglineId, String sampleLogbookId) { + ActivityLonglineLogbook activity = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId); + SAMPLE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), sampleLogbookId); + activity.setSample(null); + saveEntity(activity); + } + @Override public void moveToTripLongline(String activityId, String newTripId, String sampleLogbookId) { //FIXME Manage fields to remove like associated observed activity ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java ===================================== @@ -34,7 +34,6 @@ import fr.ird.observe.dto.result.TripChildSaveResultDto; import fr.ird.observe.dto.result.TripChildSaveResultHelper; import fr.ird.observe.entities.longline.ActivityLonglineLogbook; import fr.ird.observe.entities.longline.ActivityLonglineLogbookTopiaDao; -import fr.ird.observe.entities.longline.SampleLogbook; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.DataQuality; import fr.ird.observe.services.local.service.ObserveServiceLocal; @@ -108,21 +107,11 @@ public class ActivityLonglineLogbookServiceLocal extends ObserveServiceLocal imp checkLastUpdateDate(entity, dto); ACTIVITY_LONGLINE_LOGBOOK_SPI.copyDataDtoToEntity(dto, entity, getReferentialLocale()); boolean notPersisted = dto.isNotPersisted(); - if (notPersisted) { - // create a unique sample - SampleLogbook preCreated = SAMPLE_LOGBOOK_SPI.newEntity(); - preCreated.setLatitude(entity.getLatitude()); - preCreated.setLongitude(entity.getLongitude()); - preCreated.setTimeStamp(entity.getTimeStamp()); - saveEntity(preCreated); - entity.setSample(preCreated); - } SaveResultDto saveResultDto = saveEntity(entity); TripChildSaveResultDto result = TripChildSaveResultHelper.of(saveResultDto); if (notPersisted) { tripLongline.addActivityLonglineLogbook(entity); - } boolean wasEndDateUpdated = TRIP_LONGLINE_SPI.getDao(getTopiaPersistenceContext()).updateEndDate(tripLongline); result.setTripEndDateUpdated(wasEndDateUpdated); ===================================== services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineLogbookSampleService.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; +import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Post; @@ -37,6 +38,10 @@ import io.ultreia.java4all.http.spi.Post; */ public interface ActivityLonglineLogbookSampleService extends ObserveService { + @Get + @WriteDataPermission + Form<SampleLogbookDto> preCreate(String activityLonglineId); + @Get @ReadDataPermission Form<SampleLogbookDto> loadForm(String activityLonglineId); @@ -44,7 +49,12 @@ public interface ActivityLonglineLogbookSampleService extends ObserveService { @WriteDataPermission @Write @Post - SaveResultDto save(SampleLogbookDto dto); + SaveResultDto save(String activityId, SampleLogbookDto dto); + + @Write + @WriteDataPermission + @Delete + void delete(String activityLonglineId, String sampleLogbookId); @WriteDataPermission @Write ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -26,13 +26,13 @@ <field name="homeId">  - <field-validator type="setLonglineObsUniqueHomeIdDto" short-circuit="true"> + <field-validator type="setLonglineLogbookUniqueHomeIdDto" short-circuit="true"> <message>observe.validation.setLongline.duplicated.homeId##${duplicatedActivity}</message> </field-validator> </field> <field name="number">  - <field-validator type="setLonglineObsUniqueNumberIdDto" short-circuit="true"> + <field-validator type="setLonglineLogbookUniqueNumberIdDto" short-circuit="true"> <message>observe.validation.setLongline.duplicated.number##${duplicatedActivity}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -26,13 +26,13 @@ <field name="homeId">  - <field-validator type="setLonglineObsUniqueHomeIdDto" short-circuit="true"> + <field-validator type="setLonglineLogbookUniqueHomeIdDto" short-circuit="true"> <message>observe.validation.setLongline.duplicated.homeId##${duplicatedActivity}</message> </field-validator> </field> <field name="number">  - <field-validator type="setLonglineObsUniqueNumberIdDto" short-circuit="true"> + <field-validator type="setLonglineLogbookUniqueNumberIdDto" short-circuit="true"> <message>observe.validation.setLongline.duplicated.number##${duplicatedActivity}</message> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ce9d7d7291118369bbcbee974d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ce9d7d7291118369bbcbee974d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Mise à jour des objectmaterial - Closes #1170 (update tests)
by Tony CHEMIT 19 Nov '18

19 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 90e8ff3a by tchemit at 2018-11-19T10:55:00Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - 35405cb0 by tchemit at 2018-11-19T10:56:05Z [LL] Marée : Petits ajustements - See #1124 - - - - - 5106ba84 by tchemit at 2018-11-19T10:56:09Z Traductions espagnoles - Closes #1165 - - - - - 54678e6c by tchemit at 2018-11-19T10:56:23Z update some libs - - - - - 708aa1a3 by tchemit at 2018-11-19T10:56:25Z use las toolkit - - - - - 421f7333 by tchemit at 2018-11-19T10:56:25Z [LL] Echantillons : Petits ajustements - Closes #1132 - - - - - ce9d7d72 by tchemit at 2018-11-19T10:56:25Z [LL] Echantillons : Petits ajustements (ne plus ajouter automatiquement un echantillon sur la creation d'une activité) - Closes #1132 - - - - - 30 changed files: - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/models/Observe-07-data-longline.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/data/longline/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java - persistence/src/main/models/Observe-07-data-longline.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59a29e876315e5d58a57de557d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/59a29e876315e5d58a57de557d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Mise à jour des objectmaterial - Closes #1170 (update tests)
by Tony CHEMIT 19 Nov '18

19 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 85bd67f7 by tchemit at 2018-11-19T10:39:51Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - b684f01d by tchemit at 2018-11-19T10:39:59Z [LL] Marée : Petits ajustements - See #1124 - - - - - 55c0b311 by tchemit at 2018-11-19T10:40:02Z Traductions espagnoles - Closes #1165 - - - - - 23cbcd8f by tchemit at 2018-11-19T10:40:02Z update some libs - - - - - 5017746e by tchemit at 2018-11-19T10:40:02Z use las toolkit - - - - - be64a5e4 by tchemit at 2018-11-19T10:40:03Z [LL] Echantillons : Petits ajustements - Closes #1132 - - - - - 59a29e87 by tchemit at 2018-11-19T10:41:04Z [LL] Echantillons : Petits ajustements (ne plus ajouter automatiquement un echantillon sur la creation d'une activité) - Closes #1132 - - - - - 30 changed files: - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/models/Observe-07-data-longline.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/data/longline/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java - persistence/src/main/models/Observe-07-data-longline.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d1de3405108a4502bb7cdf24d9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d1de3405108a4502bb7cdf24d9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Traductions espagnoles - Closes #1165
by Tony CHEMIT 19 Nov '18

19 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c4ca8b96 by tchemit at 2018-11-16T16:08:04Z Traductions espagnoles - Closes #1165 - - - - - d8f0108a by tchemit at 2018-11-18T20:11:22Z update some libs - - - - - a93063f5 by tchemit at 2018-11-18T20:11:49Z use las toolkit - - - - - d1de3405 by tchemit at 2018-11-19T09:25:44Z [LL] Echantillons : Petits ajustements - Closes #1132 - - - - - 10 changed files: - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - pom.xml Changes: ===================================== client-core/pom.xml ===================================== @@ -336,10 +336,10 @@ </dependency>   -  -  -  -  +  +  +  +   <dependency> <groupId>${project.groupId}</groupId> @@ -365,8 +365,8 @@ <artifactId>persistence</artifactId> </dependency>  -  -  +  +   <dependency> @@ -759,7 +759,6 @@ <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> - </dependencies> </plugin> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -72,7 +72,7 @@ public class TranslateAction extends MenuActionSupport { projectUI.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { - if (model.getLastExport() != null) { + if (model.getLastExportDate() != null) { log.info("Found existing i18n export, will reload i18n"); UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); ObserveUICallback.application.run(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -61,9 +61,13 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class); private final PropertyChangeListener speciesChanged; + private final PropertyChangeListener lengthChanged; + private final PropertyChangeListener weightChanged; SamplePartLogbookUIHandler() { speciesChanged = evt -> onSpeciesChanged((SpeciesReference) evt.getNewValue()); + lengthChanged = evt -> onLengthChanged((Float) evt.getNewValue()); + weightChanged = evt -> onWeightChanged((Float) evt.getNewValue()); } @Override @@ -156,6 +160,8 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl SamplePartLogbookDto tableEditBean = getModel().getTableEditBean(); tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_SPECIES, speciesChanged); + tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.removePropertyChangeListener(SamplePartLogbookDto.PROPERTY_WEIGHT, weightChanged); SpeciesReference species = bean.getSpecies(); log.debug(prefix + "selected species " + species); @@ -197,26 +203,23 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl UIHelper.askFocus(requestFocus); tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_SPECIES, speciesChanged); + tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_LENGTH, lengthChanged); + tableEditBean.addPropertyChangeListener(SamplePartLogbookDto.PROPERTY_WEIGHT, weightChanged); + onLengthChanged(tableEditBean.getLength()); + onWeightChanged(tableEditBean.getWeight()); } - private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { - Optional<SizeMeasureTypeReference> result = Optional.empty(); - if (species != null) { + @Override + public SamplePartLogbookUIModel getModel() { + return ui.getModel(); + } - String sizeMeasureId = species.getSizeMeasureTypeId(); - result = ui.getSizeMeasureType().getData().stream() - .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); - } - return result; + public void resetDefaultSizeMeasureType() { + ui.getSizeMeasureType().setSelectedItem(null); + ui.getSizeMeasureType().setSelectedItem(ui.getModel().getDefaultSizeMeasureType()); } - /** - * Le mode de saisie a été mis à jour. - * - * @param newMode le nouveau de mode de saisie à utiliser - * @since 3.0 - */ void updateAcquisitionMode(AcquisitionMode newMode) { log.debug(prefix + String.format("Change acquisition mode to %s", newMode)); if (newMode == null) { @@ -244,7 +247,7 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl // on supprime le weight (si il a été saisie) editBean.setWeight(null); editBean.setWeightMeasureType(null); - // on supprime aussi l'count (pour forcer la saisie) + // on supprime aussi le count (pour forcer la saisie) editBean.setCount(null); } break; @@ -260,7 +263,7 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl if (createMode) { - // on positionne l'count à 1 (seule valeur possible) + // on positionne le count à 1 (seule valeur possible) editBean.setCount(1); } break; @@ -273,14 +276,44 @@ public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandl } } + private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { + Optional<SizeMeasureTypeReference> result = Optional.empty(); + if (species != null) { + + String sizeMeasureId = species.getSizeMeasureTypeId(); + result = ui.getSizeMeasureType().getData().stream() + .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); + } + return result; + } + private void onSpeciesChanged(SpeciesReference species) { Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); ui.getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); } - public void resetDefaultSizeMeasureType() { - ui.getSizeMeasureType().setSelectedItem(null); - ui.getSizeMeasureType().setSelectedItem(ui.getModel().getDefaultSizeMeasureType()); + private void onLengthChanged(Float newValue) { + SamplePartLogbookUIModel model = getModel(); + SamplePartLogbookDto tableEditBean = model.getTableEditBean(); + if (newValue == null) { + tableEditBean.setLengthMeasureMethod(null); + } else { + if (tableEditBean.getLengthMeasureMethod() == null) { + tableEditBean.setLengthMeasureMethod(model.getDefaultLengthMeasureMethod()); + } + } + } + + private void onWeightChanged(Float newValue) { + SamplePartLogbookUIModel model = getModel(); + SamplePartLogbookDto tableEditBean = model.getTableEditBean(); + if (newValue == null) { + tableEditBean.setWeightMeasureMethod(null); + } else { + if (tableEditBean.getWeightMeasureMethod() == null) { + tableEditBean.setWeightMeasureMethod(model.getDefaultWeightMeasureMethod()); + } + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -30,7 +30,10 @@ import fr.ird.observe.client.validation.ClientValidationContext; import fr.ird.observe.dto.data.longline.SampleLogbookDto; import fr.ird.observe.dto.data.longline.SamplePartLogbookDto; import fr.ird.observe.dto.data.longline.SamplePartLogbookHelper; +import fr.ird.observe.dto.referential.LengthMeasureMethodReference; +import fr.ird.observe.dto.referential.SexReference; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; +import fr.ird.observe.dto.referential.WeightMeasureMethodReference; import fr.ird.observe.navigation.model.select.ObserveSelectNode; import java.util.Arrays; @@ -46,9 +49,19 @@ import java.util.List; */ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookDto, SamplePartLogbookDto> { - public static final String PROPERTY_DEFAULT_SIZE_MEASURE_TYPE = "defaultSizeMeasureType"; + private static final String PROPERTY_DEFAULT_SIZE_MEASURE_TYPE = "defaultSizeMeasureType"; + //FIXME-PROTECTED-ID + private static final String SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID = "fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#01"; + //FIXME-PROTECTED-ID + private static final String SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#02"; + //FIXME-PROTECTED-ID + private static final String SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID = "fr.ird.observe.entities.referentiel.Sex#1239832686122#0.5"; private static final long serialVersionUID = 1L; + private SizeMeasureTypeReference defaultSizeMeasureType; + private SexReference defaultSex; + private LengthMeasureMethodReference defaultLengthMeasureMethod; + private WeightMeasureMethodReference defaultWeightMeasureMethod; public SamplePartLogbookUIModel(SamplePartLogbookUI ui, ObserveSelectNode<?> selectNode) { super(SampleLogbookDto.class, @@ -83,6 +96,33 @@ public class SamplePartLogbookUIModel extends ContentTableUIModel<SampleLogbookD setAddMessageOnOpen(false); } + @Override + public void initModel(ContentTableUI<SampleLogbookDto, SamplePartLogbookDto, ?> ui, List<ContentTableMeta<SamplePartLogbookDto>> contentTableMetas) { + super.initModel(ui, contentTableMetas); + defaultSex = ui.getDataSource().getReferentialReferenceSet(SexReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_SEX_ID).orElseThrow(IllegalStateException::new); + defaultLengthMeasureMethod = ui.getDataSource().getReferentialReferenceSet(LengthMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_LENGTH_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + defaultWeightMeasureMethod = ui.getDataSource().getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(SAMPLE_PART_LOGBOOK_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + } + + @Override + public SamplePartLogbookDto newTableEditBean() { + SamplePartLogbookDto result = super.newTableEditBean(); + result.setSex(getDefaultSex()); + return result; + } + + public LengthMeasureMethodReference getDefaultLengthMeasureMethod() { + return defaultLengthMeasureMethod; + } + + public WeightMeasureMethodReference getDefaultWeightMeasureMethod() { + return defaultWeightMeasureMethod; + } + + public SexReference getDefaultSex() { + return defaultSex; + } + @Override protected ObserveSelectNode<?> computeSelectNode() { return super.computeSelectNode(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java ===================================== @@ -25,7 +25,7 @@ package fr.ird.observe.client.ui.util; import fr.ird.observe.client.ui.admin.validate.ValidationMessageTableModel; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.util; */ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer; ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.dto.decoration; */ import com.google.auto.service.AutoService; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerProvider; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerProvider; /** * Created on 03/09/16. ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -28,7 +28,7 @@ import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.referential.I18nReferentialDto; import fr.ird.observe.dto.referential.ReferentialDto; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerSupport; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport; import java.util.Map; ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -19,27 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- + INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0,'2018-11-12','2018-11-12 17:27:06.06232','',null,'FOB',null,1,false,null,null,false,false,'FOB','FOB','FOB',null,null,null,null,null,true,true,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0,'2018-11-12','2018-11-12 17:27:06.06232','1',null,'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1,false,null,null,false,false,'FAD','FAD','FAD',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1,'2018-11-12','2018-11-12 17:27:06.06232','1-1',null,'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null,null,null,null,null,true,false,null); ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.3</version> + <version>2018.8.8</version> </parent> <groupId>fr.ird.observe</groupId> @@ -150,13 +150,13 @@ <devMode>true</devMode>  - <observe.model.version>7.4</observe.model.version> + <observe.model.version>7.0</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.8-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.9-SNAPSHOT</observeToolkitVersion>    @@ -373,19 +373,20 @@ <reporting> <plugins> -  -  -  -  -  -  -  -  -  -  -  -  -  + <plugin> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-maven-plugin</artifactId> + <version>${lib.version.java4all.config}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <report>aggregate-report</report> + </reports> + </reportSet> + </reportSets> + + </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/51843ff1314431ccd2aa109e3b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/51843ff1314431ccd2aa109e3b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update some libs
by Tony CHEMIT 18 Nov '18

18 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f249e6ae by tchemit at 2018-11-18T19:54:21Z update some libs - - - - - 7 changed files: - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - pom.xml Changes: ===================================== client-core/pom.xml ===================================== @@ -20,7 +20,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -769,7 +770,6 @@ <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> - </dependencies> </plugin> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java ===================================== @@ -25,7 +25,7 @@ package fr.ird.observe.client.ui.util; import fr.ird.observe.client.ui.admin.validate.ValidationMessageTableModel; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.util; */ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer; ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.dto.decoration; */ import com.google.auto.service.AutoService; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerProvider; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerProvider; /** * Created on 03/09/16. ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -28,7 +28,7 @@ import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.referential.I18nReferentialDto; import fr.ird.observe.dto.referential.ReferentialDto; -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerSupport; +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport; import java.util.Map; ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -19,27 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- + INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0,'2018-11-12','2018-11-12 17:27:06.06232','',null,'FOB',null,1,false,null,null,false,false,'FOB','FOB','FOB',null,null,null,null,null,true,true,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0,'2018-11-12','2018-11-12 17:27:06.06232','1',null,'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1,false,null,null,false,false,'FAD','FAD','FAD',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1,'2018-11-12','2018-11-12 17:27:06.06232','1-1',null,'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null,null,null,null,null,true,false,null); ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.4</version> + <version>2018.8.8</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.12</observeToolkitVersion> + <observeToolkitVersion>3.7.13</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  @@ -163,12 +163,12 @@   <lib.version.h2>1.4.196</lib.version.h2> -  -  +  +    -  +   <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -336,6 +336,21 @@ </configuration> </plugin> + <plugin> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-maven-plugin</artifactId> + <version>${lib.version.java4all.config}</version> + <dependencies> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${lib.version.java4all.jaxx}</version> + </dependency> + </dependencies> + + </plugin> + + </plugins> </pluginManagement> </build> @@ -374,19 +389,20 @@ <reporting> <plugins> -  -  -  -  -  -  -  -  -  -  -  -  -  + <plugin> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-maven-plugin</artifactId> + <version>${lib.version.java4all.config}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <report>aggregate-report</report> + </reports> + </reportSet> + </reportSets> + + </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f249e6aed50fa991277efbf4422… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f249e6aed50fa991277efbf4422… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 4 commits: Traductions espagnoles - IEO work of the day \o/
by Tony CHEMIT 16 Nov '18

16 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a591a8b2 by tchemit at 2018-11-14T16:03:19Z Traductions espagnoles - IEO work of the day \o/ - - - - - f20f5468 by tchemit at 2018-11-16T12:32:13Z Traductions espagnoles - IEO work of the day \o/ - - - - - 840fa8fc by tchemit at 2018-11-16T15:27:24Z Traductions espagnoles - IEO work of the day \o/ - - - - - 97781ea7 by tchemit at 2018-11-16T15:36:03Z Traductions espagnoles - Closes #1165 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -72,7 +72,7 @@ public class TranslateAction extends MenuActionSupport { projectUI.addWindowListener(new WindowAdapter() { @Override public void windowClosed(WindowEvent e) { - if (model.getLastExport() != null) { + if (model.getLastExportDate() != null) { log.info("Found existing i18n export, will reload i18n"); UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); ObserveUICallback.application.run(); ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== The diff for this file was not included because it is too large. ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.3</version> + <version>2018.8.4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.11</observeToolkitVersion> + <observeToolkitVersion>3.7.12</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/32ce9affe75a56f8586d7e31d9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/32ce9affe75a56f8586d7e31d9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Mise à jour des objectmaterial - Closes #1170 (update tests)
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d7d86d37 by tchemit at 2018-11-14T14:02:00Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - 51843ff1 by tchemit at 2018-11-14T17:17:35Z [LL] Marée : Petits ajustements - See #1124 - - - - - 25 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/models/Observe-07-data-longline.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/data/longline/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - test/src/main/resources/db/7.4/dataForTestLongline.sql.gz - test/src/main/resources/db/7.4/dataForTestSeine.sql.gz - test/src/main/resources/db/7.4/empty_h2.sql.gz - test/src/main/resources/db/7.4/empty_pg.sql.gz - test/src/main/resources/db/7.4/referentiel.sql.gz - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-warning-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -803,6 +803,7 @@ observe.common.TripLonglineDto.logbookSuspiciousData observe.common.TripLonglineDto.logbookTab observe.common.TripLonglineDto.mapTab observe.common.TripLonglineDto.noOfCrewMembers +observe.common.TripLonglineDto.noOfDays observe.common.TripLonglineDto.observationMethod observe.common.TripLonglineDto.observationsAvailability observe.common.TripLonglineDto.observationsComment ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx ===================================== @@ -154,6 +154,16 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt </cell> </row> +  + <row> + <cell anchor='west'> + <JLabel id='noOfDaysLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JLabel id='noOfDays' styleClass="skipI18n"/> + </cell> + </row> +  <row> <cell anchor='west'> @@ -200,7 +210,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt <JLabel id='totalFishingOperationsNumberLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <NumberEditor id='totalFishingOperationsNumber' constructorParams='this' styleClass="int6"/> + <JLabel id='totalFishingOperationsNumber' styleClass="skipI18n"/> </cell> </row> @@ -318,12 +328,6 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt </cell> </row> -  - <row> - <cell columns='2' fill='both'> - <JCheckBox id='logbookSuspiciousData' styleClass="i18n"/> - </cell> - </row>  <row> <cell columns='2' fill='both' weighty="1"> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -79,9 +79,13 @@ BigTextEditor { selectedItem:{bean.getLandingHarbour()}; } +#totalFishingOperationsNumberLabel { + font-style:italic; +} + #totalFishingOperationsNumber { - bean:{bean}; - numberValue:{bean.getTotalFishingOperationsNumber()}; + font-weight:bold; + text:{bean.getTotalFishingOperationsNumber()+""}; } #noOfCrewMembers { @@ -114,6 +118,16 @@ BigTextEditor { _propertyName: {TripLonglineDto.PROPERTY_START_DATE}; } + +#noOfDaysLabel { + font-style:italic; +} + +#noOfDays { + font-weight:bold; + text:{bean.getNoOfDays()+""}; +} + #endDate { date:{bean.getEndDate()}; _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; @@ -201,3 +215,11 @@ BigTextEditor { #logbookComment { property:{TripLonglineDto.PROPERTY_LOGBOOK_COMMENT}; } + +/* ***************************************************************************** */ +/* MAP TAB ******************************************************************** */ +/* ***************************************************************************** */ + +#mapTab { + enabled:{!model.isCreatingMode()}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.data.longline; * #L% */ +import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUIModel; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; @@ -59,4 +60,18 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, log.debug(getPrefix() + "date fin " + date); } } + + @Override + public void init(ContentUI ui) { + super.init(ui); + + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_START_DATE, e->{ + TripLonglineDto bean = (TripLonglineDto) e.getSource(); + bean.updateNoOfDays(); + }); + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_END_DATE, e->{ + TripLonglineDto bean = (TripLonglineDto) e.getSource(); + bean.updateNoOfDays(); + }); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -151,3 +151,11 @@ NumberEditor { #move { _observeAction:{MoveSingleTripSeineUIAction.ACTION_NAME}; } + +/* ***************************************************************************** */ +/* MAP TAB ******************************************************************** */ +/* ***************************************************************************** */ + +#mapTab { + enabled:{!model.isCreatingMode()}; +} ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java ===================================== @@ -35,4 +35,8 @@ public class TripLonglineDto extends GeneratedTripLonglineDto implements JavaBea public TripLonglineDtoJavaBeanDefinition javaBeanDefinition() { return JavaBeanDefinitionStore.definition(TripLonglineDtoJavaBeanDefinition.class); } + + public void updateNoOfDays() { + setNoOfDays(TripLonglineHelper.createNoOfDay(startDate,endDate)); + } } ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java ===================================== @@ -23,9 +23,11 @@ package fr.ird.observe.dto.data.longline; */ import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.concurrent.TimeUnit; public class TripLonglineHelper extends GeneratedTripLonglineHelper { @@ -37,4 +39,10 @@ public class TripLonglineHelper extends GeneratedTripLonglineHelper { return new ArrayList<>(map.values()); } + public static int createNoOfDay(Date startDate, Date endDate) { + if (startDate == null || endDate == null) { + return 0; + } + return (int) TimeUnit.MILLISECONDS.toDays(endDate.getTime() - startDate.getTime()); + } } ===================================== dto/src/main/models/Observe-07-data-longline.model ===================================== @@ -22,9 +22,9 @@ logbookComment + {*:1} String activityObsCount + {*:1} int activityLogbookCount + {*:1} int noOfCrewMembers + {*:1} Integer +noOfDays + {*:1} Integer observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -logbookSuspiciousData + {*:1} boolean tripType {*:1} fr.ird.observe.dto.referential.longline.TripTypeReference observationMethod {*:1} fr.ird.observe.dto.referential.longline.ObservationMethodReference observer {*:1} fr.ird.observe.dto.referential.PersonReference ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=No opened trip found, you observe.common.TripLonglineDto.message.not.open=Current trip is not opened, no edit possible. observe.common.TripLonglineDto.message.updating=Updating a trip observe.common.TripLonglineDto.noOfCrewMembers=Numer of crew +observe.common.TripLonglineDto.noOfDays=Duration (days) observe.common.TripLonglineDto.observationMethod=Observations method observe.common.TripLonglineDto.observationsAvailability=Observations observe.common.TripLonglineDto.observationsComment=Comment ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=Ninguna marea está abier observe.common.TripLonglineDto.message.not.open=La marea actual no está abierta, no se puede modificar. observe.common.TripLonglineDto.message.updating=La marea está en proceso de modificación. observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage +observe.common.TripLonglineDto.noOfDays=Duración (días) observe.common.TripLonglineDto.observationMethod=Observations method \#TODO observe.common.TripLonglineDto.observationsAvailability=Données d'observation observe.common.TripLonglineDto.observationsComment=Comentarios ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=Aucune marée ouverte, vo observe.common.TripLonglineDto.message.not.open=La marée courante n'est pas ouverte, aucune modification possible. observe.common.TripLonglineDto.message.updating=La marée est en cours de modification. observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage +observe.common.TripLonglineDto.noOfDays=Durée (jours) observe.common.TripLonglineDto.observationMethod=Méthode d'observations observe.common.TripLonglineDto.observationsAvailability=Données d'observation observe.common.TripLonglineDto.observationsComment=Commentaire ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java ===================================== @@ -45,7 +45,6 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); - entity.setTotalFishingOperationsNumber(dto.getTotalFishingOperationsNumber()); entity.setHomeId(dto.getHomeId()); entity.setErsId(dto.getErsId()); entity.setActivityObsCount(dto.getActivityObsCount()); @@ -70,7 +69,6 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip entity.setLogbookComment(dto.getLogbookComment()); entity.setSpecies(toEntitySet(dto.getSpecies())); entity.setLogbookAvailability(dto.isLogbookAvailability()); - entity.setLogbookSuspiciousData(dto.isLogbookSuspiciousData()); entity.setObservationsAvailability(dto.isObservationsAvailability()); } @@ -82,11 +80,11 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setTotalFishingOperationsNumber(entity.getTotalFishingOperationsNumber()); + dto.setNoOfDays(entity.getNoOfDays()); dto.setNoOfCrewMembers(entity.getNoOfCrewMembers()); dto.setHomeId(entity.getHomeId()); dto.setErsId(entity.getErsId()); dto.setLogbookAvailability(entity.isLogbookAvailability()); - dto.setLogbookSuspiciousData(entity.isLogbookSuspiciousData()); dto.setObservationsAvailability(entity.isObservationsAvailability()); dto.setActivityObsCount(entity.getActivityObsCount()); dto.setActivityLogbookCount(entity.getActivityLogbookCount()); ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java ===================================== @@ -10,18 +10,21 @@ package fr.ird.observe.entities.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ +import fr.ird.observe.dto.data.longline.TripLonglineHelper; +import fr.ird.observe.dto.referential.longline.VesselActivityLonglineHelper; + /** * Created on 8/27/14. * @@ -33,8 +36,9 @@ public class TripLonglineImpl extends TripLonglineAbstract { private static final long serialVersionUID = 1L; private Integer activityObsCount; - private Integer activityLogbookCount; + private Integer totalFishingOperationsNumber; + private Integer noOfDay; @Override public boolean isHistoricalData() { @@ -45,9 +49,29 @@ public class TripLonglineImpl extends TripLonglineAbstract { public void setHistoricalData(boolean historicalData) { } + @Override + public int getNoOfDays() { + return noOfDay == null ? noOfDay = TripLonglineHelper.createNoOfDay(startDate, endDate) : noOfDay; + } + + @Override + public void setNoOfDays(int noOfDay) { + this.noOfDay = noOfDay; + } + + @Override + public Integer getTotalFishingOperationsNumber() { + return totalFishingOperationsNumber == null ? totalFishingOperationsNumber = computeTotalFishingOperationsNumber() : totalFishingOperationsNumber; + } + + @Override + public void setTotalFishingOperationsNumber(Integer totalFishingOperationsNumber) { + this.totalFishingOperationsNumber = totalFishingOperationsNumber; + } + @Override public int getActivityObsCount() { - return activityObsCount == null ? sizeActivityLonglineObs() : activityObsCount; + return activityObsCount == null ? activityObsCount = sizeActivityLonglineObs() : activityObsCount; } @Override @@ -57,11 +81,22 @@ public class TripLonglineImpl extends TripLonglineAbstract { @Override public int getActivityLogbookCount() { - return activityLogbookCount == null ? sizeActivityLonglineLogbook() : activityLogbookCount; + return activityLogbookCount == null ? activityLogbookCount = sizeActivityLonglineLogbook() : activityLogbookCount; } @Override public void setActivityLogbookCount(int activityCount) { this.activityLogbookCount = activityCount; } + + private int computeTotalFishingOperationsNumber() { + int result = 0; + if (isActivityLonglineLogbookNotEmpty()) { + result += activityLonglineLogbook.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count(); + } + if (isActivityLonglineObsNotEmpty()) { + result += activityLonglineObs.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count(); + } + return result; + } } ===================================== persistence/src/main/models/Observe-07-data-longline.model ===================================== @@ -14,7 +14,6 @@ gearCaracteristic {*:1} referentiel.GearCaracteristic | notNull longline.TripLongline > ObserveDataEntity >> Trip | entity dbName=Trip startDate + {*:1} Date endDate + {*:1} Date -totalFishingOperationsNumber + {*:1} Integer noOfCrewMembers + {*:1} Integer ersId + {*:1} String homeId + {*:1} String @@ -39,7 +38,6 @@ logbookComment + {*:1} String | hibernateAttributeType=text species {*:*} referentiel.Species | manyToManyTableName=species_trip reverseDbName=trip observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -logbookSuspiciousData + {*:1} boolean gearUseFeaturesLongline + {*} longline.GearUseFeaturesLongline | unique orderBy=topiaCreateDate reverseDbName=trip landing + {*} longline.LandingLogbook | unique orderBy=startDate reverseDbName=trip sample + {*} longline.SampleLogbook | unique orderBy=timeStamp reverseDbName=trip @@ -47,3 +45,7 @@ getActivityObsCount() int setActivityObsCount(activityObsCount int) getActivityLogbookCount() int setActivityLogbookCount(activityObsCount int) +getNoOfDays() int +setNoOfDays(noOfDays int) +getTotalFishingOperationsNumber() Integer +setTotalFishingOperationsNumber(totalFishingOperationsNumber Integer) ===================================== persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql ===================================== @@ -19,6 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber; ALTER TABLE observe_longline.trip ALTER COLUMN tripType RENAME TO observationMethod; ALTER TABLE observe_longline.trip ALTER COLUMN comment RENAME TO observationsComment; ALTER TABLE observe_longline.trip ALTER COLUMN dataQuality RENAME TO observationsDataQuality; @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT; ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE; -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE; ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationsDataQuality FOREIGN KEY (observationsDataQuality) REFERENCES observe_common.DataQuality(topiaid); ===================================== persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql ===================================== @@ -19,6 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber CASCADE; ALTER TABLE observe_longline.trip RENAME COLUMN tripType TO observationMethod; ALTER TABLE observe_longline.trip RENAME COLUMN comment TO observationsComment; ALTER TABLE observe_longline.trip RENAME COLUMN dataQuality TO observationsDataQuality; @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT; ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE; -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE; ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationsDataQuality FOREIGN KEY (observationsDataQuality) REFERENCES observe_common.DataQuality(topiaid); ===================================== test/src/main/resources/db/7.4/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/empty_h2.sql.gz ===================================== @@ -93,7 +93,7 @@ create table OBSERVE_LONGLINE.species_trip (trip varchar(255), species varchar(2 create table OBSERVE_LONGLINE.stomacFullness (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_LONGLINE.tdrObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, homeId varchar(255), floatline1Length numeric, floatline2Length numeric, serialNo varchar(255), data blob, dataFilename varchar(255), dataLocation varchar(255), deployementStart timestamp, deployementEnd timestamp, fishingStart timestamp, fishingEnd timestamp, fishingStartDepth float, fishingEndDepth float, meanDeployementDepth float, medianDeployementDepth float, minFishingDepth float, maxFishingDepth float, meanFishingDepth float, medianFishingDepth float, branchline varchar(255), sensorBrand varchar(255), section varchar(255), basket varchar(255), itemHorizontalPosition varchar(255), itemVerticalPosition varchar(255), set varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.tdrRecordObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, timeStamp timestamp, temperature numeric, depth numeric, basket varchar(255), tdr varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, totalFishingOperationsNumber integer, noOfCrewMembers integer, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment varchar(2147483647), observationsComment varchar(2147483647), logbookComment varchar(2147483647), observationsAvailability boolean, logbookAvailability boolean, logbookSuspiciousData boolean, primary key (topiaId)); +create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, noOfCrewMembers integer, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment varchar(2147483647), observationsComment varchar(2147483647), logbookComment varchar(2147483647), observationsAvailability boolean, logbookAvailability boolean, primary key (topiaId)); create table OBSERVE_LONGLINE.tripType (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_LONGLINE.VesselActivity (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_LONGLINE.WeightCategory (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)); ===================================== test/src/main/resources/db/7.4/empty_pg.sql.gz ===================================== @@ -93,7 +93,7 @@ create table OBSERVE_LONGLINE.species_trip (trip varchar(255), species varchar(2 create table OBSERVE_LONGLINE.stomacFullness (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_LONGLINE.tdrObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, homeId varchar(255), floatline1Length numeric, floatline2Length numeric, serialNo varchar(255), data oid, dataFilename varchar(255), dataLocation varchar(255), deployementStart timestamp, deployementEnd timestamp, fishingStart timestamp, fishingEnd timestamp, fishingStartDepth float4, fishingEndDepth float4, meanDeployementDepth float4, medianDeployementDepth float4, minFishingDepth float4, maxFishingDepth float4, meanFishingDepth float4, medianFishingDepth float4, branchline varchar(255), sensorBrand varchar(255), section varchar(255), basket varchar(255), itemHorizontalPosition varchar(255), itemVerticalPosition varchar(255), set varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.tdrRecordObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, timeStamp timestamp, temperature numeric, depth numeric, basket varchar(255), tdr varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, totalFishingOperationsNumber int4, noOfCrewMembers int4, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment text, observationsComment text, logbookComment text, observationsAvailability boolean, logbookAvailability boolean, logbookSuspiciousData boolean, primary key (topiaId)); +create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, noOfCrewMembers int4, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment text, observationsComment text, logbookComment text, observationsAvailability boolean, logbookAvailability boolean, primary key (topiaId)); create table OBSERVE_LONGLINE.tripType (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_LONGLINE.VesselActivity (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_LONGLINE.WeightCategory (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)); ===================================== test/src/main/resources/db/7.4/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-error-validation.xml ===================================== @@ -30,6 +30,7 @@ </field> <field name="observer"> <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> @@ -66,4 +67,11 @@ <message>observe.validation.trip.endDate.after.startDate</message> </field-validator> </field> + + <field name="logbookDataEntryOperator"> + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!logbookAvailability</param> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-warning-validation.xml ===================================== @@ -35,6 +35,7 @@ </field> <field name="observationsDataEntryOperator"> <field-validator type="notFilled" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-error-validation.xml ===================================== @@ -32,6 +32,7 @@ </field> <field name="observer"> <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> @@ -103,4 +104,10 @@  + <field name="logbookDataEntryOperator"> + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!logbookAvailability</param> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-warning-validation.xml ===================================== @@ -45,6 +45,7 @@ </field> <field name="observationsDataEntryOperator"> <field-validator type="notFilled" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7df49f731770fab8ad491474c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7df49f731770fab8ad491474c4… You're receiving this email because of your account on gitlab.com.

1 0