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

[Git][ultreiaio/ird-observe][develop] 3 commits: Labellisation du référentiel 'Type de données des propriétés/matériaux de FOB - Closes #2512
by Tony CHEMIT (＠tchemit) 10 Nov '22

10 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bd53d0df by Tony Chemit at 2022-11-10T10:55:52+01:00 Labellisation du référentiel 'Type de données des propriétés/matériaux de FOB - Closes #2512 - - - - - ed3a78af by Tony Chemit at 2022-11-10T10:55:52+01:00 Persistence migration - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - f97a3cf9 by Tony Chemit at 2022-11-10T10:57:44+01:00 GUI - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - 14 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.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 Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -114,11 +114,6 @@ enabled:false; } -.computedDataInformation { - icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; - disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; -} - .showReset { showReset:true; } ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -68,10 +68,6 @@ observe.data.WithDataFile.choose.title.importData observe.data.WithDataFile.delete.data.file.message observe.data.message.will.delete.sub.data.type observe.data.message.will.delete.sub.data.type2 -observe.data.ps.observation.Sample.length.computed.tip -observe.data.ps.observation.Sample.length.observed.tip -observe.data.ps.observation.Sample.weight.computed.tip -observe.data.ps.observation.Sample.weight.observed.tip observe.error.storage.backup.local.db observe.error.storage.close.current.db observe.error.storage.close.local.db @@ -281,7 +277,6 @@ observe.ui.message.db.none.loaded.tip observe.ui.message.delete observe.ui.message.delete.new observe.ui.message.loaded.tip -observe.ui.message.no.species.selected observe.ui.message.quit.invalid.edit observe.ui.message.quit.valid.edit observe.ui.message.show.referential.usages ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java ===================================== @@ -23,10 +23,10 @@ package fr.ird.observe.client.datasource.editor.api.content.data.sample; */ import com.google.common.collect.Maps; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -40,12 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_OBSERVED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_OBSERVED_TIP; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 08/01/2021. * @@ -75,14 +69,6 @@ public abstract class SampleContentTableUIModelStates<D extends DataDto, C exten public abstract AcquisitionMode getDefaultAcquisitionMode(); - public String getWeightDataTip(boolean computed) { - return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); - } - - public String getLengthDataTip(boolean computed) { - return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); - } - public SizeMeasureTypeReference getDefaultSizeMeasureType() { return defaultSizeMeasureType; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java ===================================== @@ -31,16 +31,10 @@ import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import javax.swing.JButton; import java.awt.event.ActionEvent; -import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; public class ResetSizeMeasureType> extends ContentTableUIActionSupport { - public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); - public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); - public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); - public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); - public static final String NO_SPECIES_SELECTED = n("observe.ui.message.no.species.selected"); private final FilterableComboBox<?> combo; public static > void install(U ui, JButton editor, FilterableComboBox<?> combo) { ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss ===================================== @@ -66,16 +66,6 @@ focusable:false; } -#lengthSourceInformation { - enabled: {tableEditBean.isIsLengthComputed()}; - toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; -} - -#weightSourceInformation { - enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; - toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; -} - #tagNumber { enabled:{tableEditBean.getAcquisitionMode() == 1}; } ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -29,6 +29,10 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Route.choice.create.fin.veille.activity observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue observe.data.ps.observation.Route.message.need.fin.veille.activity +observe.data.ps.observation.Sample.length.computed.tip +observe.data.ps.observation.Sample.length.observed.tip +observe.data.ps.observation.Sample.weight.computed.tip +observe.data.ps.observation.Sample.weight.observed.tip observe.data.ps.observation.Set.schoolType.not.fill observe.referential.Referential.type observe.ui.action.copyCoordinate ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -187,7 +187,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -0,0 +1,35 @@ +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +#lengthSourceInformation { + enabled: {tableEditBean.isIsLengthComputed()}; + toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; + disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; +} + +#weightSourceInformation { + enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; + toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsWeightComputed())}; + disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsWeightComputed())}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java ===================================== @@ -21,9 +21,9 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.observation; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetWeightMeasureType; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.common.SpeciesReference; @@ -251,7 +251,9 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { protected void onWeightChanged(Float newValue) { SampleMeasureDto tableEditBean = ui.getModel().getStates().getTableEditBean(); - tableEditBean.setIsWeightComputed(false); + if (tableEditBean.getAcquisitionMode() == 1) { + tableEditBean.setIsWeightComputed(false); + } if (newValue == null) { tableEditBean.setWeightMeasureMethod(null); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.data.sample.SampleContentTableUIModelStates; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -35,11 +36,25 @@ import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import javax.swing.Icon; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + @GenerateJavaBeanDefinition public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleDto, SampleMeasureDto> { + public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); + public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); + public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); + public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); + private final Icon computedIcon; + private final Icon observedIcon; + public SampleUIModelStates(GeneratedSampleUIModel model) { super(model, SampleDto.newDto(new java.util.Date()), SampleMeasureDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectedId(), model.getSource().getInitializer().getScope().isStandalone()); + this.computedIcon = UIHelper.getUIManagerActionIcon("data-calcule"); + this.observedIcon = UIHelper.getUIManagerActionIcon("data-observe"); } @Override @@ -65,4 +80,16 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD return beanToSave; } + public String getWeightDataTip(boolean computed) { + return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); + } + + public String getLengthDataTip(boolean computed) { + return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); + } + + public Icon getSourceInformationIcon(boolean computed) { + return computed ? computedIcon : observedIcon; + } + } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java ===================================== @@ -372,6 +372,10 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe this.sample_idx = resultSet.getInt(20); this.lengthMeasureMethod = resultSet.getString(21); this.weightMeasureMethod = resultSet.getString(22); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2503 + if (acquisitionMode == 0 && weight != null && !isWeightComputed) { + isWeightComputed = true; + } } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1677,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=Validation formula is not valid. observe.referential.ps.common.ObjectMaterial.validationInformation=Validation formula must contains variable x -observe.referential.ps.common.ObjectMaterialType.type=Floating objet material type +observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Object operation observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1677,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation \#TODO observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- \#TODO observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. \#TODO observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x \#TODO -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant \#TODO +observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB \#TODO observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Operación sobre el objeto observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1677,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Le code doit commencer par %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant +observe.referential.ps.common.ObjectMaterialType.type=Type de données des propriétés/matériaux de FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Sous-domaine observe.referential.ps.common.ObjectOperation.type=Opération sur l'objet observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d67d2179b9e61a36ecf3d757… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d67d2179b9e61a36ecf3d757… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Persistence migration - Sur échantillons PS observations saisis par lots,...
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 79d753ef by Tony Chemit at 2022-11-09T16:32:03+01:00 Persistence migration - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - f1d62d0f by Tony Chemit at 2022-11-09T16:32:16+01:00 GUI - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - 11 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -114,11 +114,6 @@ enabled:false; } -.computedDataInformation { - icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; - disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; -} - .showReset { showReset:true; } ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -68,10 +68,6 @@ observe.data.WithDataFile.choose.title.importData observe.data.WithDataFile.delete.data.file.message observe.data.message.will.delete.sub.data.type observe.data.message.will.delete.sub.data.type2 -observe.data.ps.observation.Sample.length.computed.tip -observe.data.ps.observation.Sample.length.observed.tip -observe.data.ps.observation.Sample.weight.computed.tip -observe.data.ps.observation.Sample.weight.observed.tip observe.error.storage.backup.local.db observe.error.storage.close.current.db observe.error.storage.close.local.db @@ -281,7 +277,6 @@ observe.ui.message.db.none.loaded.tip observe.ui.message.delete observe.ui.message.delete.new observe.ui.message.loaded.tip -observe.ui.message.no.species.selected observe.ui.message.quit.invalid.edit observe.ui.message.quit.valid.edit observe.ui.message.show.referential.usages ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java ===================================== @@ -23,10 +23,10 @@ package fr.ird.observe.client.datasource.editor.api.content.data.sample; */ import com.google.common.collect.Maps; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -40,12 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_OBSERVED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_OBSERVED_TIP; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 08/01/2021. * @@ -75,14 +69,6 @@ public abstract class SampleContentTableUIModelStates<D extends DataDto, C exten public abstract AcquisitionMode getDefaultAcquisitionMode(); - public String getWeightDataTip(boolean computed) { - return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); - } - - public String getLengthDataTip(boolean computed) { - return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); - } - public SizeMeasureTypeReference getDefaultSizeMeasureType() { return defaultSizeMeasureType; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java ===================================== @@ -31,16 +31,10 @@ import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import javax.swing.JButton; import java.awt.event.ActionEvent; -import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; public class ResetSizeMeasureType> extends ContentTableUIActionSupport { - public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); - public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); - public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); - public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); - public static final String NO_SPECIES_SELECTED = n("observe.ui.message.no.species.selected"); private final FilterableComboBox<?> combo; public static > void install(U ui, JButton editor, FilterableComboBox<?> combo) { ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss ===================================== @@ -66,16 +66,6 @@ focusable:false; } -#lengthSourceInformation { - enabled: {tableEditBean.isIsLengthComputed()}; - toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; -} - -#weightSourceInformation { - enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; - toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; -} - #tagNumber { enabled:{tableEditBean.getAcquisitionMode() == 1}; } ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -29,6 +29,10 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Route.choice.create.fin.veille.activity observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue observe.data.ps.observation.Route.message.need.fin.veille.activity +observe.data.ps.observation.Sample.length.computed.tip +observe.data.ps.observation.Sample.length.observed.tip +observe.data.ps.observation.Sample.weight.computed.tip +observe.data.ps.observation.Sample.weight.observed.tip observe.data.ps.observation.Set.schoolType.not.fill observe.referential.Referential.type observe.ui.action.copyCoordinate ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -187,7 +187,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -0,0 +1,33 @@ +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +#lengthSourceInformation { + enabled: {tableEditBean.isIsLengthComputed()}; + toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; +} + +#weightSourceInformation { + enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; + toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsWeightComputed())}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java ===================================== @@ -21,9 +21,9 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.observation; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetWeightMeasureType; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.common.SpeciesReference; @@ -251,7 +251,9 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { protected void onWeightChanged(Float newValue) { SampleMeasureDto tableEditBean = ui.getModel().getStates().getTableEditBean(); - tableEditBean.setIsWeightComputed(false); + if (tableEditBean.getAcquisitionMode() == 1) { + tableEditBean.setIsWeightComputed(false); + } if (newValue == null) { tableEditBean.setWeightMeasureMethod(null); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.data.sample.SampleContentTableUIModelStates; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -35,11 +36,25 @@ import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import javax.swing.Icon; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + @GenerateJavaBeanDefinition public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleDto, SampleMeasureDto> { + public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); + public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); + public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); + public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); + private final Icon computedIcon; + private final Icon observedIcon; + public SampleUIModelStates(GeneratedSampleUIModel model) { super(model, SampleDto.newDto(new java.util.Date()), SampleMeasureDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectedId(), model.getSource().getInitializer().getScope().isStandalone()); + this.computedIcon = UIHelper.getUIManagerActionIcon("data-calcule"); + this.observedIcon = UIHelper.getUIManagerActionIcon("data-observe"); } @Override @@ -65,4 +80,16 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD return beanToSave; } + public String getWeightDataTip(boolean computed) { + return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); + } + + public String getLengthDataTip(boolean computed) { + return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); + } + + public Icon getSourceInformationIcon(boolean computed) { + return computed ? computedIcon : observedIcon; + } + } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java ===================================== @@ -372,6 +372,10 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe this.sample_idx = resultSet.getInt(20); this.lengthMeasureMethod = resultSet.getString(21); this.weightMeasureMethod = resultSet.getString(22); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2503 + if (acquisitionMode == 0 && weight != null && !isWeightComputed) { + isWeightComputed = true; + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/804cabb577e03fea237535a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/804cabb577e03fea237535a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Persistence migration - Sur échantillons PS observations saisis par lots,...
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a6f01415 by Tony Chemit at 2022-11-09T16:32:26+01:00 Persistence migration - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - d67d2179 by Tony Chemit at 2022-11-09T16:32:32+01:00 GUI - Sur échantillons PS observations saisis par lots, migrés vers 9.0, valeurs étranges sur le champ poids individuel - Closes #2503 - - - - - 11 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -114,11 +114,6 @@ enabled:false; } -.computedDataInformation { - icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; - disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; -} - .showReset { showReset:true; } ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -68,10 +68,6 @@ observe.data.WithDataFile.choose.title.importData observe.data.WithDataFile.delete.data.file.message observe.data.message.will.delete.sub.data.type observe.data.message.will.delete.sub.data.type2 -observe.data.ps.observation.Sample.length.computed.tip -observe.data.ps.observation.Sample.length.observed.tip -observe.data.ps.observation.Sample.weight.computed.tip -observe.data.ps.observation.Sample.weight.observed.tip observe.error.storage.backup.local.db observe.error.storage.close.current.db observe.error.storage.close.local.db @@ -281,7 +277,6 @@ observe.ui.message.db.none.loaded.tip observe.ui.message.delete observe.ui.message.delete.new observe.ui.message.loaded.tip -observe.ui.message.no.species.selected observe.ui.message.quit.invalid.edit observe.ui.message.quit.valid.edit observe.ui.message.show.referential.usages ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java ===================================== @@ -23,10 +23,10 @@ package fr.ird.observe.client.datasource.editor.api.content.data.sample; */ import com.google.common.collect.Maps; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ContainerChildDto; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -40,12 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.SIZE_OBSERVED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_COMPUTED_TIP; -import static fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType.WEIGHT_OBSERVED_TIP; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 08/01/2021. * @@ -75,14 +69,6 @@ public abstract class SampleContentTableUIModelStates<D extends DataDto, C exten public abstract AcquisitionMode getDefaultAcquisitionMode(); - public String getWeightDataTip(boolean computed) { - return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); - } - - public String getLengthDataTip(boolean computed) { - return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); - } - public SizeMeasureTypeReference getDefaultSizeMeasureType() { return defaultSizeMeasureType; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java ===================================== @@ -31,16 +31,10 @@ import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; import javax.swing.JButton; import java.awt.event.ActionEvent; -import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; public class ResetSizeMeasureType> extends ContentTableUIActionSupport { - public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); - public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); - public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); - public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); - public static final String NO_SPECIES_SELECTED = n("observe.ui.message.no.species.selected"); private final FilterableComboBox<?> combo; public static > void install(U ui, JButton editor, FilterableComboBox<?> combo) { ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss ===================================== @@ -66,16 +66,6 @@ focusable:false; } -#lengthSourceInformation { - enabled: {tableEditBean.isIsLengthComputed()}; - toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; -} - -#weightSourceInformation { - enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; - toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; -} - #tagNumber { enabled:{tableEditBean.getAcquisitionMode() == 1}; } ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -29,6 +29,10 @@ observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Route.choice.create.fin.veille.activity observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue observe.data.ps.observation.Route.message.need.fin.veille.activity +observe.data.ps.observation.Sample.length.computed.tip +observe.data.ps.observation.Sample.length.observed.tip +observe.data.ps.observation.Sample.weight.computed.tip +observe.data.ps.observation.Sample.weight.observed.tip observe.data.ps.observation.Set.schoolType.not.fill observe.referential.Referential.type observe.ui.action.copyCoordinate ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -187,7 +187,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -0,0 +1,33 @@ +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, 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% + */ + +#lengthSourceInformation { + enabled: {tableEditBean.isIsLengthComputed()}; + toolTipText:{getStates().getLengthDataTip(tableEditBean.isIsLengthComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; +} + +#weightSourceInformation { + enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; + toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; + icon:{getStates().getSourceInformationIcon(tableEditBean.isIsWeightComputed())}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIHandler.java ===================================== @@ -21,9 +21,9 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.observation; -import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetSizeMeasureType; import fr.ird.observe.client.datasource.editor.api.content.data.sample.actions.ResetWeightMeasureType; +import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.common.SpeciesReference; @@ -251,7 +251,9 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { protected void onWeightChanged(Float newValue) { SampleMeasureDto tableEditBean = ui.getModel().getStates().getTableEditBean(); - tableEditBean.setIsWeightComputed(false); + if (tableEditBean.getAcquisitionMode() == 1) { + tableEditBean.setIsWeightComputed(false); + } if (newValue == null) { tableEditBean.setWeightMeasureMethod(null); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUIModelStates.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.data.sample.SampleContentTableUIModelStates; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.AcquisitionMode; import fr.ird.observe.dto.data.ps.observation.SampleDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -35,11 +36,25 @@ import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import javax.swing.Icon; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + @GenerateJavaBeanDefinition public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleDto, SampleMeasureDto> { + public static final String WEIGHT_COMPUTED_TIP = n("observe.data.ps.observation.Sample.weight.computed.tip"); + public static final String WEIGHT_OBSERVED_TIP = n("observe.data.ps.observation.Sample.weight.observed.tip"); + public static final String SIZE_COMPUTED_TIP = n("observe.data.ps.observation.Sample.length.computed.tip"); + public static final String SIZE_OBSERVED_TIP = n("observe.data.ps.observation.Sample.length.observed.tip"); + private final Icon computedIcon; + private final Icon observedIcon; + public SampleUIModelStates(GeneratedSampleUIModel model) { super(model, SampleDto.newDto(new java.util.Date()), SampleMeasureDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectedId(), model.getSource().getInitializer().getScope().isStandalone()); + this.computedIcon = UIHelper.getUIManagerActionIcon("data-calcule"); + this.observedIcon = UIHelper.getUIManagerActionIcon("data-observe"); } @Override @@ -65,4 +80,16 @@ public class SampleUIModelStates extends SampleContentTableUIModelStates<SampleD return beanToSave; } + public String getWeightDataTip(boolean computed) { + return computed ? t(WEIGHT_COMPUTED_TIP) : t(WEIGHT_OBSERVED_TIP); + } + + public String getLengthDataTip(boolean computed) { + return computed ? t(SIZE_COMPUTED_TIP) : t(SIZE_OBSERVED_TIP); + } + + public Icon getSourceInformationIcon(boolean computed) { + return computed ? computedIcon : observedIcon; + } + } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java ===================================== @@ -372,6 +372,10 @@ public class DataSourceMigrationForVersion_9_0 extends ByMajorMigrationVersionRe this.sample_idx = resultSet.getInt(20); this.lengthMeasureMethod = resultSet.getString(21); this.weightMeasureMethod = resultSet.getString(22); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2503 + if (acquisitionMode == 0 && weight != null && !isWeightComputed) { + isWeightComputed = true; + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/38eb3d9673a94d4152dcf59d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/38eb3d9673a94d4152dcf59d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Amélioration de libellés du formulaire captures - Closes #2513
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: bfa4262e by Tony Chemit at 2022-11-09T14:11:01+01:00 Amélioration de libellés du formulaire captures - Closes #2513 - - - - - 804cabb5 by Tony Chemit at 2022-11-09T14:25:12+01:00 Labellisation du référentiel 'Type de données des propriétés/matériaux de FOB - Closes #2512 - - - - - 5 changed files: - core/api/services/src/main/i18n/getters/labels.getter - 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/class/i18nOverrideLabels.properties Changes: ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1049,6 +1049,7 @@ observe.data.ps.observation.Catch.totalCount.short observe.data.ps.observation.Catch.totalCountComputed.computed.tip observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Catch.type +observe.data.ps.observation.Catch.weightMeasureMethod observe.data.ps.observation.FloatingObject.action.add observe.data.ps.observation.FloatingObject.action.add.tip observe.data.ps.observation.FloatingObject.buoysTab ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=Speed between observe.data.ps.observation.Catch.action.create=Create a new catch observe.data.ps.observation.Catch.action.save=Insert this catch observe.data.ps.observation.Catch.action.save.tip=Insert this catch -observe.data.ps.observation.Catch.catchWeight=Weight estimated (in t) +observe.data.ps.observation.Catch.catchWeight=Total weight estimated (in t) observe.data.ps.observation.Catch.catchWeight.short=Weight observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s) @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Length observe.data.ps.observation.Catch.meanLength.validation.notFilled=Weight or mean size must be filled. observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=Mean length was computed (%s) observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=Mean weight was observed -observe.data.ps.observation.Catch.meanWeight=Mean weight (in Kg) +observe.data.ps.observation.Catch.meanWeight=Mean weight (in kg) observe.data.ps.observation.Catch.meanWeight.short=Mean weight observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled. observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s) @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Count was comp observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was observed observe.data.ps.observation.Catch.type=Catch observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. +observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method observe.data.ps.observation.FloatingObject.action.add=Add FAD observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity observe.data.ps.observation.FloatingObject.buoysTab=Beacon @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Pictures refe observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Samples observe.data.ps.observation.SampleMeasure.type=Sample measure -observe.data.ps.observation.SampleMeasure.weight=Individual weight (in Kg) +observe.data.ps.observation.SampleMeasure.weight=Individual weight (in kg) observe.data.ps.observation.SampleMeasure.weight.short=Weight observe.data.ps.observation.SampleMeasure.weight.validation.required=Weight or size must be filled. observe.data.ps.observation.SchoolEstimate.action.create=Create a new estimate observe.data.ps.observation.SchoolEstimate.action.save=Insert this estimate observe.data.ps.observation.SchoolEstimate.action.save.tip=Insert this estimate -observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Mean weight or total weight is required. observe.data.ps.observation.SchoolEstimate.species=Target species observe.data.ps.observation.SchoolEstimate.title=School estimate @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Length weig observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=Length weight formula permits to compute weight from the length, must contains variable L observe.referential.common.LengthWeightParameter.meanLength=Mean length observe.referential.common.LengthWeightParameter.meanValues=Mean values -observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in kg) observe.referential.common.LengthWeightParameter.type=Length weight parameter observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Formula is not valid. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique. @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=Validation formula is not valid. observe.referential.ps.common.ObjectMaterial.validationInformation=Validation formula must contains variable x -observe.referential.ps.common.ObjectMaterialType.type=Floating objet material type +observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Object operation observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain -observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in kg) observe.referential.ps.common.WeightCategory.type=Weight category observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one domain must be selected. observe.referential.ps.landing.Destination.type=Destination ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=la velocidad e observe.data.ps.observation.Catch.action.create=Crear una captura observe.data.ps.observation.Catch.action.save=Insertar captura observe.data.ps.observation.Catch.action.save.tip=Insertar captura -observe.data.ps.observation.Catch.catchWeight=Pesos estimados (en t) +observe.data.ps.observation.Catch.catchWeight=Pesos total estimados (en t) observe.data.ps.observation.Catch.catchWeight.short=Peso observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count) observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Talla observe.data.ps.observation.Catch.meanLength.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media). observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La talla media se calculó observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La talla media se observó -observe.data.ps.observation.Catch.meanWeight=Peso medio (en Kg) +observe.data.ps.observation.Catch.meanWeight=Peso medio (en kg) observe.data.ps.observation.Catch.meanWeight.short=Peso medio observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media). observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=El número est observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número estimado se observo observe.data.ps.observation.Catch.type=Captura observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO +observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad observe.data.ps.observation.FloatingObject.buoysTab=Baliza @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref. foto observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Sample measures observe.data.ps.observation.SampleMeasure.type=Sample measures -observe.data.ps.observation.SampleMeasure.weight=Peso individual (en Kg) +observe.data.ps.observation.SampleMeasure.weight=Peso individual (en kg) observe.data.ps.observation.SampleMeasure.weight.short=Weight observe.data.ps.observation.SampleMeasure.weight.validation.required=TODO observe.data.ps.observation.SchoolEstimate.action.create=Crear una nueva estimación observe.data.ps.observation.SchoolEstimate.action.save=Insertar estimación observe.data.ps.observation.SchoolEstimate.action.save.tip=Insertar la nueva estimación en la tabla -observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=TODO observe.data.ps.observation.SchoolEstimate.species=Especie de atún (no se puede modificar una vez se haya creado la estimación) observe.data.ps.observation.SchoolEstimate.title=Estimación del banco @@ -1418,10 +1419,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Observed activity \#TODO observe.error.DuplicateLengthWeightParameterException=Found multiple length weight relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO observe.error.LengthLengthParameterNotFoundException=No length length relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO observe.error.LengthWeightParameterNotFoundException=No length weight relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO -observe.referential.MinMaxWeight.maxWeight=Peso max (en Kg) -observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en Kg) -observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en Kg) -observe.referential.MinMaxWeight.minWeight=Peso min (en Kg) +observe.referential.MinMaxWeight.maxWeight=Peso max (en kg) +observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en kg) +observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en kg) +observe.referential.MinMaxWeight.minWeight=Peso min (en kg) observe.referential.Referential.action.back.to.list=Volver a la lista observe.referential.Referential.action.back.to.list.tip=Volver a la lista de datos observe.referential.Referential.action.changeId.choose.new.id=Change referential id of type\: %s \#TODO @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relación d observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relación talla-peso permite calcular el peso a partir de la talla, debe contener la variable L observe.referential.common.LengthWeightParameter.meanLength=Talla media (en cm) observe.referential.common.LengthWeightParameter.meanValues=Valores medios -observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en kg) observe.referential.common.LengthWeightParameter.type=Relación Tamaño-Peso observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation \#TODO observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- \#TODO observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. \#TODO observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x \#TODO -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant \#TODO +observe.referential.ps.common.ObjectMaterialType.type=observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB \#TODO observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Operación sobre el objeto observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain -observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en kg) observe.referential.ps.common.WeightCategory.type=Categoría de peso observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one main must be selected. observe.referential.ps.landing.Destination.type=Destination ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1227,7 +1227,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=La vitesse ent observe.data.ps.observation.Catch.action.create=Nouvelle capture observe.data.ps.observation.Catch.action.save=Insérer cette capture observe.data.ps.observation.Catch.action.save.tip=Insérer cette capture -observe.data.ps.observation.Catch.catchWeight=Poids estimé (en t) +observe.data.ps.observation.Catch.catchWeight=Poids total estimé (en t) observe.data.ps.observation.Catch.catchWeight.short=Poids observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) @@ -1239,7 +1239,7 @@ observe.data.ps.observation.Catch.meanLength.short=Taille observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s) observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée -observe.data.ps.observation.Catch.meanWeight=Poids moyen (en Kg) +observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg) observe.data.ps.observation.Catch.meanWeight.short=Poids moy observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) @@ -1257,6 +1257,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Le nombre esti observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre estimé a été observé observe.data.ps.observation.Catch.type=Captures observe.data.ps.observation.Catch.validation.missing.observedSystem=Un des systèmes observés %s doit être sélectionné pour l'espèce sélectionnée. +observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité observe.data.ps.observation.FloatingObject.buoysTab=Balise @@ -1354,14 +1355,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref photo observe.data.ps.observation.SampleMeasure.speciesFate.short=Devenir observe.data.ps.observation.SampleMeasure.title=Échantillons observe.data.ps.observation.SampleMeasure.type=Échantillon -observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en Kg) +observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en kg) observe.data.ps.observation.SampleMeasure.weight.short=Poids observe.data.ps.observation.SampleMeasure.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ps.observation.SchoolEstimate.action.create=Nouvelle estimation observe.data.ps.observation.SchoolEstimate.action.save=Insérer cette estimation observe.data.ps.observation.SchoolEstimate.action.save.tip=Insérer la nouvelle estimation dans la table -observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Une des deux valeurs (poids estimé, poids total) doit être renseignée. observe.data.ps.observation.SchoolEstimate.species=Espèce de thon (ne peut pas être modifié une fois l'estimation crée) observe.data.ps.observation.SchoolEstimate.title=Estimation banc @@ -1418,10 +1419,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Activité observée observe.error.DuplicateLengthWeightParameterException=Plusieurs relations taille-poids ont été trouvées pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s \:\n * %s observe.error.LengthLengthParameterNotFoundException=Aucune relation taille-taille trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s observe.error.LengthWeightParameterNotFoundException=Aucune relation taille-poids trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s -observe.referential.MinMaxWeight.maxWeight=Poids max (en Kg) -observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en Kg) -observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en Kg) -observe.referential.MinMaxWeight.minWeight=Poids min (en Kg) +observe.referential.MinMaxWeight.maxWeight=Poids max (en kg) +observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en kg) +observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en kg) +observe.referential.MinMaxWeight.minWeight=Poids min (en kg) observe.referential.Referential.action.back.to.list=Retour à la liste observe.referential.Referential.action.back.to.list.tip=Retour à la liste des données observe.referential.Referential.action.changeId.choose.new.id=Changer l'identifiant du référentiel de type \: %s @@ -1475,7 +1476,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relation Po observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relation poids permet de calculer le poids à partir de la taille observe.referential.common.LengthWeightParameter.meanLength=Taille moyenne (en cm) observe.referential.common.LengthWeightParameter.meanValues=Valeurs moyennes -observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en kg) observe.referential.common.LengthWeightParameter.type=Relation Taille-Poids observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique @@ -1633,7 +1634,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Le code doit commencer par %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant +observe.referential.ps.common.ObjectMaterialType.type=Type de données des propriétés/matériaux de FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Sous-domaine observe.referential.ps.common.ObjectOperation.type=Opération sur l'objet observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine. @@ -1671,7 +1672,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Autorisé pour les dé observe.referential.ps.common.WeightCategory.allowLogbook=Autorisé pour le livre de bord observe.referential.ps.common.WeightCategory.allowWellPlan=Autorisé pour les plan de cuves observe.referential.ps.common.WeightCategory.atLeastOneSelected=Sous-domaine -observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en kg) observe.referential.ps.common.WeightCategory.type=Catégorie de poids observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine. observe.referential.ps.landing.Destination.type=Destination ===================================== model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties ===================================== @@ -23,7 +23,7 @@ data.ll.common.Trip=species data.ll.landing.Landing=vessel data.ps.localmarket.Sample=well data.ps.logbook.Catch=weightMeasureMethod.validation.required -data.ps.observation.Catch=minWeight,maxWeight +data.ps.observation.Catch=minWeight,maxWeight,weightMeasureMethod data.ps.observation.SchoolEstimate=species data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp referential.common.Species=codeAndHomeId View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/600606a45e791c0ebdd0268a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/600606a45e791c0ebdd0268a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration de libellés du formulaire captures - Closes #2513
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d2ecca2 by Tony Chemit at 2022-11-09T14:22:19+01:00 Amélioration de libellés du formulaire captures - Closes #2513 - - - - - 38eb3d96 by Tony Chemit at 2022-11-09T14:25:21+01:00 Labellisation du référentiel 'Type de données des propriétés/matériaux de FOB - Closes #2512 - - - - - 5 changed files: - core/api/services/src/main/i18n/getters/labels.getter - 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/class/i18nOverrideLabels.properties Changes: ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -1086,6 +1086,7 @@ observe.data.ps.observation.Catch.totalCount.short observe.data.ps.observation.Catch.totalCountComputed.computed.tip observe.data.ps.observation.Catch.totalCountComputed.observed.tip observe.data.ps.observation.Catch.type +observe.data.ps.observation.Catch.weightMeasureMethod observe.data.ps.observation.FloatingObject.action.add observe.data.ps.observation.FloatingObject.action.add.tip observe.data.ps.observation.FloatingObject.buoysTab ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1270,7 +1270,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=Speed between observe.data.ps.observation.Catch.action.create=Create a new catch observe.data.ps.observation.Catch.action.save=Insert this catch observe.data.ps.observation.Catch.action.save.tip=Insert this catch -observe.data.ps.observation.Catch.catchWeight=Weight estimated (in t) +observe.data.ps.observation.Catch.catchWeight=Total weight estimated (in t) observe.data.ps.observation.Catch.catchWeight.short=Weight observe.data.ps.observation.Catch.catchWeight.validation.required=Weight or estimated count must be filled observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Catch weight was computed (%s) @@ -1282,7 +1282,7 @@ observe.data.ps.observation.Catch.meanLength.short=Length observe.data.ps.observation.Catch.meanLength.validation.notFilled=Weight or mean size must be filled. observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=Mean length was computed (%s) observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=Mean weight was observed -observe.data.ps.observation.Catch.meanWeight=Mean weight (in Kg) +observe.data.ps.observation.Catch.meanWeight=Mean weight (in kg) observe.data.ps.observation.Catch.meanWeight.short=Mean weight observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Weight or mean size must be filled. observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Mean weight was computed (%s) @@ -1300,6 +1300,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Count was comp observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Count was observed observe.data.ps.observation.Catch.type=Catch observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. +observe.data.ps.observation.Catch.weightMeasureMethod=Total weight measure method observe.data.ps.observation.FloatingObject.action.add=Add FAD observe.data.ps.observation.FloatingObject.action.add.tip=Add a FAD to the activity observe.data.ps.observation.FloatingObject.buoysTab=Beacon @@ -1397,14 +1398,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Pictures refe observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Samples observe.data.ps.observation.SampleMeasure.type=Sample measure -observe.data.ps.observation.SampleMeasure.weight=Individual weight (in Kg) +observe.data.ps.observation.SampleMeasure.weight=Individual weight (in kg) observe.data.ps.observation.SampleMeasure.weight.short=Weight observe.data.ps.observation.SampleMeasure.weight.validation.required=Weight or size must be filled. observe.data.ps.observation.SchoolEstimate.action.create=Create a new estimate observe.data.ps.observation.SchoolEstimate.action.save=Insert this estimate observe.data.ps.observation.SchoolEstimate.action.save.tip=Insert this estimate -observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Mean weight (in kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Mean weight (in kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Mean weight or total weight is required. observe.data.ps.observation.SchoolEstimate.species=Target species observe.data.ps.observation.SchoolEstimate.title=School estimate @@ -1518,7 +1519,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Length weig observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=Length weight formula permits to compute weight from the length, must contains variable L observe.referential.common.LengthWeightParameter.meanLength=Mean length observe.referential.common.LengthWeightParameter.meanValues=Mean values -observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Mean weight (in kg) observe.referential.common.LengthWeightParameter.type=Length weight parameter observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Formula is not valid. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique. @@ -1676,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=Validation formula is not valid. observe.referential.ps.common.ObjectMaterial.validationInformation=Validation formula must contains variable x -observe.referential.ps.common.ObjectMaterialType.type=Floating objet material type +observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Object operation observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. @@ -1714,7 +1715,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain -observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Mean weight (in kg) observe.referential.ps.common.WeightCategory.type=Weight category observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one domain must be selected. observe.referential.ps.landing.Destination.type=Destination ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1270,7 +1270,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=la velocidad e observe.data.ps.observation.Catch.action.create=Crear una captura observe.data.ps.observation.Catch.action.save=Insertar captura observe.data.ps.observation.Catch.action.save.tip=Insertar captura -observe.data.ps.observation.Catch.catchWeight=Pesos estimados (en t) +observe.data.ps.observation.Catch.catchWeight=Pesos total estimados (en t) observe.data.ps.observation.Catch.catchWeight.short=Peso observe.data.ps.observation.Catch.catchWeight.validation.required=Debe seleccionar uno de los dos valores (peso o count) observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Peso estimado calculado @@ -1282,7 +1282,7 @@ observe.data.ps.observation.Catch.meanLength.short=Talla observe.data.ps.observation.Catch.meanLength.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media). observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La talla media se calculó observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La talla media se observó -observe.data.ps.observation.Catch.meanWeight=Peso medio (en Kg) +observe.data.ps.observation.Catch.meanWeight=Peso medio (en kg) observe.data.ps.observation.Catch.meanWeight.short=Peso medio observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Debe seleccionar uno de los dos valores (peso medio o talla media). observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=El peso medio se calculó @@ -1300,6 +1300,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=El número est observe.data.ps.observation.Catch.totalCountComputed.observed.tip=El número estimado se observo observe.data.ps.observation.Catch.type=Captura observe.data.ps.observation.Catch.validation.missing.observedSystem=One of the following observed system %s must be filled for the selected species. \#TODO +observe.data.ps.observation.Catch.weightMeasureMethod=Método de medición de total peso observe.data.ps.observation.FloatingObject.action.add=Añadir un FOB observe.data.ps.observation.FloatingObject.action.add.tip=Añadir un objeto flotante a la actividad observe.data.ps.observation.FloatingObject.buoysTab=Baliza @@ -1397,14 +1398,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref. foto observe.data.ps.observation.SampleMeasure.speciesFate.short=Species fate observe.data.ps.observation.SampleMeasure.title=Sample measures observe.data.ps.observation.SampleMeasure.type=Sample measures -observe.data.ps.observation.SampleMeasure.weight=Peso individual (en Kg) +observe.data.ps.observation.SampleMeasure.weight=Peso individual (en kg) observe.data.ps.observation.SampleMeasure.weight.short=Weight observe.data.ps.observation.SampleMeasure.weight.validation.required=TODO observe.data.ps.observation.SchoolEstimate.action.create=Crear una nueva estimación observe.data.ps.observation.SchoolEstimate.action.save=Insertar estimación observe.data.ps.observation.SchoolEstimate.action.save.tip=Insertar la nueva estimación en la tabla -observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Peso medio (en kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Peso medio (en kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=TODO observe.data.ps.observation.SchoolEstimate.species=Especie de atún (no se puede modificar una vez se haya creado la estimación) observe.data.ps.observation.SchoolEstimate.title=Estimación del banco @@ -1461,10 +1462,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Observed activity \#TODO observe.error.DuplicateLengthWeightParameterException=Found multiple length weight relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO observe.error.LengthLengthParameterNotFoundException=No length length relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO observe.error.LengthWeightParameterNotFoundException=No length weight relation found for species\: %s, ocean\: %s, sex\: %s, date\: %s \: %s \#TODO -observe.referential.MinMaxWeight.maxWeight=Peso max (en Kg) -observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en Kg) -observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en Kg) -observe.referential.MinMaxWeight.minWeight=Peso min (en Kg) +observe.referential.MinMaxWeight.maxWeight=Peso max (en kg) +observe.referential.MinMaxWeight.minMaxWeight=Peso min-max (en kg) +observe.referential.MinMaxWeight.minMeanMaxWeight=Peso min-mean-max (en kg) +observe.referential.MinMaxWeight.minWeight=Peso min (en kg) observe.referential.Referential.action.back.to.list=Volver a la lista observe.referential.Referential.action.back.to.list.tip=Volver a la lista de datos observe.referential.Referential.action.changeId.choose.new.id=Change referential id of type\: %s \#TODO @@ -1518,7 +1519,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relación d observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relación talla-peso permite calcular el peso a partir de la talla, debe contener la variable L observe.referential.common.LengthWeightParameter.meanLength=Talla media (en cm) observe.referential.common.LengthWeightParameter.meanValues=Valores medios -observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Peso medio (en kg) observe.referential.common.LengthWeightParameter.type=Relación Tamaño-Peso observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO @@ -1676,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation \#TODO observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Code should starts with %1$s- \#TODO observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. \#TODO observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x \#TODO -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant \#TODO +observe.referential.ps.common.ObjectMaterialType.type=observe.referential.ps.common.ObjectMaterialType.type=Data type of properties/material of FOB \#TODO observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Domain observe.referential.ps.common.ObjectOperation.type=Operación sobre el objeto observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=At least one domain must be selected. @@ -1714,7 +1715,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Allow for Landing observe.referential.ps.common.WeightCategory.allowLogbook=Allow for Logbook observe.referential.ps.common.WeightCategory.allowWellPlan=Allow for Well plan observe.referential.ps.common.WeightCategory.atLeastOneSelected=Domain -observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Peso medio (en kg) observe.referential.ps.common.WeightCategory.type=Categoría de peso observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=At least one main must be selected. observe.referential.ps.landing.Destination.type=Destination ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1270,7 +1270,7 @@ observe.data.ps.observation.Activity.validation.speed.bound.inter=La vitesse ent observe.data.ps.observation.Catch.action.create=Nouvelle capture observe.data.ps.observation.Catch.action.save=Insérer cette capture observe.data.ps.observation.Catch.action.save.tip=Insérer cette capture -observe.data.ps.observation.Catch.catchWeight=Poids estimé (en t) +observe.data.ps.observation.Catch.catchWeight=Poids total estimé (en t) observe.data.ps.observation.Catch.catchWeight.short=Poids observe.data.ps.observation.Catch.catchWeight.validation.required=Une des deux valeurs (poids ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) @@ -1282,7 +1282,7 @@ observe.data.ps.observation.Catch.meanLength.short=Taille observe.data.ps.observation.Catch.meanLength.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s) observe.data.ps.observation.Catch.meanLengthComputed.observed.tip=La taille moyenne a été observée -observe.data.ps.observation.Catch.meanWeight=Poids moyen (en Kg) +observe.data.ps.observation.Catch.meanWeight=Poids moyen (en kg) observe.data.ps.observation.Catch.meanWeight.short=Poids moy observe.data.ps.observation.Catch.meanWeight.validation.notFilled=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. observe.data.ps.observation.Catch.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) @@ -1300,6 +1300,7 @@ observe.data.ps.observation.Catch.totalCountComputed.computed.tip=Le nombre esti observe.data.ps.observation.Catch.totalCountComputed.observed.tip=Le nombre estimé a été observé observe.data.ps.observation.Catch.type=Captures observe.data.ps.observation.Catch.validation.missing.observedSystem=Un des systèmes observés %s doit être sélectionné pour l'espèce sélectionnée. +observe.data.ps.observation.Catch.weightMeasureMethod=Méthode de mesure du poids total observe.data.ps.observation.FloatingObject.action.add=Ajouter un DCP observe.data.ps.observation.FloatingObject.action.add.tip=Ajouter un objet flottant à l'activité observe.data.ps.observation.FloatingObject.buoysTab=Balise @@ -1397,14 +1398,14 @@ observe.data.ps.observation.SampleMeasure.picturesReferences.short=Ref photo observe.data.ps.observation.SampleMeasure.speciesFate.short=Devenir observe.data.ps.observation.SampleMeasure.title=Échantillons observe.data.ps.observation.SampleMeasure.type=Échantillon -observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en Kg) +observe.data.ps.observation.SampleMeasure.weight=Poids individuel (en kg) observe.data.ps.observation.SampleMeasure.weight.short=Poids observe.data.ps.observation.SampleMeasure.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ps.observation.SchoolEstimate.action.create=Nouvelle estimation observe.data.ps.observation.SchoolEstimate.action.save=Insérer cette estimation observe.data.ps.observation.SchoolEstimate.action.save.tip=Insérer la nouvelle estimation dans la table -observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en Kg) -observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en Kg) +observe.data.ps.observation.SchoolEstimate.meanWeight=Poids moyen (en kg) +observe.data.ps.observation.SchoolEstimate.meanWeight.short=Poids moyen (en kg) observe.data.ps.observation.SchoolEstimate.meanWeight.validation.required=Une des deux valeurs (poids estimé, poids total) doit être renseignée. observe.data.ps.observation.SchoolEstimate.species=Espèce de thon (ne peut pas être modifié une fois l'estimation crée) observe.data.ps.observation.SchoolEstimate.title=Estimation banc @@ -1461,10 +1462,10 @@ observe.data.ps.pairing.ActivityPairingResultItem.type=Activité observée observe.error.DuplicateLengthWeightParameterException=Plusieurs relations taille-poids ont été trouvées pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s \:\n * %s observe.error.LengthLengthParameterNotFoundException=Aucune relation taille-taille trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s observe.error.LengthWeightParameterNotFoundException=Aucune relation taille-poids trouvée pour l'espèce\: %s, l'océan\: %s, le sexe\: %s et la date\: %s -observe.referential.MinMaxWeight.maxWeight=Poids max (en Kg) -observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en Kg) -observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en Kg) -observe.referential.MinMaxWeight.minWeight=Poids min (en Kg) +observe.referential.MinMaxWeight.maxWeight=Poids max (en kg) +observe.referential.MinMaxWeight.minMaxWeight=Poids min-max (en kg) +observe.referential.MinMaxWeight.minMeanMaxWeight=Poids min-moyen-max (en kg) +observe.referential.MinMaxWeight.minWeight=Poids min (en kg) observe.referential.Referential.action.back.to.list=Retour à la liste observe.referential.Referential.action.back.to.list.tip=Retour à la liste des données observe.referential.Referential.action.changeId.choose.new.id=Changer l'identifiant du référentiel de type \: %s @@ -1518,7 +1519,7 @@ observe.referential.common.LengthWeightParameter.lengthWeightFormula=Relation Po observe.referential.common.LengthWeightParameter.lengthWeightFormulaInformation=La relation poids permet de calculer le poids à partir de la taille observe.referential.common.LengthWeightParameter.meanLength=Taille moyenne (en cm) observe.referential.common.LengthWeightParameter.meanValues=Valeurs moyennes -observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en Kg) +observe.referential.common.LengthWeightParameter.meanWeight=Poids moyen (en kg) observe.referential.common.LengthWeightParameter.type=Relation Taille-Poids observe.referential.common.LengthWeightParameter.validation.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. observe.referential.common.LengthWeightParameter.validation.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique @@ -1676,7 +1677,7 @@ observe.referential.ps.common.ObjectMaterial.validation=Validation observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode=Le code doit commencer par %1$s- observe.referential.ps.common.ObjectMaterial.validation.invalid.validation=La formule de validation n'est pas cohérente. observe.referential.ps.common.ObjectMaterial.validationInformation=La formule de validation doit contenir la variable x -observe.referential.ps.common.ObjectMaterialType.type=Type d'objet flottant +observe.referential.ps.common.ObjectMaterialType.type=Type de données des propriétés/matériaux de FOB observe.referential.ps.common.ObjectOperation.atLeastOneSelected=Sous-domaine observe.referential.ps.common.ObjectOperation.type=Opération sur l'objet observe.referential.ps.common.ObjectOperation.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine. @@ -1714,7 +1715,7 @@ observe.referential.ps.common.WeightCategory.allowLanding=Autorisé pour les dé observe.referential.ps.common.WeightCategory.allowLogbook=Autorisé pour le livre de bord observe.referential.ps.common.WeightCategory.allowWellPlan=Autorisé pour les plan de cuves observe.referential.ps.common.WeightCategory.atLeastOneSelected=Sous-domaine -observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en Kg) +observe.referential.ps.common.WeightCategory.meanWeight=Poids moyen (en kg) observe.referential.ps.common.WeightCategory.type=Catégorie de poids observe.referential.ps.common.WeightCategory.validation.atLeastOneSelected=Veuillez sélectionner au moins un sous domaine. observe.referential.ps.landing.Destination.type=Destination ===================================== model/src/main/models/Observe/dto/class/i18nOverrideLabels.properties ===================================== @@ -23,7 +23,7 @@ data.ll.common.Trip=species data.ll.landing.Landing=vessel data.ps.localmarket.Sample=well data.ps.logbook.Catch=weightMeasureMethod.validation.required -data.ps.observation.Catch=minWeight,maxWeight +data.ps.observation.Catch=minWeight,maxWeight,weightMeasureMethod data.ps.observation.SchoolEstimate=species data.ps.observation.Set=startTime,haulingStartTimeStamp,haulingEndTimeStamp,endTimeStamp referential.common.Species=codeAndHomeId View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/68bf33c0d6d4cc9c9ba805e4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/68bf33c0d6d4cc9c9ba805e4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 15 commits: FIXME - Do not drop table until release time
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 73c88a1f by Tony Chemit at 2022-11-09T11:03:31+01:00 FIXME - Do not drop table until release time - - - - - 5ad0f967 by Tony Chemit at 2022-11-09T11:06:28+01:00 I18n - Review min - max Weight labels - - - - - 73f69c7d by Tony Chemit at 2022-11-09T11:30:27+01:00 Sql comment - Review howto write them in pure sql statements. - - - - - 56eb4621 by Tony Chemit at 2022-11-09T11:30:39+01:00 Model (Dto and persistence) - add ps_observation.Catch (minWeight and maxWeight) - See ultreiaio/ird-observe#2515 - - - - - 2aca61ff by Tony Chemit at 2022-11-09T11:37:51+01:00 Model (Dto and persistence and migration) - add ps_observation.Catch.speciesFate not null - See ultreiaio/ird-observe#2515 - - - - - b9e51dd2 by Tony Chemit at 2022-11-09T11:37:51+01:00 Model (Dto) - modify ps_observation.Catch unique key (up to 10 fields) Validation - update ps_observation.Catch validation See ultreiaio/ird-observe#2515 - - - - - 6db371b3 by Tony Chemit at 2022-11-09T11:38:57+01:00 Persistence migration - replay migration Persistence migration - Add ps_common.SpeciesFate 15, update the 6 one Persistence migration - Fix ps_observation.InformationSource label (double quote instead of simple one) - - - - - 910c8b93 by Tony Chemit at 2022-11-09T11:38:57+01:00 Validation - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 7f761a73 by Tony Chemit at 2022-11-09T11:38:57+01:00 I18n - Update with new fields (Catch and Species Fate) - - - - - 648facd1 by Tony Chemit at 2022-11-09T11:38:57+01:00 Tests - Update fixtures - - - - - 0bbe77fa by Tony Chemit at 2022-11-09T11:38:57+01:00 GUI Referential - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 7f38a436 by Tony Chemit at 2022-11-09T11:38:57+01:00 GUI Data - Adapt SetCatchUI - - - - - b168375e by Tony Chemit at 2022-11-09T12:10:08+01:00 Merge branch 'feature/issue_2515' into develop-9.0.x Closes #2515 - - - - - 5d79c10e by Tony Chemit at 2022-11-09T12:14:45+01:00 Dans l'import AVDTH, les longitudes extrêmes >90° ou >100° semblent mal gérées - Closes #2510 - - - - - 600606a4 by Tony Chemit at 2022-11-09T12:15:24+01:00 Pas mal de positions géographiques sont mises à NULL/NULL par l'importeur AVDTH - Closes #2511 - - - - - 30 changed files: - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDtoCatchesCollectionUniqueKeyValidator.java - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-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/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b522f7bf2387a3a9eb092fa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b522f7bf2387a3a9eb092fa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: I18n - Review min - max Weight labels
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 24f2233f by Tony Chemit at 2022-11-09T12:16:57+01:00 I18n - Review min - max Weight labels - - - - - b547530c by Tony Chemit at 2022-11-09T12:17:07+01:00 Sql comment - Review howto write them in pure sql statements. - - - - - 07ff9393 by Tony Chemit at 2022-11-09T12:17:42+01:00 Dans l'import AVDTH, les longitudes extrêmes >90° ou >100° semblent mal gérées - Closes #2510 - - - - - 34339867 by Tony Chemit at 2022-11-09T12:17:50+01:00 Pas mal de positions géographiques sont mises à NULL/NULL par l'importeur AVDTH - Closes #2511 - - - - - 4d925357 by Tony Chemit at 2022-11-09T13:47:04+01:00 Persistence migration - Catch.speciesFate has already done via the Replay migration Persistence migration - replay migration Persistence migration - Add ps_common.SpeciesFate 15, update the 6 one Persistence migration - Fix ps_observation.InformationSource label (double quote instead of simple one) Model (Dto and persistence and migration) - add ps_observation.Catch.speciesFate not null and weightRangeAllowed - See ultreiaio/ird-observe#2515 Model (Dto and persistence) - add ps_observation.Catch (minWeight and maxWeight) - See ultreiaio/ird-observe#2515 - - - - - 4a746cdf by Tony Chemit at 2022-11-09T13:47:04+01:00 Model (Dto) - modify ps_observation.Catch unique key (up to 10 fields) Validation - update ps_observation.Catch validation See ultreiaio/ird-observe#2515 - - - - - 427a1b42 by Tony Chemit at 2022-11-09T13:47:04+01:00 Validation - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 13772da2 by Tony Chemit at 2022-11-09T13:47:04+01:00 I18n - Update with new fields (Catch and Species Fate) - - - - - 11f54670 by Tony Chemit at 2022-11-09T13:47:04+01:00 Tests - Update fixtures - - - - - 27603ce9 by Tony Chemit at 2022-11-09T13:47:04+01:00 GUI Referential - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - d75a77d5 by Tony Chemit at 2022-11-09T13:47:04+01:00 GUI Data - Adapt SetCatchUI - - - - - 68bf33c0 by Tony Chemit at 2022-11-09T13:47:38+01:00 Merge branch 'feature/issue_2515' into develop Closes #2515 - - - - - 30 changed files: - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDtoCatchesCollectionUniqueKeyValidator.java - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-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/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5d7b7f624b1f9ca3aefa6de6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5d7b7f624b1f9ca3aefa6de6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_2515
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

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

