May 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Label manquant sur cette popup - Closes #2696
by Tony CHEMIT (＠tchemit) May 19, 2023

May 19, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2423195a by Tony Chemit at 2023-05-19T15:46:34+02:00 Label manquant sur cette popup - Closes #2696 - - - - - 2 changed files: - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties Changes: ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -259,7 +259,7 @@ observe.data.ps.common.Trip.timeAtSeaFishingTime=Time at sea / fishing observe.data.ps.logbook.Activity.create.title=Create new activity observe.data.ps.logbook.WellPlan.create.activity.tip=Add missing logbook activity observe.data.ps.observation.Catch.message.will.delete.sub.data=If you confirm save, some data could be deleted\!Following species won't be to use in samples nor in releasesAll samples or releases of those species will be deleted. -observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species (%s) will also be deleted. +observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species will also be deleted. observe.error.storage.backup.local.db=Could not backup local data source observe.error.storage.close.current.db=Could not close data source observe.error.storage.close.local.db=Could not close local data source ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -259,7 +259,7 @@ observe.data.ps.common.Trip.timeAtSeaFishingTime=Time at sea / fishing observe.data.ps.logbook.Activity.create.title=Create new activity observe.data.ps.logbook.WellPlan.create.activity.tip=Add missing logbook activity observe.data.ps.observation.Catch.message.will.delete.sub.data=¡Confirmar la eliminación de los objetos de la copia de seguridad.\!Las especies siguientes no estarán disponibles en los muestreos/Como consecuencia se suprimirán los muestreos siguientes -observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species (%s) will also be deleted. \#TODO +observe.data.ps.observation.Catch.message.will.delete.sub.data.for.species=\nIf you delete this catch, the species (%s) will not be available for samples or non target catch released.\nSamples and non target catch released using this species will also be deleted. \#TODO observe.error.storage.backup.local.db=Could not backup local data source \#TODO observe.error.storage.close.current.db=Could not close data source \#TODO observe.error.storage.close.local.db=Could not close local data source \#TODO View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2423195aeb168d8df2ee10e68… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2423195aeb168d8df2ee10e68… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Tant que la fonction corbeille de l'UI de synchro avancée de référentiel n'est...
by Tony CHEMIT (＠tchemit) May 19, 2023

