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

Commits:

3 changed files:

Changes:

  • client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -154,6 +154,7 @@ observe.data.ps.observation.Activity.vesselActivity
    154 154 
     observe.data.ps.observation.Activity.vesselSpeed
    155 155 
     observe.data.ps.observation.Activity.wind
    156 156 
     observe.data.ps.observation.Catch.catchWeight
    157 
    +observe.data.ps.observation.Catch.informationSource
    157 158 
     observe.data.ps.observation.Catch.meanLength
    158 159 
     observe.data.ps.observation.Catch.meanWeight
    159 160 
     observe.data.ps.observation.Catch.reasonForDiscard

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx
    ... ... @@ -31,6 +31,7 @@
    31 31 
             fr.ird.observe.dto.referential.common.SpeciesReference
    32 32 
             fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
    33 33 
             fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference
    34 
    +        fr.ird.observe.dto.referential.ps.observation.InformationSourceReference
    34 35 
             fr.ird.observe.client.datasource.editor.api.content.data.table.*
    35 36 
             fr.ird.observe.client.datasource.validation.ObserveSwingValidator
    36 37
    ... ... @@ -101,11 +102,6 @@
    101 102 
                 <cell weightx='1' anchor='east'>
    102 103 
                     <NumberEditor id='catchWeight' styleClass="float3"/>
    103 104 
                 </cell>
    104 
    -            <cell anchor='east'>
    105 
    -                <JToolBar id='catchWeightComputedAction'>
    106 
    -                    <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/>
    107 
    -                </JToolBar>
    108 
    -            </cell>
    109 105 
             </row>
    110 106
    111 107 
             <!-- weightMeasureMethod -->
    ... ... @@ -127,11 +123,6 @@
    127 123 
                     <NumberEditor id='totalCount' styleClass="int6"/>
    128 124
    129 125 
                 </cell>
    130 
    -            <cell anchor='east'>
    131 
    -                <JToolBar id='totalCountComputedAction'>
    132 
    -                    <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/>
    133 
    -                </JToolBar>
    134 
    -            </cell>
    135 126 
             </row>
    136 127
    137 128 
             <!-- weight moyen -->
    ... ... @@ -142,11 +133,6 @@
    142 133 
                 <cell weightx='1'>
    143 134 
                     <NumberEditor id='meanWeight' styleClass="float2"/>
    144 135 
                 </cell>
    145 
    -            <cell anchor='east'>
    146 
    -                <JToolBar id='meanWeightComputedAction'>
    147 
    -                    <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/>
    148 
    -                </JToolBar>
    149 
    -            </cell>
    150 136 
             </row>
    151 137
    152 138 
             <!-- taille moyenne -->
    ... ... @@ -157,11 +143,6 @@
    157 143 
                 <cell weightx='1'>
    158 144 
                     <NumberEditor id='meanLength' styleClass="float2"/>
    159 145 
                 </cell>
    160 
    -            <cell anchor='east'>
    161 
    -                <JToolBar id='meanLengthComputedAction'>
    162 
    -                    <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/>
    163 
    -                </JToolBar>
    164 
    -            </cell>
    165 146 
             </row>
    166 147
    167 148 
             <!-- well -->
    ... ... @@ -174,6 +155,16 @@
    174 155 
                 </cell>
    175 156 
             </row>
    176 157
    158 
    +        <!-- informationSource -->
    159 
    +        <row>
    160 
    +            <cell>
    161 
    +                <JLabel id='informationSourceLabel'/>
    162 
    +            </cell>
    163 
    +            <cell weightx='1' anchor='east'>
    164 
    +                <JaxxComboBox id='informationSource' genericType='InformationSourceReference'/>
    165 
    +            </cell>
    166 
    +        </row>
    167 
    +
    177 168 
             <!-- comment -->
    178 169 
             <row>
    179 170 
                 <cell columns='3' weighty='1'>
    ... ... @@ -183,4 +174,8 @@
    183 174
    184 175 
         </Table>
    185 176
    177 
    +    <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/>
    178 
    +    <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/>
    179 
    +    <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/>
    180 
    +    <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/>
    186 181 
     </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java
    ... ... @@ -161,4 +161,12 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler {
    161 161 
             return result;
    162 162 
         }
    163 163
    164 
    +    @Override
    165 
    +    public void initActions() {
    166 
    +        ui.getCatchWeight().getRightToolbar().add(ui.getCatchWeightComputedInformation());
    167 
    +        ui.getTotalCount().getRightToolbar().add(ui.getTotalCountComputedInformation());
    168 
    +        ui.getMeanWeight().getRightToolbar().add(ui.getMeanWeightComputedInformation());
    169 
    +        ui.getMeanLength().getRightToolbar().add(ui.getMeanLengthComputedInformation());
    170 
    +        super.initActions();
    171 
    +    }
    164 172 
     }

    • —
    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.