1 0

[Git][ultreiaio/ird-observe][feature/issue_2515] 12 commits: FIXME - Do not drop table until release time
by Tony CHEMIT (＠tchemit) 09 Nov '22

09 Nov '22

Tony CHEMIT pushed to branch feature/issue_2515 at ultreiaio / ird-observe Commits: 73c88a1f by Tony Chemit at 2022-11-09T11:03:31+01:00 FIXME - Do not drop table until release time - - - - - 5ad0f967 by Tony Chemit at 2022-11-09T11:06:28+01:00 I18n - Review min - max Weight labels - - - - - 73f69c7d by Tony Chemit at 2022-11-09T11:30:27+01:00 Sql comment - Review howto write them in pure sql statements. - - - - - 56eb4621 by Tony Chemit at 2022-11-09T11:30:39+01:00 Model (Dto and persistence) - add ps_observation.Catch (minWeight and maxWeight) - See ultreiaio/ird-observe#2515 - - - - - 2aca61ff by Tony Chemit at 2022-11-09T11:37:51+01:00 Model (Dto and persistence and migration) - add ps_observation.Catch.speciesFate not null - See ultreiaio/ird-observe#2515 - - - - - b9e51dd2 by Tony Chemit at 2022-11-09T11:37:51+01:00 Model (Dto) - modify ps_observation.Catch unique key (up to 10 fields) Validation - update ps_observation.Catch validation See ultreiaio/ird-observe#2515 - - - - - 6db371b3 by Tony Chemit at 2022-11-09T11:38:57+01:00 Persistence migration - replay migration Persistence migration - Add ps_common.SpeciesFate 15, update the 6 one Persistence migration - Fix ps_observation.InformationSource label (double quote instead of simple one) - - - - - 910c8b93 by Tony Chemit at 2022-11-09T11:38:57+01:00 Validation - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 7f761a73 by Tony Chemit at 2022-11-09T11:38:57+01:00 I18n - Update with new fields (Catch and Species Fate) - - - - - 648facd1 by Tony Chemit at 2022-11-09T11:38:57+01:00 Tests - Update fixtures - - - - - 0bbe77fa by Tony Chemit at 2022-11-09T11:38:57+01:00 GUI Referential - Add ps_common.SpeciesFate weightRangeAllowed field - - - - - 7f38a436 by Tony Chemit at 2022-11-09T11:38:57+01:00 GUI Data - Adapt SetCatchUI - - - - - 30 changed files: - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/SpeciesUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/SpeciesFateUI.jaxx - core/api/dto/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/resources/META-INF/dto/Observe/DifferentialMetaModel.json - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDtoCatchesCollectionUniqueKeyValidator.java - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-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/referential/ps/common/SpeciesFateDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/SpeciesFateDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/56002ecddb9ac82031c06e2c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/56002ecddb9ac82031c06e2c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2515
by Tony CHEMIT (＠tchemit) 06 Nov '22

06 Nov '22

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

1 0