May 19, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2b99d825 by Tony Chemit at 2023-05-19T15:39:01+02:00 Tant que la fonction corbeille de l'UI de synchro avancée de référentiel n'est pas 100% fiable, masquer les corbeilles - Closes #2693 - - - - - 2dcc11ad by Tony Chemit at 2023-05-19T15:39:01+02:00 Mapping du code 'avarie' dans l'importeur AVDTH non optimum - Closes #2699 - - - - - 02c550ed by Tony Chemit at 2023-05-19T15:39:01+02:00 Templates Validation - Do not generate notBlankString and stringMaxLength validations if attributes are marked to be skip copy to entity - - - - - b5d2fcc2 by Tony Chemit at 2023-05-19T15:39:01+02:00 Ne pas recopier le commentaire de la calée sur certains formulaires qui ne permettent pas son édition) - See #2692 - - - - - 63a92659 by Tony Chemit at 2023-05-19T15:39:01+02:00 Modification message de validation - See #2692 - - - - - 52f007ba by Tony Chemit at 2023-05-19T15:39:01+02:00 Mise à jour de la validation - Closes #2692 - - - - - 24 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-update-error-validation.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetNonTargetCatchReleaseSpi.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/attribute/skipCopyToEntity.properties - src/site/markdown/avdth/referential.md - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ToolkitTagValues.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java ===================================== @@ -26,16 +26,11 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.Refer import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroUIHandler; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeMode; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterCopy; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDeactivate; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDeactivateWithReplacement; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDelete; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterRevert; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.SelectUnselect; +import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.*; import fr.ird.observe.client.util.init.DefaultUIInitializer; import org.nuiton.jaxx.runtime.spi.UIHandler; -import java.awt.BorderLayout; +import java.awt.*; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -63,6 +58,10 @@ public class ReferentialSelectionTreePaneHandler implements UIHandler<Referentia ui.remove(ui.getMiddleActions()); ui.add(ui.getMiddleActions(), BorderLayout.WEST); } + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2693 + // Do not allow to delete (need to review delete actions, since it may cause error in some case if for example + // an update is asked using the deleted data...) + ui.getMiddleActions().remove(ui.delete); } private void onUpdateMode(ReferentialSelectionTreePane ui, ReferentialSynchronizeMode synchronizeMode) { ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -3021,34 +3021,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.logbook.SetDto", "scope": "ERROR", @@ -6129,34 +6101,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto", "scope": "ERROR", @@ -6174,13 +6118,6 @@ "branchlinesPerBasketCount is a positive number" ] }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - }, { "name": "homeId", "comments": [ @@ -6212,13 +6149,6 @@ "branchlinesPerBasketCount is a positive number" ] }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - }, { "name": "homeId", "comments": [ @@ -7061,34 +6991,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.observation.SizeMeasureDto", "scope": "ERROR", @@ -14560,13 +14462,6 @@ "comments": [ "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource" ] - }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] } ] }, @@ -14580,13 +14475,6 @@ "comments": [ "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource" ] - }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] } ] }, @@ -14902,34 +14790,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto", "scope": "ERROR", ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-create-error-validation.xml ===================================== @@ -38,19 +38,6 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - <field name="homeId">  <field-validator type="notBlankString" short-circuit="true"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-update-error-validation.xml ===================================== @@ -38,19 +38,6 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - <field name="homeId">  <field-validator type="notBlankString" short-circuit="true"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml ===================================== @@ -31,17 +31,4 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml ===================================== @@ -31,17 +31,4 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -70,7 +70,8 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi .put("32", "13") .put("33", "13") .put("34", "13") - .put("7", "22") + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2699 + .put("7", "11") .put("8", "10") .put("9", "23") .put("10", "24") ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java ===================================== @@ -37,6 +37,8 @@ public class SetCatchSpi extends GeneratedSetCatchSpi { @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetCatchDto dto) { super.toDto(referentialLocale, entity, dto); + // Do not copy set.comment (there is no editor in form for this) + dto.setComment(null); // is there some sample? if (entity.isSampleNotEmpty()) { Sample targetSample = entity.getSample().iterator().next(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetNonTargetCatchReleaseSpi.java ===================================== @@ -39,6 +39,8 @@ public class SetNonTargetCatchReleaseSpi extends GeneratedSetNonTargetCatchRelea @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetNonTargetCatchReleaseDto dto) { super.toDto(referentialLocale, entity, dto); + // Do not copy set.comment (there is no editor in form for this) + dto.setComment(null); dto.setAvailableSpeciesIds(entity.getCatches().stream().map(Catch::getSpecies).filter(SetImpl::isSpeciesGroupRelease).map(Species::getTopiaId).collect(Collectors.toSet())); } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=Pursin observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=Start time (%2$s) must be before end time (%1$s). observe.data.ps.observation.SetCatch.catches=Catches -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. observe.data.ps.observation.SetCatch.type=Set catches observe.data.ps.observation.SetNonTargetCatchRelease.type=Set non target catch release observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=School estimate ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=La hor observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1$s). \#TODO observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=La hora de inicio (%2$s) debe ser superior o igual a la hora de observación de la actividad (%1$s). observe.data.ps.observation.SetCatch.catches=Captura -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. observe.data.ps.observation.SetCatch.type=SetCatch observe.data.ps.observation.SetNonTargetCatchRelease.type=SetNonTargetCatchRelease observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=Estimación del banco ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=L'heur observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=L'heure de début de virage (%2$s) doit être supérieure ou égal à celle de début (%1$s). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=L'heure de début (%2$s) doit être supérieure ou égal à l'heure d'observation de l'activité (%1$s). observe.data.ps.observation.SetCatch.catches=Captures -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Le tuple (espèce/devenir/raison rejet/méthode de mesure de poids/poids moyen/taille moyenne/cuve/origine de l'information) doit être unique, la donnée de rang %s est invalide. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Le tuple (espèce/devenir/raison rejet/méthode de mesure de poids/poids min/poids max/poids moyen/taille moyenne/cuve/origine de l'information) doit être unique, la donnée de rang %s est invalide. observe.data.ps.observation.SetCatch.type=Capture observe.data.ps.observation.SetNonTargetCatchRelease.type=Espèce accessoire sensible libérée observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=Estimation banc ===================================== model/src/main/models/Observe/dto/attribute/skipCopyToEntity.properties ===================================== @@ -66,4 +66,6 @@ data.ps.observation.ActivityStub.attribute.longitude=true data.ps.observation.ActivityStub.attribute.seaSurfaceTemperature=true data.ps.observation.ActivityStub.attribute.time=true data.ps.observation.Route.attribute.activity=true +data.ps.observation.SetCatch.attribute.comment=true +data.ps.observation.SetNonTargetCatchRelease.attribute.comment=true data.ps.observation.SetNonTargetCatchRelease.attribute.endPursingTimeStamp=true ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -223,7 +223,7 @@ Mapping type d'activité | 34 | 13 (2) | | 40 | 13 (2) | | 41 | 13 (2) | -| 7 | 22 | +| 7 | 11 | | 8 | 10 | | 9 | 23 | | 10 | 24 | ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ToolkitTagValues.java ===================================== @@ -30,8 +30,10 @@ import org.nuiton.eugene.models.extension.tagvalue.matcher.EqualsTagValueNameMat import org.nuiton.eugene.models.extension.tagvalue.provider.DefaultTagValueMetadatasProvider; import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; +import org.nuiton.eugene.models.tagvalue.ObjectModelTagValuesStore; import java.util.Arrays; import java.util.LinkedHashSet; @@ -139,6 +141,10 @@ public class ToolkitTagValues extends DefaultTagValueMetadatasProvider { return tagValue == null ? null : tagValue.trim(); } + public boolean isSkipCopyToEntity(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { + return store.findAttributeBooleanTagValue(Store.skipCopyToEntity, clazz, attribute); + } + public String notSkip(String tagValue) { return Objects.equals("skip", tagValue) ? null : tagValue; } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java ===================================== @@ -539,6 +539,12 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { attributes.addAll(beanClass.getAllOtherAttributes()); ObjectModelTagValuesStore tagValuesStore = model.getTagValuesStore(); + Set<String> skipCopyToEntity = new TreeSet<>(); + for (ObjectModelAttribute attribute : attributes) { + if (observeTagValues.isSkipCopyToEntity(tagValuesStore, beanClass, attribute)) { + skipCopyToEntity.add(attribute.getName()); + } + } if (WellIdAware.class.isAssignableFrom(dtoClazz)) { addErrorValidator("well", String.format(WELL_ID_AWARE_FIELD_TEMPLATE, dtoClazz.getPackageName().contains("ps") ? "ps" : "ll")); } else if (WellIdsAware.class.isAssignableFrom(dtoClazz)) { @@ -580,6 +586,9 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { Map<String, String> speciesLength = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getSpeciesLength(tagValuesStore, c, a)); Map<String, String> collectionUniqueKey = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getCollectionUniqueKey(tagValuesStore, c, a)); Map<String, Integer> stringMaxLength = getIntegerProperties(beanClass, attributes, (c, a) -> validationTagValues.getStringMaxLength(tagValuesStore, c, a)); + for (String attributeName : skipCopyToEntity) { + stringMaxLength.remove(attributeName); + } Map<String, String> dayBefore = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayBefore(tagValuesStore, c, a)); Map<String, String> dayAfter = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfter(tagValuesStore, c, a)); Map<String, String> dayAfterWarning = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfterWarning(tagValuesStore, c, a)); @@ -599,6 +608,9 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { notBlankString.remove("homeId"); } } + for (String attributeName : skipCopyToEntity) { + notBlankString.remove(attributeName); + } mandatory.removeAll(mandatoryString); mandatory.removeAll(mandatoryCollection); mandatoryString.removeAll(mandatoryCollection); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6d726165993d8cab729ca749… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6d726165993d8cab729ca749… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Tant que la fonction corbeille de l'UI de synchro avancée de référentiel n'est...
by Tony CHEMIT (＠tchemit) May 19, 2023

