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

Commits:

9 changed files:

Changes:

  • client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss
    ... ... @@ -25,7 +25,7 @@
    25 25 
     }
    26 26
    27 27 
     #acquisitionModePanel {
    28 
    -  border:{new TitledBorder(t("observe.data.Data.acquisitionMode"))};
    28 
    +  border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.acquisitionMode"))};
    29 29 
     }
    30 30
    31 31 
     #acquisitionModeNumber {
    ... ... @@ -45,7 +45,7 @@
    45 45 
     }
    46 46
    47 47 
     #speciesAndMeasureTypesPanel {
    48 
    -  border:{new TitledBorder(t("observe.data.Data.speciesAndMeasureTypes"))};
    48 
    +  border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.speciesAndMeasureTypes"))};
    49 49 
     }
    50 50
    51 51 
     #sizeMeasureType {

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx
    ... ... @@ -70,42 +70,42 @@
    70 70 
         <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"
    71 71 
                _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'>
    72 72
    73 
    -        <!-- mode de saisie -->
    73 
    +        <!-- mode de saisie - espèce - type de mesures -->
    74 74 
             <row>
    75 
    -            <cell columns="3">
    76 
    -                <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    77 
    -                    <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    78 
    -                        <JRadioButton id='acquisitionModeNumber'/>
    79 
    -                        <JRadioButton id='acquisitionModeIndividual'/>
    80 
    -                    </JPanel>
    81 
    -                    <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    82 
    -                        <row>
    83 
    -                            <cell>
    84 
    -                                <JLabel id='speciesLabel' styleClass="i18n"/>
    85 
    -                            </cell>
    86 
    -                            <cell weightx="1">
    87 
    -                                <JaxxComboBox id='species' genericType='SpeciesReference'/>
    88 
    -                            </cell>
    89 
    -                        </row>
    90 
    -                        <row>
    91 
    -                            <cell>
    92 
    -                                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    93 
    -                            </cell>
    94 
    -                            <cell>
    95 
    -                                <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    96 
    -                            </cell>
    97 
    -                        </row>
    98 
    -                        <row>
    99 
    -                            <cell>
    100 
    -                                <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    101 
    -                            </cell>
    102 
    -                            <cell>
    103 
    -                                <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    104 
    -                            </cell>
    105 
    -                        </row>
    106 
    -                    </Table>
    75 
    +            <cell>
    76 
    +                <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    77 
    +                    <JRadioButton id='acquisitionModeNumber'/>
    78 
    +                    <JRadioButton id='acquisitionModeIndividual'/>
    107 79 
                     </JPanel>
    108 80 
                 </cell>
    81 
    +            <cell weightx='1' anchor='east'>
    82 
    +                <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    83 
    +                    <row>
    84 
    +                        <cell>
    85 
    +                            <JLabel id='speciesLabel' styleClass="i18n"/>
    86 
    +                        </cell>
    87 
    +                        <cell weightx="1">
    88 
    +                            <JaxxComboBox id='species' genericType='SpeciesReference'/>
    89 
    +                        </cell>
    90 
    +                    </row>
    91 
    +                    <row>
    92 
    +                        <cell>
    93 
    +                            <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    94 
    +                        </cell>
    95 
    +                        <cell>
    96 
    +                            <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    97 
    +                        </cell>
    98 
    +                    </row>
    99 
    +                    <row>
    100 
    +                        <cell>
    101 
    +                            <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    102 
    +                        </cell>
    103 
    +                        <cell>
    104 
    +                            <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    105 
    +                        </cell>
    106 
    +                    </row>
    107 
    +                </Table>
    108 
    +            </cell>
    109 109 
             </row>
    110 110
    111 111 
             <!-- sex -->
    ... ... @@ -126,18 +126,13 @@
    126 126 
                 <cell weightx='1' anchor='east'>
    127 127 
                     <NumberEditor id='length' styleClass="float1"/>
    128 128 
                 </cell>
    129 
    -            <cell anchor='east'>
    130 
    -                <JToolBar id='lengthSourceAction'>
    131 
    -                    <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/>
    132 
    -                </JToolBar>
    133 
    -            </cell>
    134 129 
             </row>
    135 130 
             <!-- lengthMeasureMethod -->
    136 131 
             <row>
    137 132 
                 <cell>
    138 133 
                     <JLabel id='lengthMeasureMethodLabel'/>
    139 134 
                 </cell>
    140 
    -            <cell weightx='1' anchor='east' columns="2">
    135 
    +            <cell weightx='1' anchor='east'>
    141 136 
                     <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/>
    142 137 
                 </cell>
    143 138 
             </row>
    ... ... @@ -150,18 +145,13 @@
    150 145 
                 <cell weightx='1' anchor='east'>
    151 146 
                     <NumberEditor id='weight' styleClass="float2"/>
    152 147 
                 </cell>
    153 
    -            <cell anchor='east'>
    154 
    -                <JToolBar id='weightSourceAction'>
    155 
    -                    <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/>
    156 
    -                </JToolBar>
    157 
    -            </cell>
    158 148 
             </row>
    159 149 
             <!-- weightMeasureMethod -->
    160 150 
             <row>
    161 151 
                 <cell>
    162 152 
                     <JLabel id='weightMeasureMethodLabel'/>
    163 153 
                 </cell>
    164 
    -            <cell weightx='1' anchor='east' columns="2">
    154 
    +            <cell weightx='1' anchor='east'>
    165 155 
                     <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    166 156 
                 </cell>
    167 157 
             </row>
    ... ... @@ -198,5 +188,7 @@
    198 188 
         <JPanel id="invisible">
    199 189 
             <JButton id="defaultSizeMeasureType"/>
    200 190 
             <JButton id="defaultWeightMeasureType"/>
    191 
    +        <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/>
    192 
    +        <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/>
    201 193 
         </JPanel>
    202 194 
     </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/DiscardedTargetSampleUIHandler.java
    ... ... @@ -87,6 +87,8 @@ public class DiscardedTargetSampleUIHandler extends GeneratedDiscardedTargetSamp
    87 87 
             ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged);
    88 88 
             ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType());
    89 89 
             ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType());
    90 
    +        ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation());
    91 
    +        ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation());
    90 92 
             ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType());
    91 93 
             ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType());
    92 94 
         }

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx
    ... ... @@ -69,42 +69,42 @@
    69 69 
         <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"
    70 70 
                _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'>
    71 71
    72 
    -        <!-- mode de saisie -->
    72 
    +        <!-- mode de saisie - espèce - type de mesures -->
    73 73 
             <row>
    74 
    -            <cell columns="3">
    75 
    -                <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    76 
    -                    <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    77 
    -                        <JRadioButton id='acquisitionModeNumber'/>
    78 
    -                        <JRadioButton id='acquisitionModeIndividual'/>
    79 
    -                    </JPanel>
    80 
    -                    <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    81 
    -                        <row>
    82 
    -                            <cell>
    83 
    -                                <JLabel id='speciesLabel' styleClass="i18n"/>
    84 
    -                            </cell>
    85 
    -                            <cell weightx="1">
    86 
    -                                <JaxxComboBox id='species' genericType='SpeciesReference'/>
    87 
    -                            </cell>
    88 
    -                        </row>
    89 
    -                        <row>
    90 
    -                            <cell>
    91 
    -                                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    92 
    -                            </cell>
    93 
    -                            <cell>
    94 
    -                                <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    95 
    -                            </cell>
    96 
    -                        </row>
    97 
    -                        <row>
    98 
    -                            <cell>
    99 
    -                                <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    100 
    -                            </cell>
    101 
    -                            <cell>
    102 
    -                                <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    103 
    -                            </cell>
    104 
    -                        </row>
    105 
    -                    </Table>
    74 
    +            <cell>
    75 
    +                <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    76 
    +                    <JRadioButton id='acquisitionModeNumber'/>
    77 
    +                    <JRadioButton id='acquisitionModeIndividual'/>
    106 78 
                     </JPanel>
    107 79 
                 </cell>
    80 
    +            <cell weightx='1' anchor='east'>
    81 
    +                <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    82 
    +                    <row>
    83 
    +                        <cell>
    84 
    +                            <JLabel id='speciesLabel' styleClass="i18n"/>
    85 
    +                        </cell>
    86 
    +                        <cell weightx="1">
    87 
    +                            <JaxxComboBox id='species' genericType='SpeciesReference'/>
    88 
    +                        </cell>
    89 
    +                    </row>
    90 
    +                    <row>
    91 
    +                        <cell>
    92 
    +                            <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    93 
    +                        </cell>
    94 
    +                        <cell>
    95 
    +                            <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    96 
    +                        </cell>
    97 
    +                    </row>
    98 
    +                    <row>
    99 
    +                        <cell>
    100 
    +                            <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    101 
    +                        </cell>
    102 
    +                        <cell>
    103 
    +                            <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    104 
    +                        </cell>
    105 
    +                    </row>
    106 
    +                </Table>
    107 
    +            </cell>
    108 108 
             </row>
    109 109
    110 110 
             <!-- sex -->
    ... ... @@ -125,18 +125,13 @@
    125 125 
                 <cell weightx='1' anchor='east'>
    126 126 
                     <NumberEditor id='length' styleClass="float1"/>
    127 127 
                 </cell>
    128 
    -            <cell anchor='east'>
    129 
    -                <JToolBar id='lengthSourceAction'>
    130 
    -                    <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/>
    131 
    -                </JToolBar>
    132 
    -            </cell>
    133 128 
             </row>
    134 129 
             <!-- lengthMeasureMethod -->
    135 130 
             <row>
    136 131 
                 <cell>
    137 132 
                     <JLabel id='lengthMeasureMethodLabel'/>
    138 133 
                 </cell>
    139 
    -            <cell weightx='1' anchor='east' columns="2">
    134 
    +            <cell weightx='1' anchor='east'>
    140 135 
                     <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/>
    141 136 
                 </cell>
    142 137 
             </row>
    ... ... @@ -149,18 +144,13 @@
    149 144 
                 <cell weightx='1' anchor='east'>
    150 145 
                     <NumberEditor id='weight' styleClass="float2"/>
    151 146 
                 </cell>
    152 
    -            <cell anchor='east'>
    153 
    -                <JToolBar id='weightSourceAction'>
    154 
    -                    <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/>
    155 
    -                </JToolBar>
    156 
    -            </cell>
    157 147 
             </row>
    158 148 
             <!-- weightMeasureMethod -->
    159 149 
             <row>
    160 150 
                 <cell>
    161 151 
                     <JLabel id='weightMeasureMethodLabel'/>
    162 152 
                 </cell>
    163 
    -            <cell weightx='1' anchor='east' columns="2">
    153 
    +            <cell weightx='1' anchor='east'>
    164 154 
                     <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    165 155 
                 </cell>
    166 156 
             </row>
    ... ... @@ -197,5 +187,7 @@
    197 187 
         <JPanel id="invisible">
    198 188 
             <JButton id="defaultSizeMeasureType"/>
    199 189 
             <JButton id="defaultWeightMeasureType"/>
    190 
    +        <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/>
    191 
    +        <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/>
    200 192 
         </JPanel>
    201 193 
     </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/KeptTargetSampleUIHandler.java
    ... ... @@ -87,6 +87,8 @@ public class KeptTargetSampleUIHandler extends GeneratedKeptTargetSampleUIHandle
    87 87 
             ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged);
    88 88 
             ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType());
    89 89 
             ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType());
    90 
    +        ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation());
    91 
    +        ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation());
    90 92 
             ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType());
    91 93 
             ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType());
    92 94 
         }

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx
    ... ... @@ -71,42 +71,42 @@
    71 71 
         <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"
    72 72 
                _tableEditors='{newComponentArray(species,sizeMeasureType,length,weight,count,sex,speciesFate,picturesReferences)}'>
    73 73
    74 
    -        <!-- mode de saisie -->
    74 
    +        <!-- mode de saisie - espèce - type de mesures -->
    75 75 
             <row>
    76 
    -            <cell columns="3">
    77 
    -                <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    78 
    -                    <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    79 
    -                        <JRadioButton id='acquisitionModeNumber'/>
    80 
    -                        <JRadioButton id='acquisitionModeIndividual'/>
    81 
    -                    </JPanel>
    82 
    -                    <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    83 
    -                        <row>
    84 
    -                            <cell>
    85 
    -                                <JLabel id='speciesLabel' styleClass="i18n"/>
    86 
    -                            </cell>
    87 
    -                            <cell weightx='1'>
    88 
    -                                <JaxxComboBox id='species' genericType='SpeciesReference'/>
    89 
    -                            </cell>
    90 
    -                        </row>
    91 
    -                        <row>
    92 
    -                            <cell>
    93 
    -                                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    94 
    -                            </cell>
    95 
    -                            <cell>
    96 
    -                                <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    97 
    -                            </cell>
    98 
    -                        </row>
    99 
    -                        <row>
    100 
    -                            <cell>
    101 
    -                                <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    102 
    -                            </cell>
    103 
    -                            <cell>
    104 
    -                                <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    105 
    -                            </cell>
    106 
    -                        </row>
    107 
    -                    </Table>
    76 
    +            <cell>
    77 
    +                <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    78 
    +                    <JRadioButton id='acquisitionModeNumber'/>
    79 
    +                    <JRadioButton id='acquisitionModeIndividual'/>
    108 80 
                     </JPanel>
    109 81 
                 </cell>
    82 
    +            <cell weightx='1' anchor='east'>
    83 
    +                <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    84 
    +                    <row>
    85 
    +                        <cell>
    86 
    +                            <JLabel id='speciesLabel' styleClass="i18n"/>
    87 
    +                        </cell>
    88 
    +                        <cell weightx="1">
    89 
    +                            <JaxxComboBox id='species' genericType='SpeciesReference'/>
    90 
    +                        </cell>
    91 
    +                    </row>
    92 
    +                    <row>
    93 
    +                        <cell>
    94 
    +                            <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    95 
    +                        </cell>
    96 
    +                        <cell>
    97 
    +                            <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/>
    98 
    +                        </cell>
    99 
    +                    </row>
    100 
    +                    <row>
    101 
    +                        <cell>
    102 
    +                            <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/>
    103 
    +                        </cell>
    104 
    +                        <cell>
    105 
    +                            <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/>
    106 
    +                        </cell>
    107 
    +                    </row>
    108 
    +                </Table>
    109 
    +            </cell>
    110 110 
             </row>
    111 111
    112 112 
             <!-- length -->
    ... ... @@ -117,12 +117,6 @@
    117 117 
                 <cell weightx='1' anchor='east'>
    118 118 
                     <NumberEditor id='length' styleClass="float1"/>
    119 119 
                 </cell>
    120 
    -            <cell anchor='east'>
    121 
    -                <JToolBar id='lengthSourceAction'>
    122 
    -                    <JButton id='lengthSourceInformation' styleClass='computedDataInformation'
    123 
    -                             onActionPerformed='handler.resetIsLengthComputed()'/>
    124 
    -                </JToolBar>
    125 
    -            </cell>
    126 120 
             </row>
    127 121
    128 122 
             <!-- weight -->
    ... ... @@ -133,19 +127,13 @@
    133 127 
                 <cell weightx='1' anchor='east'>
    134 128 
                     <NumberEditor id='weight' styleClass="float2"/>
    135 129 
                 </cell>
    136 
    -            <cell anchor='east'>
    137 
    -                <JToolBar id='weightSourceAction'>
    138 
    -                    <JButton id='weightSourceInformation' styleClass='computedDataInformation'
    139 
    -                             onActionPerformed='handler.resetIsWeightComputed()'/>
    140 
    -                </JToolBar>
    141 
    -            </cell>
    142 130 
             </row>
    143 131 
             <!-- weightMeasureMethod -->
    144 132 
             <row>
    145 133 
                 <cell>
    146 134 
                     <JLabel id='weightMeasureMethodLabel'/>
    147 135 
                 </cell>
    148 
    -            <cell weightx='1' anchor='east' columns="2">
    136 
    +            <cell weightx='1' anchor='east'>
    149 137 
                     <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>
    150 138 
                 </cell>
    151 139 
             </row>
    ... ... @@ -175,7 +163,7 @@
    175 163 
                 <cell>
    176 164 
                     <JLabel id='speciesFateLabel'/>
    177 165 
                 </cell>
    178 
    -            <cell weightx='1' anchor='east' columns="2">
    166 
    +            <cell weightx='1' anchor='east'>
    179 167 
                     <JaxxComboBox id='speciesFate' genericType='SpeciesFateReference'/>
    180 168 
                 </cell>
    181 169 
             </row>
    ... ... @@ -212,5 +200,7 @@
    212 200 
         <JPanel id="invisible">
    213 201 
             <JButton id="defaultSizeMeasureType"/>
    214 202 
             <JButton id="defaultWeightMeasureType"/>
    203 
    +        <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/>
    204 
    +        <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/>
    215 205 
         </JPanel>
    216 206 
     </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/NonTargetSampleUIHandler.java
    ... ... @@ -85,6 +85,8 @@ public class NonTargetSampleUIHandler extends GeneratedNonTargetSampleUIHandler
    85 85 
             ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged);
    86 86 
             ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType());
    87 87 
             ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType());
    88 
    +        ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation());
    89 
    +        ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation());
    88 90 
             ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType());
    89 91 
             ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType());
    90 92 
         }

  • pom.xml
    ... ... @@ -147,7 +147,7 @@
    147 147 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    148 148 
         <buildDate>${maven.build.timestamp}</buildDate>
    149 149
    150 
    -    <toolkit.version>5.0.1</toolkit.version>
    150 
    +    <toolkit.version>5.0.2-SNAPSHOT</toolkit.version>
    151 151
    152 152 
         <lib.version.ognl>3.1.28</lib.version.ognl>
    153 153 
         <!--can't use 1.4.197 (date has changed + blob also)-->

  • services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java
    ... ... @@ -61,13 +61,14 @@ public abstract class SampleDataServiceLocalSupport<C extends ContainerChildDto,
    61 61
    62 62 
         @Override
    63 63 
         public SaveResultDto save(M dto) {
    64 
    -        boolean notPersisted = dto.isNotPersisted();
    65 64 
             // this is a trick we always use id as parent id...
    66 65 
             Set parent = loadParentEntity(dto.getId());
    67 66 
             E entity = loadFormEntity(parent);
    68 67 
             checkLastUpdateDate(entity, dto);
    69 
    -        // use the real id
    68 
    +        // use the real sample id
    70 69 
             dto.setId(entity.getTopiaId());
    70 
    +        // not persisted is to be on sample (not set)
    71 
    +        boolean notPersisted = dto.isNotPersisted();
    71 72 
             entity.fromDto(getReferentialLocale(), dto);
    72 73 
             return onSave(parent, entity, notPersisted);
    73 74 
         }

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