Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

19 changed files:

Changes:

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUITableModel.java
    1 
    +package fr.ird.observe.client.datasource.editor.ll.data.landing;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe Client :: DataSource :: Editor :: LL
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI;
    26 
    +import fr.ird.observe.client.util.UIHelper;
    27 
    +import fr.ird.observe.dto.data.ll.landing.LandingDto;
    28 
    +
    29 
    +import javax.swing.JTable;
    30 
    +
    31 
    +/**
    32 
    + * Created on 10/10/2021.
    33 
    + *
    34 
    + * @author Tony Chemit - dev@tchemit.fr
    35 
    + * @since 9.0.0
    36 
    + */
    37 
    +public class LandingPartUITableModel extends GeneratedLandingPartUITableModel {
    38 
    +
    39 
    +    private static final long serialVersionUID = 1L;
    40 
    +
    41 
    +    public LandingPartUITableModel(EditableContentUI<LandingDto> parentUi, LandingPartUI ui, LandingPartUIModel model) {
    42 
    +        super(parentUi, ui, model);
    43 
    +    }
    44 
    +
    45 
    +    @Override
    46 
    +    public void initTableUISize(JTable table) {
    47 
    +        super.initTableUISize(table);
    48 
    +        UIHelper.fixTableColumnWidth(table, 1, 75);
    49 
    +        UIHelper.fixTableColumnWidth(table, 2, 75);
    50 
    +        UIHelper.fixTableColumnWidth(table, 3, 75);
    51 
    +        UIHelper.fixTableColumnWidth(table, 4, 75);
    52 
    +    }
    53 
    +}

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx
    ... ... @@ -18,159 +18,138 @@
    18 18 
       #L%
    19 19 
       -->
    20 20 
     <fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI
    21 
    -        beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'>
    21 
    +    beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'>
    22 22
    23 
    -    <import>
    24 
    -        fr.ird.observe.dto.data.ll.landing.LandingDto
    25 
    -        fr.ird.observe.dto.data.ll.landing.LandingPartDto
    26 
    -        fr.ird.observe.dto.referential.common.DataQualityReference
    27 
    -        fr.ird.observe.dto.referential.common.HarbourReference
    28 
    -        fr.ird.observe.dto.referential.common.PersonReference
    29 
    -        fr.ird.observe.dto.referential.common.SpeciesReference
    30 
    -        fr.ird.observe.dto.referential.common.VesselReference
    31 
    -        fr.ird.observe.dto.referential.ll.landing.DataSourceReference
    32 
    -        fr.ird.observe.dto.referential.ll.landing.CompanyReference
    23 
    +  <import>
    24 
    +    fr.ird.observe.dto.data.ll.landing.LandingDto
    25 
    +    fr.ird.observe.dto.data.ll.landing.LandingPartDto
    26 
    +    fr.ird.observe.dto.referential.common.DataQualityReference
    27 
    +    fr.ird.observe.dto.referential.common.HarbourReference
    28 
    +    fr.ird.observe.dto.referential.common.PersonReference
    29 
    +    fr.ird.observe.dto.referential.common.SpeciesReference
    30 
    +    fr.ird.observe.dto.referential.common.VesselReference
    31 
    +    fr.ird.observe.dto.referential.ll.landing.DataSourceReference
    32 
    +    fr.ird.observe.dto.referential.ll.landing.CompanyReference
    33 33
    34 
    -        fr.ird.observe.client.ObserveSwingApplicationContext
    35 
    -        org.nuiton.jaxx.widgets.datetime.DateEditor
    34 
    +    fr.ird.observe.client.ObserveSwingApplicationContext
    35 
    +    org.nuiton.jaxx.widgets.datetime.DateEditor
    36 36
    37 
    -        org.nuiton.jaxx.widgets.text.BigTextEditor
    38 
    -        org.nuiton.jaxx.widgets.number.NumberEditor
    39 
    -        io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    40 
    -        java.util.Collection
    37 
    +    org.nuiton.jaxx.widgets.text.BigTextEditor
    38 
    +    org.nuiton.jaxx.widgets.number.NumberEditor
    39 
    +    io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    40 
    +    java.util.Collection
    41 41
    42 
    -        static fr.ird.observe.client.util.UIHelper.getStringValue
    43 
    -        static io.ultreia.java4all.i18n.I18n.n
    44 
    -    </import>
    42 
    +    static fr.ird.observe.client.util.UIHelper.getStringValue
    43 
    +    static io.ultreia.java4all.i18n.I18n.n
    44 
    +  </import>
    45 45
    46 
    -    <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/>
    47 
    -    <LandingUIModelStates id='states'/>
    48 
    -    <LandingDto id='bean'/>
    49 
    -    <BeanValidator id='validator' context='update' autoField='true'
    50 
    -                   beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto'
    51 
    -                   errorTableModel='{getErrorTableModel()}'>
    52 
    -        <field name='landingPart' component='landingPartPanel'/>
    53 
    -    </BeanValidator>
    46 
    +  <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/>
    47 
    +  <LandingUIModelStates id='states'/>
    48 
    +  <LandingDto id='bean'/>
    49 
    +  <BeanValidator id='validator' context='update' autoField='true'
    50 
    +                 beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto'
    51 
    +                 errorTableModel='{getErrorTableModel()}'>
    52 
    +    <field name='landingPart' component='landingPartPanel'/>
    53 
    +  </BeanValidator>
    54 54
    55 
    -    <JPanel id="contentBody" layout='{new BorderLayout()}'>
    56 
    -        <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
    57 
    -            <row>
    58 
    -                <cell weightx="1" weighty="1">
    59 
    -                    <JTabbedPane id='mainTabbedPane'>
    60 
    -                        <tab id='characteristicsTab' i18nProperty="">
    61 
    -                            <JScrollPane id="characteristicsTabScrollPane">
    62 
    -                                <Table fill='both' insets="0">
    55 
    +  <JPanel id="contentBody" layout='{new BorderLayout()}'>
    56 
    +    <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
    57 
    +      <row>
    58 
    +        <cell weightx="1" weighty="1">
    59 
    +          <JTabbedPane id='mainTabbedPane'>
    60 
    +            <tab id='characteristicsTab' i18nProperty="">
    61 
    +              <Table fill='both'>
    62 
    +                <row>
    63 
    +                  <cell>
    64 
    +                    <JLabel id='dataSourceLabel'/>
    65 
    +                  </cell>
    66 
    +                  <cell weightx='1' anchor='east'>
    67 
    +                    <JaxxComboBox id='dataSource' genericType='DataSourceReference'/>
    68 
    +                  </cell>
    69 
    +                </row>
    70 
    +                <row>
    71 
    +                  <cell>
    72 
    +                    <JLabel id='personLabel'/>
    73 
    +                  </cell>
    74 
    +                  <cell weightx='1' anchor='east'>
    75 
    +                    <JaxxComboBox id='person' genericType='PersonReference'/>
    76 
    +                  </cell>
    77 
    +                </row>
    78 
    +                <row>
    79 
    +                  <cell>
    80 
    +                    <JLabel id='processingCompanyLabel'/>
    81 
    +                  </cell>
    82 
    +                  <cell weightx='1' anchor='east'>
    83 
    +                    <JaxxComboBox id='processingCompany' genericType='CompanyReference'/>
    84 
    +                  </cell>
    85 
    +                </row>
    86 
    +                <row>
    87 
    +                  <cell>
    88 
    +                    <JLabel id='shippingCompanyLabel'/>
    89 
    +                  </cell>
    90 
    +                  <cell weightx='1' anchor='east'>
    91 
    +                    <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/>
    92 
    +                  </cell>
    93 
    +                </row>
    94 
    +                <row>
    95 
    +                  <cell>
    96 
    +                    <JLabel id='brokerageCompanyLabel'/>
    97 
    +                  </cell>
    98 
    +                  <cell weightx='1' anchor='east'>
    99 
    +                    <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/>
    100 
    +                  </cell>
    101 
    +                </row>
    102 
    +                <row>
    103 
    +                  <cell>
    104 
    +                    <JLabel id='harbourLabel'/>
    105 
    +                  </cell>
    106 
    +                  <cell weightx='1' anchor='east'>
    107 
    +                    <JaxxComboBox id='harbour' genericType='HarbourReference'/>
    108 
    +                  </cell>
    109 
    +                </row>
    110 
    +                <row>
    111 
    +                  <cell>
    112 
    +                    <JLabel id='vesselLabel'/>
    113 
    +                  </cell>
    114 
    +                  <cell weightx='1' anchor='east'>
    115 
    +                    <JaxxComboBox id='vessel' genericType='VesselReference'/>
    116 
    +                  </cell>
    117 
    +                </row>
    118 
    +                <row>
    119 
    +                  <cell anchor='west'>
    120 
    +                    <JLabel id='startDateLabel'/>
    121 
    +                  </cell>
    122 
    +                  <cell anchor='east' weightx="1">
    123 
    +                    <DateEditor id='startDate'/>
    124 
    +                  </cell>
    125 
    +                </row>
    126 
    +                <row>
    127 
    +                  <cell anchor='west'>
    128 
    +                    <JLabel id='endDateLabel'/>
    129 
    +                  </cell>
    130 
    +                  <cell anchor='east' weightx="1">
    131 
    +                    <DateEditor id='endDate'/>
    132 
    +                  </cell>
    133 
    +                </row>
    134 
    +                <row>
    135 
    +                  <cell fill="both" weighty="1" columns="2">
    136 
    +                    <BigTextEditor id="comment"/>
    137 
    +                  </cell>
    138 
    +                </row>
    139 
    +              </Table>
    140 
    +            </tab>
    141 
    +            <tab id='landingPartTab' i18nProperty="">
    142 
    +              <JPanel id="landingPartPanel" layout='{new BorderLayout()}'>
    143 
    +                <LandingPartUI id="landingPartUI" constructorParams="newContext()"/>
    144 
    +              </JPanel>
    145 
    +            </tab>
    146 
    +          </JTabbedPane>
    147 
    +        </cell>
    148 
    +      </row>
    149 
    +    </Table>
    150 
    +  </JPanel>
    63 151
    64 
    -                                    <!-- dataSource -->
    65 
    -                                    <row>
    66 
    -                                        <cell>
    67 
    -                                            <JLabel id='dataSourceLabel'/>
    68 
    -                                        </cell>
    69 
    -                                        <cell weightx='1' anchor='east'>
    70 
    -                                            <JaxxComboBox id='dataSource' genericType='DataSourceReference'/>
    71 
    -                                        </cell>
    72 
    -                                    </row>
    73 
    -
    74 
    -                                    <!-- person -->
    75 
    -                                    <row>
    76 
    -                                        <cell>
    77 
    -                                            <JLabel id='personLabel'/>
    78 
    -                                        </cell>
    79 
    -                                        <cell weightx='1' anchor='east'>
    80 
    -                                            <JaxxComboBox id='person' genericType='PersonReference'/>
    81 
    -                                        </cell>
    82 
    -                                    </row>
    83 
    -
    84 
    -                                    <!-- processingCompany -->
    85 
    -                                    <row>
    86 
    -                                        <cell>
    87 
    -                                            <JLabel id='processingCompanyLabel'/>
    88 
    -                                        </cell>
    89 
    -                                        <cell weightx='1' anchor='east'>
    90 
    -                                            <JaxxComboBox id='processingCompany' genericType='CompanyReference'/>
    91 
    -                                        </cell>
    92 
    -                                    </row>
    93 
    -
    94 
    -                                    <!-- shippingCompany -->
    95 
    -                                    <row>
    96 
    -                                        <cell>
    97 
    -                                            <JLabel id='shippingCompanyLabel'/>
    98 
    -                                        </cell>
    99 
    -                                        <cell weightx='1' anchor='east'>
    100 
    -                                            <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/>
    101 
    -                                        </cell>
    102 
    -                                    </row>
    103 
    -                                    <!-- brokerageCompany -->
    104 
    -                                    <row>
    105 
    -                                        <cell>
    106 
    -                                            <JLabel id='brokerageCompanyLabel'/>
    107 
    -                                        </cell>
    108 
    -                                        <cell weightx='1' anchor='east'>
    109 
    -                                            <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/>
    110 
    -                                        </cell>
    111 
    -                                    </row>
    112 
    -
    113 
    -                                    <!-- harbour -->
    114 
    -                                    <row>
    115 
    -                                        <cell>
    116 
    -                                            <JLabel id='harbourLabel'/>
    117 
    -                                        </cell>
    118 
    -                                        <cell weightx='1' anchor='east'>
    119 
    -                                            <JPanel layout="{new BorderLayout()}">
    120 
    -                                                <JaxxComboBox id='harbour' genericType='HarbourReference' constraints='BorderLayout.CENTER'/>
    121 
    -                                                <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/>
    122 
    -                                            </JPanel>
    123 
    -                                        </cell>
    124 
    -                                    </row>
    125 
    -
    126 
    -                                    <!-- vessel -->
    127 
    -                                    <row>
    128 
    -                                        <cell>
    129 
    -                                            <JLabel id='vesselLabel'/>
    130 
    -                                        </cell>
    131 
    -                                        <cell weightx='1' anchor='east'>
    132 
    -                                            <JaxxComboBox id='vessel' genericType='VesselReference'/>
    133 
    -                                        </cell>
    134 
    -                                    </row>
    135 
    -
    136 
    -                                    <!-- startDate -->
    137 
    -                                    <row>
    138 
    -                                        <cell anchor='west'>
    139 
    -                                            <JLabel id='startDateLabel'/>
    140 
    -                                        </cell>
    141 
    -                                        <cell anchor='east' weightx="1">
    142 
    -                                            <DateEditor id='startDate'/>
    143 
    -                                        </cell>
    144 
    -                                    </row>
    145 
    -
    146 
    -                                    <!-- endDate -->
    147 
    -                                    <row>
    148 
    -                                        <cell anchor='west'>
    149 
    -                                            <JLabel id='endDateLabel'/>
    150 
    -                                        </cell>
    151 
    -                                        <cell anchor='east' weightx="1">
    152 
    -                                            <DateEditor id='endDate'/>
    153 
    -                                        </cell>
    154 
    -                                    </row>
    155 
    -                                    <row>
    156 
    -                                        <cell fill="both" weighty="1" weightx="1" columns="2">
    157 
    -                                            <BigTextEditor id="comment"/>
    158 
    -                                        </cell>
    159 
    -                                    </row>
    160 
    -                                </Table>
    161 
    -                            </JScrollPane>
    162 
    -                        </tab>
    163 
    -                        <tab id='landingPartTab' i18nProperty="">
    164 
    -                            <JPanel id="landingPartPanel" layout='{new BorderLayout()}'>
    165 
    -                                <LandingPartUI id="landingPartUI" constructorParams="newContext()"/>
    166 
    -                            </JPanel>
    167 
    -                        </tab>
    168 
    -                    </JTabbedPane>
    169 
    -                </cell>
    170 
    -            </row>
    171 
    -        </Table>
    172 
    -    </JPanel>
    173 
    -
    174 
    -    <Object id="delegateContentUI" initializer="mainTabbedPane"/>
    175 
    -    <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/>
    152 
    +  <Object id="delegateContentUI" initializer="mainTabbedPane"/>
    153 
    +  <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/>
    154 
    +  <JButton id='selectTransshipment'/>
    176 155 
     </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 {
    52 52 
         public void onInit(LandingUI ui) {
    53 53 
             super.onInit(ui);
    54 54 
             getContentOpen().initTabUI(ui.getLandingPartUI(), ui.getLandingPartPanel(), 1);
    55 
    +        ui.getHarbour().getToolbarRight().add(ui.getSelectTransshipment());
    55 56 
         }
    56 57
    57 58 
         @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;
    39 39 
     public class LandingUISelectTransshipment extends ContentUIActionSupport<LandingUI> {
    40 40
    41 41 
         public LandingUISelectTransshipment() {
    42 
    -        super(n("observe.data.ll.landing.Landing.action.selectTransshipment"), n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT);
    42 
    +        super("", n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT);
    43 43 
         }
    44 44
    45 45 
         @Override

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx
    ... ... @@ -23,141 +23,130 @@
    23 23 
                                                                                    superGenericType='SampleDto, SamplePartDto, SamplePartUI'
    24 24 
                                                                                    implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI&lt;SampleDto&gt;, fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI'>
    25 25
    26 
    -    <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/>
    26 
    +  <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/>
    27 27
    28 
    -    <import>
    29 
    -      fr.ird.observe.dto.referential.common.SexReference
    30 
    -      fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
    31 
    -      fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    32 
    -      fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    33 
    -      fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    34 
    -      fr.ird.observe.dto.referential.common.SpeciesReference
    35 
    -      fr.ird.observe.dto.data.ll.logbook.SamplePartDto
    36 
    -      fr.ird.observe.dto.data.ll.logbook.SampleDto
    37 
    -      fr.ird.observe.dto.data.AcquisitionMode
    38 
    -      fr.ird.observe.client.datasource.editor.api.content.data.table.*
    28 
    +  <import>
    29 
    +    fr.ird.observe.dto.referential.common.SexReference
    30 
    +    fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
    31 
    +    fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
    32 
    +    fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
    33 
    +    fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    34 
    +    fr.ird.observe.dto.referential.common.SpeciesReference
    35 
    +    fr.ird.observe.dto.data.ll.logbook.SamplePartDto
    36 
    +    fr.ird.observe.dto.data.ll.logbook.SampleDto
    37 
    +    fr.ird.observe.dto.data.AcquisitionMode
    38 
    +    fr.ird.observe.client.datasource.editor.api.content.data.table.*
    39 39
    40 
    -      org.nuiton.jaxx.widgets.number.NumberEditor
    41 
    -      io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    42 
    -      org.nuiton.jaxx.widgets.text.BigTextEditor
    43 
    -      org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
    44 
    -      java.awt.Dimension
    40 
    +    org.nuiton.jaxx.widgets.number.NumberEditor
    41 
    +    io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox
    42 
    +    org.nuiton.jaxx.widgets.text.BigTextEditor
    43 
    +    org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
    44 
    +    java.awt.Dimension
    45 45
    46 
    -      static fr.ird.observe.client.util.UIHelper.getStringValue
    47 
    -      static io.ultreia.java4all.i18n.I18n.n
    48 
    -    </import>
    46 
    +    static fr.ird.observe.client.util.UIHelper.getStringValue
    47 
    +    static io.ultreia.java4all.i18n.I18n.n
    48 
    +  </import>
    49 49
    50 
    -    <script><![CDATA[
    50 
    +  <script><![CDATA[
    51 51 
         @Override
    52 52 
         public ObserveSwingValidator<SampleDto> getValidator() {
    53 53 
             return getParentUI().getValidator();
    54 54 
         }
    55 55 
     ]]></script>
    56 
    -    <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/>
    57 
    -    <SamplePartUIModelStates id='states'/>
    58 
    -    <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/>
    59 
    -    <SampleDto id='bean'/>
    60 
    -    <SamplePartDto id='tableEditBean'/>
    56 
    +  <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/>
    57 
    +  <SamplePartUIModelStates id='states'/>
    58 
    +  <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/>
    59 
    +  <SampleDto id='bean'/>
    60 
    +  <SamplePartDto id='tableEditBean'/>
    61 61
    62 
    -    <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto'
    63 
    -                   errorTableModel='{getErrorTableModel()}' context='update'>
    64 
    -    </BeanValidator>
    62 
    +  <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto'
    63 
    +                 errorTableModel='{getErrorTableModel()}' context='update'>
    64 
    +  </BeanValidator>
    65 65
    66 
    -    <ButtonGroup id='acquisitionModeGroup'/>
    66 
    +  <ButtonGroup id='acquisitionModeGroup'/>
    67 67
    68 
    -    <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean">
    69 
    -
    70 
    -        <!-- acquisition mode - species - measure types -->
    71 
    -        <row>
    72 
    -            <cell columns="4">
    73 
    -                <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    74 
    -                    <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    75 
    -                        <JRadioButton id='acquisitionModeNumber'/>
    76 
    -                        <JRadioButton id='acquisitionModeIndividual'/>
    77 
    -                    </JPanel>
    78 
    -                    <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    79 
    -                        <row>
    80 
    -                            <cell>
    81 
    -                                <JLabel id='speciesLabel' styleClass="i18n"/>
    82 
    -                            </cell>
    83 
    -                            <cell weightx='1'>
    84 
    -                                <JaxxComboBox id='species' genericType='SpeciesReference'/>
    85 
    -                            </cell>
    86 
    -                        </row>
    87 
    -                        <row>
    88 
    -                            <cell>
    89 
    -                                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    90 
    -                            </cell>
    91 
    -                            <cell>
    92 
    -                                <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    93 
    -                            </cell>
    94 
    -                        </row>
    95 
    -                        <row>
    96 
    -                            <cell>
    97 
    -                                <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    98 
    -                            </cell>
    99 
    -                            <cell>
    100 
    -                                <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    101 
    -                            </cell>
    102 
    -                        </row>
    103 
    -                    </Table>
    104 
    -                </JPanel>
    105 
    -            </cell>
    106 
    -        </row>
    107 
    -
    108 
    -        <!-- count -->
    109 
    -        <!-- sex -->
    110 
    -        <row>
    111 
    -            <cell>
    112 
    -                <JLabel id='countLabel'/>
    113 
    -            </cell>
    114 
    -            <cell weightx='1' anchor='east'>
    115 
    -                <NumberEditor id='count' styleClass="int6"/>
    116 
    -            </cell>
    68 
    +  <Table id='editorPanel' fill='both' beanScope="tableEditBean">
    69 
    +    <row>
    70 
    +      <cell columns="2">
    71 
    +        <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    72 
    +          <JRadioButton id='acquisitionModeNumber'/>
    73 
    +          <JRadioButton id='acquisitionModeIndividual'/>
    74 
    +        </JPanel>
    75 
    +      </cell>
    76 
    +      <cell columns="2">
    77 
    +        <Table id='speciesAndMeasureTypesPanel' fill='both'>
    78 
    +          <row>
    117 79 
                 <cell>
    118 
    -                <JLabel id='sexLabel'/>
    80 
    +              <JLabel id='speciesLabel' styleClass="i18n"/>
    119 81 
                 </cell>
    120 
    -            <cell weightx='1' anchor='east'>
    121 
    -                <JaxxComboBox id='sex' genericType='SexReference'/>
    82 
    +            <cell weightx="1">
    83 
    +              <JaxxComboBox   id='species' genericType='SpeciesReference'/>
    122 84 
                 </cell>
    123 
    -        </row>
    124 
    -
    125 
    -        <!-- length -->
    126 
    -        <!-- lengthMeasureMethod -->
    127 
    -        <row>
    85 
    +          </row>
    86 
    +          <row>
    128 87 
                 <cell>
    129 
    -                <JLabel id='lengthLabel'/>
    130 
    -            </cell>
    131 
    -            <cell weightx='1' anchor='east'>
    132 
    -                <NumberEditor id='length' styleClass="float1"/>
    88 
    +              <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    133 89 
                 </cell>
    134 90 
                 <cell>
    135 
    -                <JLabel id='lengthMeasureMethodLabel'/>
    136 
    -            </cell>
    137 
    -            <cell weightx='1' anchor='east'>
    138 
    -                <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/>
    91 
    +              <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    139 92 
                 </cell>
    140 
    -        </row>
    141 
    -
    142 
    -        <!-- weight -->
    143 
    -        <!-- weightMeasureMethod -->
    144 
    -        <row>
    93 
    +          </row>
    94 
    +          <row>
    145 95 
                 <cell>
    146 
    -                <JLabel id='weightLabel'/>
    147 
    -            </cell>
    148 
    -            <cell weightx='1' anchor='east'>
    149 
    -                <NumberEditor id='weight' styleClass="float2"/>
    96 
    +              <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    150 97 
                 </cell>
    151 98 
                 <cell>
    152 
    -                <JLabel id='weightMeasureMethodLabel'/>
    153 
    -            </cell>
    154 
    -            <cell weightx='1' anchor='east'>
    155 
    -                <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    99 
    +              <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    156 100 
                 </cell>
    157 
    -        </row>
    158 
    -    </Table>
    159 
    -    <JPanel id="invisible">
    160 
    -        <JButton id="defaultSizeMeasureType"/>
    161 
    -        <JButton id="defaultWeightMeasureType"/>
    162 
    -    </JPanel>
    101 
    +          </row>
    102 
    +        </Table>
    103 
    +      </cell>
    104 
    +    </row>
    105 
    +    <row>
    106 
    +      <cell>
    107 
    +        <JLabel id='countLabel'/>
    108 
    +      </cell>
    109 
    +      <cell anchor='east'>
    110 
    +        <NumberEditor id='count' styleClass="int6" minimumSize="{new java.awt.Dimension(100,24)}"/>
    111 
    +      </cell>
    112 
    +      <cell>
    113 
    +        <JLabel id='sexLabel'/>
    114 
    +      </cell>
    115 
    +      <cell weightx='1' anchor='east'>
    116 
    +        <JaxxComboBox id='sex' genericType='SexReference'/>
    117 
    +      </cell>
    118 
    +    </row>
    119 
    +    <row>
    120 
    +      <cell>
    121 
    +        <JLabel id='lengthLabel'/>
    122 
    +      </cell>
    123 
    +      <cell anchor='east'>
    124 
    +        <NumberEditor id='length' styleClass="float1"/>
    125 
    +      </cell>
    126 
    +      <cell>
    127 
    +        <JLabel id='lengthMeasureMethodLabel'/>
    128 
    +      </cell>
    129 
    +      <cell weightx='1' anchor='east'>
    130 
    +        <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/>
    131 
    +      </cell>
    132 
    +    </row>
    133 
    +    <row>
    134 
    +      <cell>
    135 
    +        <JLabel id='weightLabel'/>
    136 
    +      </cell>
    137 
    +      <cell anchor='east'>
    138 
    +        <NumberEditor id='weight' styleClass="float2"/>
    139 
    +      </cell>
    140 
    +      <cell>
    141 
    +        <JLabel id='weightMeasureMethodLabel'/>
    142 
    +      </cell>
    143 
    +      <cell weightx='1' anchor='east'>
    144 
    +        <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    145 
    +      </cell>
    146 
    +    </row>
    147 
    +  </Table>
    148 
    +  <JPanel id="invisible">
    149 
    +    <JButton id="defaultSizeMeasureType"/>
    150 
    +    <JButton id="defaultWeightMeasureType"/>
    151 
    +  </JPanel>
    163 152 
     </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;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI;
    26 
    +import fr.ird.observe.client.util.UIHelper;
    26 27 
     import fr.ird.observe.dto.data.ll.logbook.SampleDto;
    27 28 
     import fr.ird.observe.dto.data.ll.logbook.SamplePartDto;
    28 29
    30 
    +import javax.swing.JTable;
    31 
    +
    29 32 
     public class SamplePartUITableModel extends GeneratedSamplePartUITableModel {
    30 33
    31 34 
         private static final long serialVersionUID = 1L;
    ... ... @@ -34,6 +37,14 @@ public class SamplePartUITableModel extends GeneratedSamplePartUITableModel {
    34 37 
             super(parentUI, ui, model);
    35 38 
         }
    36 39
    40 
    +    @Override
    41 
    +    public void initTableUISize(JTable table) {
    42 
    +        super.initTableUISize(table);
    43 
    +        UIHelper.fixTableColumnWidth(table, 1, 55);
    44 
    +        UIHelper.fixTableColumnWidth(table, 3, 55);
    45 
    +        UIHelper.fixTableColumnWidth(table, 5, 55);
    46 
    +    }
    47 
    +
    37 48 
         @Override
    38 49 
         protected void onSelectedRowChanged(SamplePartUI ui, int editingRow, SamplePartDto tableEditBean, SamplePartDto previousRowBean, boolean notPersisted, boolean newRow) {
    39 50 
             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
    33 33 
     data.ll.common.Trip.attribute.vessel=true
    34 34 
     data.ll.landing.Landing.attribute.harbour=true
    35 35 
     data.ll.landing.LandingPart.attribute.species=true
    36 
    -data.ll.landing.LandingPart.attribute.weight=true
    37 36 
     data.ll.logbook.Activity.attribute.startTimeStamp=true
    38 37 
     data.ll.logbook.Activity.attribute.vesselActivity=true
    39 38 
     data.ll.logbook.ActivitySample.attribute.timeStamp=true

  • models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties
    ... ... @@ -21,6 +21,8 @@
    21 21 
     ###
    22 22 
     data.ll.common.Trip.attribute.logbookDataEntryOperator=!logbookAvailability
    23 23 
     data.ll.common.Trip.attribute.observer=!observationsAvailability
    24 
    +data.ll.landing.LandingPart.attribute.count=weight != null && weight > 0
    25 
    +data.ll.landing.LandingPart.attribute.weight=count != null && count > 0
    24 26 
     data.ll.landing.LandingPart.attribute.weightMeasureMethod=weight == null || weight == 0
    25 27 
     data.ll.logbook.Catch.attribute.count=acquisitionMode == 1 && totalWeight != null
    26 28 
     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
    34 34 
     data.ll.common.Trip.attribute.vessel=true
    35 35 
     data.ll.landing.Landing.attribute.harbour=true
    36 36 
     data.ll.landing.LandingPart.attribute.species=true
    37 
    -data.ll.landing.LandingPart.attribute.weight=true
    38 37 
     data.ll.logbook.Activity.attribute.startTimeStamp=true
    39 38 
     data.ll.logbook.Activity.attribute.vesselActivity=true
    40 39 
     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;
    65 65 
     ALTER TABLE ll_common.Trip ALTER COLUMN vessel SET NOT NULL;
    66 66 
     ALTER TABLE ll_landing.Landing ALTER COLUMN harbour SET NOT NULL;
    67 67 
     ALTER TABLE ll_landing.LandingPart ALTER COLUMN species SET NOT NULL;
    68 
    -ALTER TABLE ll_landing.LandingPart ALTER COLUMN weight SET NOT NULL;
    69 68 
     ALTER TABLE ll_logbook.Activity ALTER COLUMN startTimeStamp SET NOT NULL;
    70 69 
     ALTER TABLE ll_logbook.Activity ALTER COLUMN vesselActivity SET NOT NULL;
    71 70 
     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
    85 85 
     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));
    86 86 
     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));
    87 87 
     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));
    88 
    -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));
    88 
    +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));
    89 89 
     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));
    90 90 
     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));
    91 91 
     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
    85 85 
     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));
    86 86 
     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));
    87 87 
     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));
    88 
    -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));
    88 
    +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));
    89 89 
     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));
    90 90 
     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));
    91 91 
     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
    85 85 
     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));
    86 86 
     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));
    87 87 
     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));
    88 
    -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));
    88 
    +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));
    89 89 
     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));
    90 90 
     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));
    91 91 
     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
    85 85 
     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));
    86 86 
     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));
    87 87 
     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));
    88 
    -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));
    88 
    +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));
    89 89 
     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));
    90 90 
     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));
    91 91 
     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
    608 608 
     observe.data.ll.landing.LandingPart.action.save.tip=Insert this landing part
    609 609 
     observe.data.ll.landing.LandingPart.count=Count
    610 610 
     observe.data.ll.landing.LandingPart.count.short=Count
    611 
    +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled.
    611 612 
     observe.data.ll.landing.LandingPart.title=Landing
    612 613 
     observe.data.ll.landing.LandingPart.type=Lnading part
    613 614 
     observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category.
    614 615 
     observe.data.ll.landing.LandingPart.weight=Weight (Kg)
    615 616 
     observe.data.ll.landing.LandingPart.weight.short=Weight
    617 
    +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled.
    616 618 
     observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max
    617 619 
     observe.data.ll.logbook.Activity.action.create=Next activity
    618 620 
     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
    693 695 
     observe.data.ll.logbook.SamplePart.count=Count
    694 696 
     observe.data.ll.logbook.SamplePart.count.short=Count
    695 697 
     observe.data.ll.logbook.SamplePart.length=Length (cm)
    696 
    -observe.data.ll.logbook.SamplePart.length.short=Length (cm)
    698 
    +observe.data.ll.logbook.SamplePart.length.short=Length
    697 699 
     observe.data.ll.logbook.SamplePart.length.validation.required=Size must be filled.
    698 700 
     observe.data.ll.logbook.SamplePart.title=Sample
    699 701 
     observe.data.ll.logbook.SamplePart.type=Sample part
    700 702 
     observe.data.ll.logbook.SamplePart.weight=Weight (kg)
    701 
    -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg)
    703 
    +observe.data.ll.logbook.SamplePart.weight.short=Weight
    702 704 
     observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled.
    703 705 
     observe.data.ll.logbook.Set.action.add=Add the fishing operation
    704 706 
     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
    608 608 
     observe.data.ll.landing.LandingPart.action.save.tip=Créer un nouveau Débarquement
    609 609 
     observe.data.ll.landing.LandingPart.count=Nombre
    610 610 
     observe.data.ll.landing.LandingPart.count.short=Nombre
    611 
    +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled.
    611 612 
     observe.data.ll.landing.LandingPart.title=Landing
    612 613 
     observe.data.ll.landing.LandingPart.type=LandingPart
    613 614 
     observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category.
    614 615 
     observe.data.ll.landing.LandingPart.weight=Peso (Kg)
    615 616 
     observe.data.ll.landing.LandingPart.weight.short=Poids
    617 
    +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled.
    616 618 
     observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max
    617 619 
     observe.data.ll.logbook.Activity.action.create=Actividad siguiente
    618 620 
     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
    693 695 
     observe.data.ll.logbook.SamplePart.count=Numero
    694 696 
     observe.data.ll.logbook.SamplePart.count.short=Count \#TODO
    695 697 
     observe.data.ll.logbook.SamplePart.length=Talla (cm)
    696 
    -observe.data.ll.logbook.SamplePart.length.short=Length (cm) \#TODO
    698 
    +observe.data.ll.logbook.SamplePart.length.short=Length \#TODO
    697 699 
     observe.data.ll.logbook.SamplePart.length.validation.required=Size or weight must be filled. \#TODO
    698 700 
     observe.data.ll.logbook.SamplePart.title=Samples \#TODO
    699 701 
     observe.data.ll.logbook.SamplePart.type=SamplePart
    700 702 
     observe.data.ll.logbook.SamplePart.weight=Peso (kg)
    701 
    -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg) \#TODO
    703 
    +observe.data.ll.logbook.SamplePart.weight.short=Weight \#TODO
    702 704 
     observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled. \#TODO
    703 705 
     observe.data.ll.logbook.Set.action.add=Añadir la operación de pesca
    704 706 
     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
    608 608 
     observe.data.ll.landing.LandingPart.action.save.tip=Insérer cette donnée
    609 609 
     observe.data.ll.landing.LandingPart.count=Nombre
    610 610 
     observe.data.ll.landing.LandingPart.count.short=Nombre
    611 
    +observe.data.ll.landing.LandingPart.count.validation.required=Le nombre ou le poids est obligatoire.
    611 612 
     observe.data.ll.landing.LandingPart.title=Débarquements
    612 613 
     observe.data.ll.landing.LandingPart.type=Donnée de débarquement
    613 614 
     observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=La catégorie de poids max doit être strictement supérieur à la catégorie min.
    614 615 
     observe.data.ll.landing.LandingPart.weight=Poids (Kg)
    615 616 
     observe.data.ll.landing.LandingPart.weight.short=Poids
    617 
    +observe.data.ll.landing.LandingPart.weight.validation.required=Le nombre ou le poids est obligatoire.
    616 618 
     observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max
    617 619 
     observe.data.ll.logbook.Activity.action.create=Activité suivante
    618 620 
     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
    693 695 
     observe.data.ll.logbook.SamplePart.count=Effectif
    694 696 
     observe.data.ll.logbook.SamplePart.count.short=Effectif
    695 697 
     observe.data.ll.logbook.SamplePart.length=Taille (cm)
    696 
    -observe.data.ll.logbook.SamplePart.length.short=Taille (cm)
    698 
    +observe.data.ll.logbook.SamplePart.length.short=Taille
    697 699 
     observe.data.ll.logbook.SamplePart.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée.
    698 700 
     observe.data.ll.logbook.SamplePart.title=Échantillons
    699 701 
     observe.data.ll.logbook.SamplePart.type=Donnée d'échantillonage
    700 702 
     observe.data.ll.logbook.SamplePart.weight=Poids (kg)
    701 
    -observe.data.ll.logbook.SamplePart.weight.short=Poids (kg)
    703 
    +observe.data.ll.logbook.SamplePart.weight.short=Poids
    702 704 
     observe.data.ll.logbook.SamplePart.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée.
    703 705 
     observe.data.ll.logbook.Set.action.add=Ajouter l'opération de pêche
    704 706 
     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
    200 200 
     observe.data.ll.common.Trip.tripType
    201 201 
     observe.data.ll.landing.Landing.dataSource
    202 202 
     observe.data.ll.landing.Landing.person
    203 
    +observe.data.ll.landing.LandingPart.count
    203 204 
     observe.data.ll.landing.LandingPart.weight
    204 205 
     observe.data.ll.logbook.ActivitySample.samplePart
    205 206 
     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
    49 49 
     observe.data.ll.Set.validation.haulingEndTimeStamp.after.haulingStartTimeStamp
    50 50 
     observe.data.ll.Set.validation.haulingStartTimeStamp.after.settingEndTimeStamp
    51 51 
     observe.data.ll.Set.validation.settingEndTimeStamp.after.settingStartTimeStamp
    52 
    +observe.data.ll.landing.LandingPart.count.validation.required
    52 53 
     observe.data.ll.landing.LandingPart.validation.bound.categoryWeight
    54 
    +observe.data.ll.landing.LandingPart.weight.validation.required
    53 55 
     observe.data.ll.logbook.Catch.count.validation.required
    54 56 
     observe.data.ll.logbook.Catch.totalWeight.validation.required
    55 57 
     observe.data.ll.logbook.SamplePart.length.validation.required

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.