May 19, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d0e0460 by Tony Chemit at 2023-05-19T14:27:41+02:00 Tant que la fonction corbeille de l'UI de synchro avancée de référentiel n'est pas 100% fiable, masquer les corbeilles - Closes #2696 - - - - - 0f9fc2b9 by Tony Chemit at 2023-05-19T14:31:40+02:00 Mapping du code 'avarie' dans l'importeur AVDTH non optimum - Closes #2699 - - - - - 619e0d8f by Tony Chemit at 2023-05-19T15:36:50+02:00 Templates Validation - Do not generate notBlankString and stringMaxLength validations if attributes are marked to be skip copy to entity - - - - - 960fda20 by Tony Chemit at 2023-05-19T15:37:23+02:00 Ne pas recopier le commentaire de la calée sur certains formulaires qui ne permettent pas son édition) - See #2692 - - - - - 26285cf8 by Tony Chemit at 2023-05-19T15:37:38+02:00 Modification message de validation - See #2692 - - - - - 6d726165 by Tony Chemit at 2023-05-19T15:37:51+02:00 Mise à jour de la validation - Closes #2692 - - - - - 24 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-create-error-validation.xml - − core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-update-error-validation.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetNonTargetCatchReleaseSpi.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/attribute/skipCopyToEntity.properties - src/site/markdown/avdth/referential.md - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ToolkitTagValues.java - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java ===================================== @@ -26,16 +26,11 @@ import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.Refer import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchroUIHandler; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeMode; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterCopy; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDeactivate; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDeactivateWithReplacement; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterDelete; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.RegisterRevert; -import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.SelectUnselect; +import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.tree.actions.*; import fr.ird.observe.client.util.init.DefaultUIInitializer; import org.nuiton.jaxx.runtime.spi.UIHandler; -import java.awt.BorderLayout; +import java.awt.*; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -63,6 +58,10 @@ public class ReferentialSelectionTreePaneHandler implements UIHandler<Referentia ui.remove(ui.getMiddleActions()); ui.add(ui.getMiddleActions(), BorderLayout.WEST); } + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2693 + // Do not allow to delete (need to review delete actions, since it may cause error in some case if for example + // an update is asked using the deleted data...) + ui.getMiddleActions().remove(ui.delete); } private void onUpdateMode(ReferentialSelectionTreePane ui, ReferentialSynchronizeMode synchronizeMode) { ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -3021,34 +3021,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.logbook.SetCatchDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.logbook.SetDto", "scope": "ERROR", @@ -6129,34 +6101,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetCatchDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto", "scope": "ERROR", @@ -6174,13 +6118,6 @@ "branchlinesPerBasketCount is a positive number" ] }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - }, { "name": "homeId", "comments": [ @@ -6212,13 +6149,6 @@ "branchlinesPerBasketCount is a positive number" ] }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - }, { "name": "homeId", "comments": [ @@ -7061,34 +6991,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ll.observation.SetTdrDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ll.observation.SizeMeasureDto", "scope": "ERROR", @@ -14560,13 +14462,6 @@ "comments": [ "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource" ] - }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] } ] }, @@ -14580,13 +14475,6 @@ "comments": [ "check unique value on catches for tuple species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource" ] - }, - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] } ] }, @@ -14902,34 +14790,6 @@ } ] }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto", - "scope": "ERROR", - "context": "create", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, - { - "type": "fr.ird.observe.dto.data.ps.observation.SetNonTargetCatchReleaseDto", - "scope": "ERROR", - "context": "update", - "fields": [ - { - "name": "comment", - "comments": [ - "comment (if not null) is not a blank string", - "comment length <= 8192" - ] - } - ] - }, { "type": "fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto", "scope": "ERROR", ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetCatchDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetCatchDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-create-error-validation.xml ===================================== @@ -38,19 +38,6 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - <field name="homeId">  <field-validator type="notBlankString" short-circuit="true"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionDto-update-error-validation.xml ===================================== @@ -38,19 +38,6 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - <field name="homeId">  <field-validator type="notBlankString" short-circuit="true"> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetTdrDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-create-error-validation.xml ===================================== @@ -31,17 +31,4 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetCatchDto-update-error-validation.xml ===================================== @@ -31,17 +31,4 @@ </field-validator> </field> - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - </validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-create-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/SetNonTargetCatchReleaseDto-update-error-validation.xml deleted ===================================== @@ -1,40 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="comment"> -  - <field-validator type="notBlankString" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="stringMaxLength"> - <param name="maxLength">8192</param> - <message/> - </field-validator> - </field> - -</validators> ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -70,7 +70,8 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi .put("32", "13") .put("33", "13") .put("34", "13") - .put("7", "22") + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2699 + .put("7", "11") .put("8", "10") .put("9", "23") .put("10", "24") ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java ===================================== @@ -37,6 +37,8 @@ public class SetCatchSpi extends GeneratedSetCatchSpi { @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetCatchDto dto) { super.toDto(referentialLocale, entity, dto); + // Do not copy set.comment (there is no editor in form for this) + dto.setComment(null); // is there some sample? if (entity.isSampleNotEmpty()) { Sample targetSample = entity.getSample().iterator().next(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetNonTargetCatchReleaseSpi.java ===================================== @@ -39,6 +39,8 @@ public class SetNonTargetCatchReleaseSpi extends GeneratedSetNonTargetCatchRelea @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetNonTargetCatchReleaseDto dto) { super.toDto(referentialLocale, entity, dto); + // Do not copy set.comment (there is no editor in form for this) + dto.setComment(null); dto.setAvailableSpeciesIds(entity.getCatches().stream().map(Catch::getSpecies).filter(SetImpl::isSpeciesGroupRelease).map(Species::getTopiaId).collect(Collectors.toSet())); } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=Pursin observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=Start time (%2$s) must be before end time (%1$s). observe.data.ps.observation.SetCatch.catches=Catches -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. observe.data.ps.observation.SetCatch.type=Set catches observe.data.ps.observation.SetNonTargetCatchRelease.type=Set non target catch release observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=School estimate ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=La hor observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=Hauling start time (%2$s) must be after starting time (%1$s). \#TODO observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=La hora de inicio (%2$s) debe ser superior o igual a la hora de observación de la actividad (%1$s). observe.data.ps.observation.SetCatch.catches=Captura -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Tuple (species,speciesFate,reasonForDiscard,weightMeasureMethod,minWeight,maxWeight,meanWeight,meanLength,well,informationSource) must be unique, value at index %s is duplicated. observe.data.ps.observation.SetCatch.type=SetCatch observe.data.ps.observation.SetNonTargetCatchRelease.type=SetNonTargetCatchRelease observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=Estimación del banco ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1477,7 +1477,7 @@ observe.data.ps.observation.Set.validation.haulingEndTime.after.startTime=L'heur observe.data.ps.observation.Set.validation.haulingStartTimeStamp.after.startTime=L'heure de début de virage (%2$s) doit être supérieure ou égal à celle de début (%1$s). observe.data.ps.observation.Set.validation.startTime.after.currentPsObservationActivity.time=L'heure de début (%2$s) doit être supérieure ou égal à l'heure d'observation de l'activité (%1$s). observe.data.ps.observation.SetCatch.catches=Captures -observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Le tuple (espèce/devenir/raison rejet/méthode de mesure de poids/poids moyen/taille moyenne/cuve/origine de l'information) doit être unique, la donnée de rang %s est invalide. +observe.data.ps.observation.SetCatch.catches.validation.uniqueKey=Le tuple (espèce/devenir/raison rejet/méthode de mesure de poids/poids min/poids max/poids moyen/taille moyenne/cuve/origine de l'information) doit être unique, la donnée de rang %s est invalide. observe.data.ps.observation.SetCatch.type=Capture observe.data.ps.observation.SetNonTargetCatchRelease.type=Espèce accessoire sensible libérée observe.data.ps.observation.SetSchoolEstimate.schoolEstimate=Estimation banc ===================================== model/src/main/models/Observe/dto/attribute/skipCopyToEntity.properties ===================================== @@ -66,4 +66,6 @@ data.ps.observation.ActivityStub.attribute.longitude=true data.ps.observation.ActivityStub.attribute.seaSurfaceTemperature=true data.ps.observation.ActivityStub.attribute.time=true data.ps.observation.Route.attribute.activity=true +data.ps.observation.SetCatch.attribute.comment=true +data.ps.observation.SetNonTargetCatchRelease.attribute.comment=true data.ps.observation.SetNonTargetCatchRelease.attribute.endPursingTimeStamp=true ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -223,7 +223,7 @@ Mapping type d'activité | 34 | 13 (2) | | 40 | 13 (2) | | 41 | 13 (2) | -| 7 | 22 | +| 7 | 11 | | 8 | 10 | | 9 | 23 | | 10 | 24 | ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/ToolkitTagValues.java ===================================== @@ -30,8 +30,10 @@ import org.nuiton.eugene.models.extension.tagvalue.matcher.EqualsTagValueNameMat import org.nuiton.eugene.models.extension.tagvalue.provider.DefaultTagValueMetadatasProvider; import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; +import org.nuiton.eugene.models.tagvalue.ObjectModelTagValuesStore; import java.util.Arrays; import java.util.LinkedHashSet; @@ -139,6 +141,10 @@ public class ToolkitTagValues extends DefaultTagValueMetadatasProvider { return tagValue == null ? null : tagValue.trim(); } + public boolean isSkipCopyToEntity(ObjectModelTagValuesStore store, ObjectModelClass clazz, ObjectModelAttribute attribute) { + return store.findAttributeBooleanTagValue(Store.skipCopyToEntity, clazz, attribute); + } + public String notSkip(String tagValue) { return Objects.equals("skip", tagValue) ? null : tagValue; } ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/DtoFormValidatorTransformer.java ===================================== @@ -539,6 +539,12 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { attributes.addAll(beanClass.getAllOtherAttributes()); ObjectModelTagValuesStore tagValuesStore = model.getTagValuesStore(); + Set<String> skipCopyToEntity = new TreeSet<>(); + for (ObjectModelAttribute attribute : attributes) { + if (observeTagValues.isSkipCopyToEntity(tagValuesStore, beanClass, attribute)) { + skipCopyToEntity.add(attribute.getName()); + } + } if (WellIdAware.class.isAssignableFrom(dtoClazz)) { addErrorValidator("well", String.format(WELL_ID_AWARE_FIELD_TEMPLATE, dtoClazz.getPackageName().contains("ps") ? "ps" : "ll")); } else if (WellIdsAware.class.isAssignableFrom(dtoClazz)) { @@ -580,6 +586,9 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { Map<String, String> speciesLength = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getSpeciesLength(tagValuesStore, c, a)); Map<String, String> collectionUniqueKey = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getCollectionUniqueKey(tagValuesStore, c, a)); Map<String, Integer> stringMaxLength = getIntegerProperties(beanClass, attributes, (c, a) -> validationTagValues.getStringMaxLength(tagValuesStore, c, a)); + for (String attributeName : skipCopyToEntity) { + stringMaxLength.remove(attributeName); + } Map<String, String> dayBefore = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayBefore(tagValuesStore, c, a)); Map<String, String> dayAfter = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfter(tagValuesStore, c, a)); Map<String, String> dayAfterWarning = getStringProperties(beanClass, attributes, (c, a) -> validationTagValues.getDayAfterWarning(tagValuesStore, c, a)); @@ -599,6 +608,9 @@ public class DtoFormValidatorTransformer extends ObjectModelTransformerToJava { notBlankString.remove("homeId"); } } + for (String attributeName : skipCopyToEntity) { + notBlankString.remove(attributeName); + } mandatory.removeAll(mandatoryString); mandatory.removeAll(mandatoryCollection); mandatoryString.removeAll(mandatoryCollection); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50b70dcdecf400b1800933b4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50b70dcdecf400b1800933b4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: On aimerait voir cet espace supprimé - Closes #2694
by Tony CHEMIT (＠tchemit) May 19, 2023

