Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ea447671 by Tony Chemit at 2021-10-10T11:00:14+02:00 ll_landing.landingpart.weight NOT NULL ? - See ultreiaio/ird-observe#2027 - - - - - 1a4ba00b by Tony Chemit at 2021-10-10T12:35:21+02:00 Revue layout formulaire LL_logbook.Sample - - - - - 3c5e4a1d by Tony Chemit at 2021-10-10T12:35:41+02:00 Revue layout formulaire LL_landing.Landing - - - - - 19 changed files: - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/actions/LandingUISelectTransshipment.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/persistence/migration/src/main/resources/db/migration/v9/9.0/14_add_missing_not_null-common.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-PG.sql - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/i18n/getters/eugene.getter - services/validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUITableModel.java ===================================== @@ -0,0 +1,53 @@ +package fr.ird.observe.client.datasource.editor.ll.data.landing; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: LL + * %% + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ll.landing.LandingDto; + +import javax.swing.JTable; + +/** + * Created on 10/10/2021. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 9.0.0 + */ +public class LandingPartUITableModel extends GeneratedLandingPartUITableModel { + + private static final long serialVersionUID = 1L; + + public LandingPartUITableModel(EditableContentUI<LandingDto> parentUi, LandingPartUI ui, LandingPartUIModel model) { + super(parentUi, ui, model); + } + + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + UIHelper.fixTableColumnWidth(table, 1, 75); + UIHelper.fixTableColumnWidth(table, 2, 75); + UIHelper.fixTableColumnWidth(table, 3, 75); + UIHelper.fixTableColumnWidth(table, 4, 75); + } +} ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx ===================================== @@ -18,159 +18,138 @@ #L% --> <fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI - beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'> + beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'> - <import> - fr.ird.observe.dto.data.ll.landing.LandingDto - fr.ird.observe.dto.data.ll.landing.LandingPartDto - fr.ird.observe.dto.referential.common.DataQualityReference - fr.ird.observe.dto.referential.common.HarbourReference - fr.ird.observe.dto.referential.common.PersonReference - fr.ird.observe.dto.referential.common.SpeciesReference - fr.ird.observe.dto.referential.common.VesselReference - fr.ird.observe.dto.referential.ll.landing.DataSourceReference - fr.ird.observe.dto.referential.ll.landing.CompanyReference + <import> + fr.ird.observe.dto.data.ll.landing.LandingDto + fr.ird.observe.dto.data.ll.landing.LandingPartDto + fr.ird.observe.dto.referential.common.DataQualityReference + fr.ird.observe.dto.referential.common.HarbourReference + fr.ird.observe.dto.referential.common.PersonReference + fr.ird.observe.dto.referential.common.SpeciesReference + fr.ird.observe.dto.referential.common.VesselReference + fr.ird.observe.dto.referential.ll.landing.DataSourceReference + fr.ird.observe.dto.referential.ll.landing.CompanyReference - fr.ird.observe.client.ObserveSwingApplicationContext - org.nuiton.jaxx.widgets.datetime.DateEditor + fr.ird.observe.client.ObserveSwingApplicationContext + org.nuiton.jaxx.widgets.datetime.DateEditor - org.nuiton.jaxx.widgets.text.BigTextEditor - org.nuiton.jaxx.widgets.number.NumberEditor - io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox - java.util.Collection + org.nuiton.jaxx.widgets.text.BigTextEditor + org.nuiton.jaxx.widgets.number.NumberEditor + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + java.util.Collection - static fr.ird.observe.client.util.UIHelper.getStringValue - static io.ultreia.java4all.i18n.I18n.n - </import> + static fr.ird.observe.client.util.UIHelper.getStringValue + static io.ultreia.java4all.i18n.I18n.n + </import> - <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> - <LandingUIModelStates id='states'/> - <LandingDto id='bean'/> - <BeanValidator id='validator' context='update' autoField='true' - beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto' - errorTableModel='{getErrorTableModel()}'> - <field name='landingPart' component='landingPartPanel'/> - </BeanValidator> + <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> + <LandingUIModelStates id='states'/> + <LandingDto id='bean'/> + <BeanValidator id='validator' context='update' autoField='true' + beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto' + errorTableModel='{getErrorTableModel()}'> + <field name='landingPart' component='landingPartPanel'/> + </BeanValidator> - <JPanel id="contentBody" layout='{new BorderLayout()}'> - <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> - <row> - <cell weightx="1" weighty="1"> - <JTabbedPane id='mainTabbedPane'> - <tab id='characteristicsTab' i18nProperty=""> - <JScrollPane id="characteristicsTabScrollPane"> - <Table fill='both' insets="0"> + <JPanel id="contentBody" layout='{new BorderLayout()}'> + <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> + <row> + <cell weightx="1" weighty="1"> + <JTabbedPane id='mainTabbedPane'> + <tab id='characteristicsTab' i18nProperty=""> + <Table fill='both'> + <row> + <cell> + <JLabel id='dataSourceLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='dataSource' genericType='DataSourceReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='personLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='person' genericType='PersonReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='processingCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='processingCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='shippingCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='brokerageCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='harbourLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='harbour' genericType='HarbourReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='vesselLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='vessel' genericType='VesselReference'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='startDateLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <DateEditor id='startDate'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='endDateLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <DateEditor id='endDate'/> + </cell> + </row> + <row> + <cell fill="both" weighty="1" columns="2"> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </tab> + <tab id='landingPartTab' i18nProperty=""> + <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> + <LandingPartUI id="landingPartUI" constructorParams="newContext()"/> + </JPanel> + </tab> + </JTabbedPane> + </cell> + </row> + </Table> + </JPanel> - <!-- dataSource --> - <row> - <cell> - <JLabel id='dataSourceLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='dataSource' genericType='DataSourceReference'/> - </cell> - </row> - - <!-- person --> - <row> - <cell> - <JLabel id='personLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='person' genericType='PersonReference'/> - </cell> - </row> - - <!-- processingCompany --> - <row> - <cell> - <JLabel id='processingCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='processingCompany' genericType='CompanyReference'/> - </cell> - </row> - - <!-- shippingCompany --> - <row> - <cell> - <JLabel id='shippingCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/> - </cell> - </row> - <!-- brokerageCompany --> - <row> - <cell> - <JLabel id='brokerageCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/> - </cell> - </row> - - <!-- harbour --> - <row> - <cell> - <JLabel id='harbourLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JPanel layout="{new BorderLayout()}"> - <JaxxComboBox id='harbour' genericType='HarbourReference' constraints='BorderLayout.CENTER'/> - <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/> - </JPanel> - </cell> - </row> - - <!-- vessel --> - <row> - <cell> - <JLabel id='vesselLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='vessel' genericType='VesselReference'/> - </cell> - </row> - - <!-- startDate --> - <row> - <cell anchor='west'> - <JLabel id='startDateLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <DateEditor id='startDate'/> - </cell> - </row> - - <!-- endDate --> - <row> - <cell anchor='west'> - <JLabel id='endDateLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <DateEditor id='endDate'/> - </cell> - </row> - <row> - <cell fill="both" weighty="1" weightx="1" columns="2"> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JScrollPane> - </tab> - <tab id='landingPartTab' i18nProperty=""> - <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> - <LandingPartUI id="landingPartUI" constructorParams="newContext()"/> - </JPanel> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> - </JPanel> - - <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/> + <Object id="delegateContentUI" initializer="mainTabbedPane"/> + <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/> + <JButton id='selectTransshipment'/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java ===================================== @@ -52,6 +52,7 @@ class LandingUIHandler extends GeneratedLandingUIHandler { public void onInit(LandingUI ui) { super.onInit(ui); getContentOpen().initTabUI(ui.getLandingPartUI(), ui.getLandingPartPanel(), 1); + ui.getHarbour().getToolbarRight().add(ui.getSelectTransshipment()); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/actions/LandingUISelectTransshipment.java ===================================== @@ -39,7 +39,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class LandingUISelectTransshipment extends ContentUIActionSupport<LandingUI> { public LandingUISelectTransshipment() { - super(n("observe.data.ll.landing.Landing.action.selectTransshipment"), n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT); + super("", n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx ===================================== @@ -23,141 +23,130 @@ superGenericType='SampleDto, SamplePartDto, SamplePartUI' implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<SampleDto>, fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI'> - <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/> + <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/> - <import> - fr.ird.observe.dto.referential.common.SexReference - fr.ird.observe.dto.referential.common.SizeMeasureTypeReference - fr.ird.observe.dto.referential.common.LengthMeasureMethodReference - fr.ird.observe.dto.referential.common.WeightMeasureTypeReference - fr.ird.observe.dto.referential.common.WeightMeasureMethodReference - fr.ird.observe.dto.referential.common.SpeciesReference - fr.ird.observe.dto.data.ll.logbook.SamplePartDto - fr.ird.observe.dto.data.ll.logbook.SampleDto - fr.ird.observe.dto.data.AcquisitionMode - fr.ird.observe.client.datasource.editor.api.content.data.table.* + <import> + fr.ird.observe.dto.referential.common.SexReference + fr.ird.observe.dto.referential.common.SizeMeasureTypeReference + fr.ird.observe.dto.referential.common.LengthMeasureMethodReference + fr.ird.observe.dto.referential.common.WeightMeasureTypeReference + fr.ird.observe.dto.referential.common.WeightMeasureMethodReference + fr.ird.observe.dto.referential.common.SpeciesReference + fr.ird.observe.dto.data.ll.logbook.SamplePartDto + fr.ird.observe.dto.data.ll.logbook.SampleDto + fr.ird.observe.dto.data.AcquisitionMode + fr.ird.observe.client.datasource.editor.api.content.data.table.* - org.nuiton.jaxx.widgets.number.NumberEditor - io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox - org.nuiton.jaxx.widgets.text.BigTextEditor - org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel - java.awt.Dimension + org.nuiton.jaxx.widgets.number.NumberEditor + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + org.nuiton.jaxx.widgets.text.BigTextEditor + org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel + java.awt.Dimension - static fr.ird.observe.client.util.UIHelper.getStringValue - static io.ultreia.java4all.i18n.I18n.n - </import> + static fr.ird.observe.client.util.UIHelper.getStringValue + static io.ultreia.java4all.i18n.I18n.n + </import> - <script><![CDATA[ + <script><![CDATA[ @Override public ObserveSwingValidator<SampleDto> getValidator() { return getParentUI().getValidator(); } ]]></script> - <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> - <SamplePartUIModelStates id='states'/> - <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> - <SampleDto id='bean'/> - <SamplePartDto id='tableEditBean'/> + <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> + <SamplePartUIModelStates id='states'/> + <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> + <SampleDto id='bean'/> + <SamplePartDto id='tableEditBean'/> - <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto' - errorTableModel='{getErrorTableModel()}' context='update'> - </BeanValidator> + <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto' + errorTableModel='{getErrorTableModel()}' context='update'> + </BeanValidator> - <ButtonGroup id='acquisitionModeGroup'/> + <ButtonGroup id='acquisitionModeGroup'/> - <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"> - - <!-- acquisition mode - species - measure types --> - <row> - <cell columns="4"> - <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'> - <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> - </JPanel> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST"> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx='1'> - <JaxxComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> - </JPanel> - </cell> - </row> - - <!-- count --> - <!-- sex --> - <row> - <cell> - <JLabel id='countLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='count' styleClass="int6"/> - </cell> + <Table id='editorPanel' fill='both' beanScope="tableEditBean"> + <row> + <cell columns="2"> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> + </JPanel> + </cell> + <cell columns="2"> + <Table id='speciesAndMeasureTypesPanel' fill='both'> + <row> <cell> - <JLabel id='sexLabel'/> + <JLabel id='speciesLabel' styleClass="i18n"/> </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='sex' genericType='SexReference'/> + <cell weightx="1"> + <JaxxComboBox id='species' genericType='SpeciesReference'/> </cell> - </row> - - <!-- length --> - <!-- lengthMeasureMethod --> - <row> + </row> + <row> <cell> - <JLabel id='lengthLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='length' styleClass="float1"/> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> </cell> <cell> - <JLabel id='lengthMeasureMethodLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> + <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> </cell> - </row> - - <!-- weight --> - <!-- weightMeasureMethod --> - <row> + </row> + <row> <cell> - <JLabel id='weightLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='weight' styleClass="float2"/> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> </cell> <cell> - <JLabel id='weightMeasureMethodLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> + <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> </cell> - </row> - </Table> - <JPanel id="invisible"> - <JButton id="defaultSizeMeasureType"/> - <JButton id="defaultWeightMeasureType"/> - </JPanel> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <JLabel id='countLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='count' styleClass="int6" minimumSize="{new java.awt.Dimension(100,24)}"/> + </cell> + <cell> + <JLabel id='sexLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='sex' genericType='SexReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='lengthLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='length' styleClass="float1"/> + </cell> + <cell> + <JLabel id='lengthMeasureMethodLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='weight' styleClass="float2"/> + </cell> + <cell> + <JLabel id='weightMeasureMethodLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> + </cell> + </row> + </Table> + <JPanel id="invisible"> + <JButton id="defaultSizeMeasureType"/> + <JButton id="defaultWeightMeasureType"/> + </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; */ import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.ll.logbook.SampleDto; import fr.ird.observe.dto.data.ll.logbook.SamplePartDto; +import javax.swing.JTable; + public class SamplePartUITableModel extends GeneratedSamplePartUITableModel { private static final long serialVersionUID = 1L; @@ -34,6 +37,14 @@ public class SamplePartUITableModel extends GeneratedSamplePartUITableModel { super(parentUI, ui, model); } + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + UIHelper.fixTableColumnWidth(table, 1, 55); + UIHelper.fixTableColumnWidth(table, 3, 55); + UIHelper.fixTableColumnWidth(table, 5, 55); + } + @Override protected void onSelectedRowChanged(SamplePartUI ui, int editingRow, SamplePartDto tableEditBean, SamplePartDto previousRowBean, boolean notPersisted, boolean newRow) { ui.getHandler().onSelectedRowChanged(tableEditBean, previousRowBean, notPersisted, newRow); ===================================== models/definition/src/main/models/Observe/dto/attribute/notNull.properties ===================================== @@ -33,7 +33,6 @@ data.ll.common.Trip.attribute.tripType=true data.ll.common.Trip.attribute.vessel=true data.ll.landing.Landing.attribute.harbour=true data.ll.landing.LandingPart.attribute.species=true -data.ll.landing.LandingPart.attribute.weight=true data.ll.logbook.Activity.attribute.startTimeStamp=true data.ll.logbook.Activity.attribute.vesselActivity=true data.ll.logbook.ActivitySample.attribute.timeStamp=true ===================================== models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -21,6 +21,8 @@ ### data.ll.common.Trip.attribute.logbookDataEntryOperator=!logbookAvailability data.ll.common.Trip.attribute.observer=!observationsAvailability +data.ll.landing.LandingPart.attribute.count=weight != null && weight > 0 +data.ll.landing.LandingPart.attribute.weight=count != null && count > 0 data.ll.landing.LandingPart.attribute.weightMeasureMethod=weight == null || weight == 0 data.ll.logbook.Catch.attribute.count=acquisitionMode == 1 && totalWeight != null data.ll.logbook.Catch.attribute.totalWeight=acquisitionMode == 1 && count != null ===================================== models/definition/src/main/models/Observe/persistence/attribute/notNull.properties ===================================== @@ -34,7 +34,6 @@ data.ll.common.Trip.attribute.tripType=true data.ll.common.Trip.attribute.vessel=true data.ll.landing.Landing.attribute.harbour=true data.ll.landing.LandingPart.attribute.species=true -data.ll.landing.LandingPart.attribute.weight=true data.ll.logbook.Activity.attribute.startTimeStamp=true data.ll.logbook.Activity.attribute.vesselActivity=true data.ll.logbook.BaitsComposition.attribute.baitType=true ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/14_add_missing_not_null-common.sql ===================================== @@ -65,7 +65,6 @@ ALTER TABLE ll_common.Trip ALTER COLUMN tripType SET NOT NULL; ALTER TABLE ll_common.Trip ALTER COLUMN vessel SET NOT NULL; ALTER TABLE ll_landing.Landing ALTER COLUMN harbour SET NOT NULL; ALTER TABLE ll_landing.LandingPart ALTER COLUMN species SET NOT NULL; -ALTER TABLE ll_landing.LandingPart ALTER COLUMN weight SET NOT NULL; ALTER TABLE ll_logbook.Activity ALTER COLUMN startTimeStamp SET NOT NULL; ALTER TABLE ll_logbook.Activity ALTER COLUMN vesselActivity SET NOT NULL; ALTER TABLE ll_logbook.BaitsComposition ALTER COLUMN baitType SET NOT NULL; ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-H2.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-PG.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-H2.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-PG.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insert this landing part observe.data.ll.landing.LandingPart.action.save.tip=Insert this landing part observe.data.ll.landing.LandingPart.count=Count observe.data.ll.landing.LandingPart.count.short=Count +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.title=Landing observe.data.ll.landing.LandingPart.type=Lnading part observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category. observe.data.ll.landing.LandingPart.weight=Weight (Kg) observe.data.ll.landing.LandingPart.weight.short=Weight +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Next activity observe.data.ll.logbook.Activity.action.move=Change trip @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insert this sample part observe.data.ll.logbook.SamplePart.count=Count observe.data.ll.logbook.SamplePart.count.short=Count observe.data.ll.logbook.SamplePart.length=Length (cm) -observe.data.ll.logbook.SamplePart.length.short=Length (cm) +observe.data.ll.logbook.SamplePart.length.short=Length observe.data.ll.logbook.SamplePart.length.validation.required=Size must be filled. observe.data.ll.logbook.SamplePart.title=Sample observe.data.ll.logbook.SamplePart.type=Sample part observe.data.ll.logbook.SamplePart.weight=Weight (kg) -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg) +observe.data.ll.logbook.SamplePart.weight.short=Weight observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled. observe.data.ll.logbook.Set.action.add=Add the fishing operation observe.data.ll.logbook.Set.action.add.tip=Add the fishing operation associated with this activity ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insertar este landing part \#TOD observe.data.ll.landing.LandingPart.action.save.tip=Créer un nouveau Débarquement observe.data.ll.landing.LandingPart.count=Nombre observe.data.ll.landing.LandingPart.count.short=Nombre +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.title=Landing observe.data.ll.landing.LandingPart.type=LandingPart observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category. observe.data.ll.landing.LandingPart.weight=Peso (Kg) observe.data.ll.landing.LandingPart.weight.short=Poids +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Actividad siguiente observe.data.ll.logbook.Activity.action.move=Cambiar de marea @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insert this sample part\#TODO observe.data.ll.logbook.SamplePart.count=Numero observe.data.ll.logbook.SamplePart.count.short=Count \#TODO observe.data.ll.logbook.SamplePart.length=Talla (cm) -observe.data.ll.logbook.SamplePart.length.short=Length (cm) \#TODO +observe.data.ll.logbook.SamplePart.length.short=Length \#TODO observe.data.ll.logbook.SamplePart.length.validation.required=Size or weight must be filled. \#TODO observe.data.ll.logbook.SamplePart.title=Samples \#TODO observe.data.ll.logbook.SamplePart.type=SamplePart observe.data.ll.logbook.SamplePart.weight=Peso (kg) -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg) \#TODO +observe.data.ll.logbook.SamplePart.weight.short=Weight \#TODO observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled. \#TODO observe.data.ll.logbook.Set.action.add=Añadir la operación de pesca observe.data.ll.logbook.Set.action.add.tip=Añadir la operación de pesca asociada a esta actividad ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insérer cette donnée observe.data.ll.landing.LandingPart.action.save.tip=Insérer cette donnée observe.data.ll.landing.LandingPart.count=Nombre observe.data.ll.landing.LandingPart.count.short=Nombre +observe.data.ll.landing.LandingPart.count.validation.required=Le nombre ou le poids est obligatoire. observe.data.ll.landing.LandingPart.title=Débarquements observe.data.ll.landing.LandingPart.type=Donnée de débarquement observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=La catégorie de poids max doit être strictement supérieur à la catégorie min. observe.data.ll.landing.LandingPart.weight=Poids (Kg) observe.data.ll.landing.LandingPart.weight.short=Poids +observe.data.ll.landing.LandingPart.weight.validation.required=Le nombre ou le poids est obligatoire. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Activité suivante observe.data.ll.logbook.Activity.action.move=Changer de marée @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insérer cette donnée observe.data.ll.logbook.SamplePart.count=Effectif observe.data.ll.logbook.SamplePart.count.short=Effectif observe.data.ll.logbook.SamplePart.length=Taille (cm) -observe.data.ll.logbook.SamplePart.length.short=Taille (cm) +observe.data.ll.logbook.SamplePart.length.short=Taille observe.data.ll.logbook.SamplePart.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ll.logbook.SamplePart.title=Échantillons observe.data.ll.logbook.SamplePart.type=Donnée d'échantillonage observe.data.ll.logbook.SamplePart.weight=Poids (kg) -observe.data.ll.logbook.SamplePart.weight.short=Poids (kg) +observe.data.ll.logbook.SamplePart.weight.short=Poids observe.data.ll.logbook.SamplePart.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ll.logbook.Set.action.add=Ajouter l'opération de pêche observe.data.ll.logbook.Set.action.add.tip=Ajouter l'opération de pêche associée à cette activité ===================================== services/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -200,6 +200,7 @@ observe.data.ll.common.Trip.species observe.data.ll.common.Trip.tripType observe.data.ll.landing.Landing.dataSource observe.data.ll.landing.Landing.person +observe.data.ll.landing.LandingPart.count observe.data.ll.landing.LandingPart.weight observe.data.ll.logbook.ActivitySample.samplePart observe.data.ll.logbook.BranchlinesComposition.length ===================================== services/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -49,7 +49,9 @@ observe.data.ll.Set.validation.duplicated.number observe.data.ll.Set.validation.haulingEndTimeStamp.after.haulingStartTimeStamp observe.data.ll.Set.validation.haulingStartTimeStamp.after.settingEndTimeStamp observe.data.ll.Set.validation.settingEndTimeStamp.after.settingStartTimeStamp +observe.data.ll.landing.LandingPart.count.validation.required observe.data.ll.landing.LandingPart.validation.bound.categoryWeight +observe.data.ll.landing.LandingPart.weight.validation.required observe.data.ll.logbook.Catch.count.validation.required observe.data.ll.logbook.Catch.totalWeight.validation.required observe.data.ll.logbook.SamplePart.length.validation.required View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/320cbfff223296b4ec470926c... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/320cbfff223296b4ec470926c... You're receiving this email because of your account on gitlab.com.