May 19, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36317436 by Tony Chemit at 2023-05-19T12:40:24+02:00 On aimerait voir cet espace supprimé - Closes #2694 - - - - - 6fe294dd by Tony Chemit at 2023-05-19T12:53:28+02:00 update pom - - - - - 24113b74 by Tony Chemit at 2023-05-19T13:19:25+02:00 Erreur en consultation des utilisations d'un référentiel - Closes #2701 - - - - - 50b70dcd by Tony Chemit at 2023-05-19T13:19:25+02:00 Assistant traduction, le bouton Export (du fichier) ne fonctionne pas - Closes #2703 - - - - - 18 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/runner/pom.xml - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/CatchDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/CatchReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/TdrDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/TdrReferenceDecoratorDefinition.java - core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/logbook/CatchDecoratorDefinition.java - core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/observation/CatchDecoratorDefinition.java - core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/observation/TdrDecoratorDefinition.java - model/src/main/models/Observe/dto/class/decorator.properties - pom.xml - toolkit/api-decoration/src/main/i18n/getters/java.getter - toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_en_GB.properties - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_es_ES.properties - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_fr_FR.properties Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java ===================================== @@ -98,7 +98,7 @@ public abstract class ReferentialSynchroNodeSupport extends SynchroNodeSupport { String text = "<html><body>" + dto.toString(); text += " (" + dto.getTopiaVersion() + " - " + DATE_FORMAT.format(dto.getLastUpdateDate()) + ")"; if (!isLeaf()) { - text += "( " + getChildCount() + ")"; + text += "(" + getChildCount() + ")"; } return text; } ===================================== client/runner/pom.xml ===================================== @@ -109,6 +109,18 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>core-services-i18n</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>toolkit-api-i18n</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchDtoDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchDtoDecoratorDefinition extends DecoratorDefinition<Catch public final String decorateContext(Locale locale, ObserveDtoDecoratorRenderer<CatchDto> renderer, CatchDto source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/logbook/CatchReferenceDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchReferenceDecoratorDefinition extends DecoratorDefinition public final String decorateContext(Locale locale, ObserveDtoReferenceDecoratorRenderer<CatchReference> renderer, CatchReference source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/CatchDtoDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchDtoDecoratorDefinition extends DecoratorDefinition<Catch public final String decorateContext(Locale locale, ObserveDtoDecoratorRenderer<CatchDto> renderer, CatchDto source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/CatchReferenceDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchReferenceDecoratorDefinition extends DecoratorDefinition public final String decorateContext(Locale locale, ObserveDtoReferenceDecoratorRenderer<CatchReference> renderer, CatchReference source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/TdrDtoDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class TdrDtoDecoratorDefinition extends DecoratorDefinition<TdrDto, public final String decorateContext(Locale locale, ObserveDtoDecoratorRenderer<TdrDto> renderer, TdrDto source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ll/observation/TdrReferenceDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class TdrReferenceDecoratorDefinition extends DecoratorDefinition<T public final String decorateContext(Locale locale, ObserveDtoReferenceDecoratorRenderer<TdrReference> renderer, TdrReference source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/logbook/CatchDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchDecoratorDefinition extends DecoratorDefinition<Catch, O public final String decorateContext(Locale locale, ObserveEntityDecoratorRenderer<Catch> renderer, Catch source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/observation/CatchDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class CatchDecoratorDefinition extends DecoratorDefinition<Catch, O public final String decorateContext(Locale locale, ObserveEntityDecoratorRenderer<Catch> renderer, Catch source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== core/persistence/decoration/src/main/java/fr/ird/observe/entities/data/ll/observation/TdrDecoratorDefinition.java ===================================== @@ -42,7 +42,7 @@ public final class TdrDecoratorDefinition extends DecoratorDefinition<Tdr, Obser public final String decorateContext(Locale locale, ObserveEntityDecoratorRenderer<Tdr> renderer, Tdr source, int index) { switch (index) { case 0: - return renderer.onNullValue("homeId", locale, source.getHomeId()); + return renderer.onHomeId(locale, source.getHomeId()); default: throw new IllegalStateException("No index with value: " + index); } ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -29,7 +29,7 @@ data.ll.logbook.Activity=${startTimeStamp::timestamp}##${vesselActivity::label} data.ll.logbook.ActivitySample=${timeStamp::timestamp}##${coordinateStr} data.ll.logbook.BaitsComposition=${baitType::label}##${proportion} data.ll.logbook.BranchlinesComposition=${length}##${proportion} -data.ll.logbook.Catch=${homeId} +data.ll.logbook.Catch=${homeId::onHomeId} data.ll.logbook.FloatlinesComposition=${lineType::label}##${proportion} data.ll.logbook.HooksComposition=${hookType::label}##${proportion} data.ll.logbook.Sample=${timeStamp::timestamp}##${coordinateStr} @@ -40,7 +40,7 @@ data.ll.observation.BaitsComposition=${baitType::label}##${proportion} data.ll.observation.Basket=${settingIdentifier} ( $(observe.Common.settingIdentifier) )##${haulingIdentifier} ( $(observe.Common.haulingIdentifier) ) data.ll.observation.Branchline=${settingIdentifier} ( $(observe.Common.settingIdentifier) )##${haulingIdentifier} ( $(observe.Common.haulingIdentifier) ) data.ll.observation.BranchlinesComposition=${length}##${proportion} -data.ll.observation.Catch=${homeId} +data.ll.observation.Catch=${homeId::onHomeId} data.ll.observation.Encounter=${encounterType::label}##${species::speciesLabel} data.ll.observation.FloatlinesComposition=${lineType::label}##${proportion} data.ll.observation.HooksComposition=${hookType::label}##${proportion} @@ -49,7 +49,7 @@ data.ll.observation.SectionTemplate=${id}##${floatlineLengths} data.ll.observation.SensorUsed=${sensorType::label}$ data.ll.observation.Set=$(observe.data.ll.observation.Set.type) data.ll.observation.SizeMeasure=${sizeMeasureType::label}##${size} -data.ll.observation.Tdr=${homeId} +data.ll.observation.Tdr=${homeId::onHomeId} data.ll.observation.TripActivityStub=${timeStamp::timestamp} data.ll.observation.WeightMeasure=${weightMeasureType::label}##${weight} data.ll.pairing.ActivityPairingResultItem=${observationActivity}##$(observe.data.ll.pairing.ActivityPairingResultItem.computedDistance) ${computedDistance}##$(observe.data.ll.pairing.ActivityPairingResultItem.computedTime) ${computedTimeStr} ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.22</version> + <version>2023.23</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/api-decoration/src/main/i18n/getters/java.getter ===================================== @@ -1,6 +1,7 @@ observe.Common.dataGroupBy.count observe.Common.dataGroupBy.count.null observe.Common.no.date +observe.Common.no.homeId observe.Common.no.time observe.Common.no.unit observe.Common.nocode ===================================== toolkit/api-decoration/src/main/java/fr/ird/observe/decoration/DefaultDecoratorRenderer.java ===================================== @@ -63,6 +63,13 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return value; } + public String onHomeId(Locale locale, String value) { + if (value == null || value.isEmpty()) { + return I18n.l(locale, "observe.Common.no.homeId"); + } + return value; + } + @Override public String onNullValue(Locale locale, Object value) { if (value == null) return I18n.l(locale, "observe.Common.none"); ===================================== toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_en_GB.properties ===================================== @@ -41,6 +41,7 @@ observe.Common.navigation.config.moduleName=Business domain observe.Common.navigation.config.moduleName.description=Business domain to use observe.Common.no.coordinate=Unknown coordinate observe.Common.no.date=No date +observe.Common.no.homeId=No homeId observe.Common.no.time=No time observe.Common.no.unit=No unit observe.Common.no.value=No value ===================================== toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_es_ES.properties ===================================== @@ -41,6 +41,7 @@ observe.Common.navigation.config.moduleName=Module observe.Common.navigation.config.moduleName.description=Module to use observe.Common.no.coordinate=Unknown coordinate \#TODO observe.Common.no.date=No date +observe.Common.no.homeId=No homeId \#TODO observe.Common.no.time=No time observe.Common.no.unit=No unit \#TODO observe.Common.no.value=No value ===================================== toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_fr_FR.properties ===================================== @@ -41,6 +41,7 @@ observe.Common.navigation.config.moduleName=Domaine métier observe.Common.navigation.config.moduleName.description=Domaine métier à utiliser observe.Common.no.coordinate=Position inconnue observe.Common.no.date=Date non définie +observe.Common.no.homeId=Pas d'identifiant observe.Common.no.time=Heure non définie observe.Common.no.unit=Pas d'unité observe.Common.no.value=Valeur non définie View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe986ff594cfdb08e13441fa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe986ff594cfdb08e13441fa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.1.2)
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 2e40dcf5 by Tony Chemit at 2023-05-12T17:49:12+02:00 Site checkin for project ObServe (version 9.1.2) - - - - - 8 changed files: - + 9.1.2/CHANGELOG.html - + 9.1.2/architecture-logicielle.html - + 9.1.2/avdth/common.html - + 9.1.2/avdth/index.html - + 9.1.2/avdth/landing.html - + 9.1.2/avdth/local_market.html - + 9.1.2/avdth/logbook.html - + 9.1.2/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2e40dcf527aff345411604d75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2e40dcf527aff345411604d75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.1.2
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT deleted branch release/9.1.2 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.1.2
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT pushed new tag v9.1.2 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.1.2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.1.2] [jgitflow-maven-plugin]updating poms for branch'release/9.1.2' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT pushed to branch release/9.1.2 at ultreiaio / ird-observe Commits: 3eea6691 by Tony Chemit at 2023-05-12T16:49:39+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.2' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3eea66914c619d07cbf4d1814… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3eea66914c619d07cbf4d1814… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 12 commits: [jgitflow-maven-plugin]updating poms for 9.1.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 9393acf2 by Tony Chemit at 2023-05-10T17:48:30+02:00 [jgitflow-maven-plugin]updating poms for 9.1.2-SNAPSHOT development[skip ci] - - - - - 35cb79eb by Tony Chemit at 2023-05-10T18:15:27+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - cdbf9d69 by Tony Chemit at 2023-05-10T18:15:28+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - a1c12e64 by Tony Chemit at 2023-05-10T18:15:30+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 4eb7744b by Tony Chemit at 2023-05-11T13:18:54+02:00 En LL / logbook / Opération de pêche, les boutons de recopie des caractéristiques des opérations précédentes sont indisponibles - Closes #2688 - - - - - 98b5886d by Tony Chemit at 2023-05-11T13:19:22+02:00 Dans le calcul des nombres estimés (PS observation), appliquer un arrondi standard - Closes #2687 - - - - - 198a3882 by Tony Chemit at 2023-05-11T15:21:52+02:00 Fix gitlab CI docker password - - - - - 68d34317 by Tony Chemit at 2023-05-11T15:45:12+02:00 update pom - - - - - c6bfd4e0 by Tony Chemit at 2023-05-12T15:38:03+02:00 Dans la consolidation des poids pondérés des cuves-calées, il faut effectuer un filtre sur une liste d'espèces - Closes #2689 - - - - - 78e08c43 by Tony Chemit at 2023-05-12T16:41:46+02:00 Update changelog for v.9.1.2 [skip CI] - - - - - 3eea6691 by Tony Chemit at 2023-05-12T16:49:39+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.2' with non-snapshot versions[skip ci] - - - - - fd6027b0 by Tony Chemit at 2023-05-12T17:37:03+02:00 [jgitflow-maven-plugin]merging 'release/9.1.2' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateActions.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/CatchConsolidateActions.java - core/persistence/decoration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02aa0ccad7f0b07542b67fa4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02aa0ccad7f0b07542b67fa4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.1.2' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) May 12, 2023

May 12, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3eea6691 by Tony Chemit at 2023-05-12T16:49:39+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.2' with non-snapshot versions[skip ci] - - - - - fd6027b0 by Tony Chemit at 2023-05-12T17:37:03+02:00 [jgitflow-maven-plugin]merging 'release/9.1.2' into 'master' - - - - - 489cb287 by Tony Chemit at 2023-05-12T17:37:10+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 112d2b61 by Tony Chemit at 2023-05-12T17:37:11+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fe986ff5 by Tony Chemit at 2023-05-12T17:37:13+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/99249f23cda94b6ffe2b2f05… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/99249f23cda94b6ffe2b2f05… You're receiving this email because of your account on gitlab.com.

1 0