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

Commits:

5 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(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.acquisitionMode"))};
    28 
    +  border:{new TitledBorder(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(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.speciesAndMeasureTypes"))};
    48 
    +  border:{new TitledBorder(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
    ... ... @@ -72,13 +72,13 @@
    72 72
    73 73 
             <!-- mode de saisie - espèce - type de mesures -->
    74 74 
             <row>
    75 
    -            <cell>
    75 
    +            <cell columns="2">
    76 76 
                     <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    77 77 
                         <JRadioButton id='acquisitionModeNumber'/>
    78 78 
                         <JRadioButton id='acquisitionModeIndividual'/>
    79 79 
                     </JPanel>
    80 80 
                 </cell>
    81 
    -            <cell weightx='1' anchor='east'>
    81 
    +            <cell columns="2" weightx='1' anchor='east'>
    82 82 
                     <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    83 83 
                         <row>
    84 84 
                             <cell>
    ... ... @@ -119,6 +119,7 @@
    119 119 
             </row>
    120 120
    121 121 
             <!-- length -->
    122 
    +        <!-- lengthMeasureMethod -->
    122 123 
             <row>
    123 124 
                 <cell>
    124 125 
                     <JLabel id='lengthLabel' styleClass="i18n"/>
    ... ... @@ -126,9 +127,6 @@
    126 127 
                 <cell weightx='1' anchor='east'>
    127 128 
                     <NumberEditor id='length' styleClass="float1"/>
    128 129 
                 </cell>
    129 
    -        </row>
    130 
    -        <!-- lengthMeasureMethod -->
    131 
    -        <row>
    132 130 
                 <cell>
    133 131 
                     <JLabel id='lengthMeasureMethodLabel'/>
    134 132 
                 </cell>
    ... ... @@ -138,6 +136,7 @@
    138 136 
             </row>
    139 137
    140 138 
             <!-- weight -->
    139 
    +        <!-- weightMeasureMethod -->
    141 140 
             <row>
    142 141 
                 <cell>
    143 142 
                     <JLabel id='weightLabel' styleClass="i18n"/>
    ... ... @@ -145,9 +144,6 @@
    145 144 
                 <cell weightx='1' anchor='east'>
    146 145 
                     <NumberEditor id='weight' styleClass="float2"/>
    147 146 
                 </cell>
    148 
    -        </row>
    149 
    -        <!-- weightMeasureMethod -->
    150 
    -        <row>
    151 147 
                 <cell>
    152 148 
                     <JLabel id='weightMeasureMethodLabel'/>
    153 149 
                 </cell>
    ... ... @@ -157,6 +153,7 @@
    157 153 
             </row>
    158 154
    159 155 
             <!-- count -->
    156 
    +        <!-- tagNumber -->
    160 157 
             <row>
    161 158 
                 <cell>
    162 159 
                     <JLabel id='countLabel' styleClass="i18n"/>
    ... ... @@ -164,10 +161,6 @@
    164 161 
                 <cell weightx='1' anchor='east'>
    165 162 
                     <NumberEditor id='count' styleClass="int6"/>
    166 163 
                 </cell>
    167 
    -        </row>
    168 
    -
    169 
    -        <!-- tagNumber -->
    170 
    -        <row>
    171 164 
                 <cell anchor='west'>
    172 165 
                     <JLabel id='tagNumberLabel' styleClass="i18n"/>
    173 166 
                 </cell>
    ... ... @@ -175,7 +168,6 @@
    175 168 
                     <NormalTextEditor id='tagNumber'/>
    176 169 
                 </cell>
    177 170 
             </row>
    178 
    -
    179 171 
         </Table>
    180 172
    181 173 
         <Table id='extraZone' fill='both' weightx='1' insets='0'>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx
    ... ... @@ -63,21 +63,18 @@
    63 63 
                        errorTableModel='{getErrorTableModel()}' context='update' parentValidator='{validator}'/>
    64 64
    65 65 
         <ButtonGroup id='acquisitionModeGroup'/>
    66 
    -    <JLabel id='hideFormInformation' styleClass='skipI18n'
    67 
    -            text="observe.data.ps.observation.KeptTargetSample.message.cantAdd"/>
    68 
    -
    69 66 
         <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"
    70 67 
                _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'>
    71 68
    72 69 
             <!-- mode de saisie - espèce - type de mesures -->
    73 70 
             <row>
    74 
    -            <cell>
    71 
    +            <cell columns="2">
    75 72 
                     <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    76 73 
                         <JRadioButton id='acquisitionModeNumber'/>
    77 74 
                         <JRadioButton id='acquisitionModeIndividual'/>
    78 75 
                     </JPanel>
    79 76 
                 </cell>
    80 
    -            <cell weightx='1' anchor='east'>
    77 
    +            <cell columns="2" weightx='1' anchor='east'>
    81 78 
                     <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    82 79 
                         <row>
    83 80 
                             <cell>
    ... ... @@ -118,6 +115,7 @@
    118 115 
             </row>
    119 116
    120 117 
             <!-- length -->
    118 
    +        <!-- lengthMeasureMethod -->
    121 119 
             <row>
    122 120 
                 <cell>
    123 121 
                     <JLabel id='lengthLabel' styleClass="i18n"/>
    ... ... @@ -125,9 +123,6 @@
    125 123 
                 <cell weightx='1' anchor='east'>
    126 124 
                     <NumberEditor id='length' styleClass="float1"/>
    127 125 
                 </cell>
    128 
    -        </row>
    129 
    -        <!-- lengthMeasureMethod -->
    130 
    -        <row>
    131 126 
                 <cell>
    132 127 
                     <JLabel id='lengthMeasureMethodLabel'/>
    133 128 
                 </cell>
    ... ... @@ -137,6 +132,7 @@
    137 132 
             </row>
    138 133
    139 134 
             <!-- weight -->
    135 
    +        <!-- weightMeasureMethod -->
    140 136 
             <row>
    141 137 
                 <cell>
    142 138 
                     <JLabel id='weightLabel' styleClass="i18n"/>
    ... ... @@ -144,9 +140,6 @@
    144 140 
                 <cell weightx='1' anchor='east'>
    145 141 
                     <NumberEditor id='weight' styleClass="float2"/>
    146 142 
                 </cell>
    147 
    -        </row>
    148 
    -        <!-- weightMeasureMethod -->
    149 
    -        <row>
    150 143 
                 <cell>
    151 144 
                     <JLabel id='weightMeasureMethodLabel'/>
    152 145 
                 </cell>
    ... ... @@ -156,6 +149,7 @@
    156 149 
             </row>
    157 150
    158 151 
             <!-- count -->
    152 
    +        <!-- tagNumber -->
    159 153 
             <row>
    160 154 
                 <cell>
    161 155 
                     <JLabel id='countLabel' styleClass="i18n"/>
    ... ... @@ -163,10 +157,6 @@
    163 157 
                 <cell weightx='1' anchor='east'>
    164 158 
                     <NumberEditor id='count' styleClass="int6"/>
    165 159 
                 </cell>
    166 
    -        </row>
    167 
    -
    168 
    -        <!-- tagNumber -->
    169 
    -        <row>
    170 160 
                 <cell anchor='west'>
    171 161 
                     <JLabel id='tagNumberLabel' styleClass="i18n"/>
    172 162 
                 </cell>
    ... ... @@ -177,6 +167,9 @@
    177 167
    178 168 
         </Table>
    179 169
    170 
    +    <JLabel id='hideFormInformation' styleClass='skipI18n'
    171 
    +            text="observe.data.ps.observation.KeptTargetSample.message.cantAdd"/>
    172 
    +
    180 173 
         <Table id='extraZone' fill='both' weightx='1' insets='0'>
    181 174 
             <row>
    182 175 
                 <cell weighty='1'>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx
    ... ... @@ -73,13 +73,13 @@
    73 73
    74 74 
             <!-- mode de saisie - espèce - type de mesures -->
    75 75 
             <row>
    76 
    -            <cell>
    76 
    +            <cell columns="2">
    77 77 
                     <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}">
    78 78 
                         <JRadioButton id='acquisitionModeNumber'/>
    79 79 
                         <JRadioButton id='acquisitionModeIndividual'/>
    80 80 
                     </JPanel>
    81 81 
                 </cell>
    82 
    -            <cell weightx='1' anchor='east'>
    82 
    +            <cell columns="2" weightx='1' anchor='east'>
    83 83 
                     <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'>
    84 84 
                         <row>
    85 85 
                             <cell>
    ... ... @@ -110,6 +110,7 @@
    110 110 
             </row>
    111 111
    112 112 
             <!-- length -->
    113 
    +        <!-- count -->
    113 114 
             <row>
    114 115 
                 <cell>
    115 116 
                     <JLabel id='lengthLabel'/>
    ... ... @@ -117,9 +118,16 @@
    117 118 
                 <cell weightx='1' anchor='east'>
    118 119 
                     <NumberEditor id='length' styleClass="float1"/>
    119 120 
                 </cell>
    121 
    +            <cell>
    122 
    +                <JLabel id='countLabel'/>
    123 
    +            </cell>
    124 
    +            <cell weightx='1' anchor='east'>
    125 
    +                <NumberEditor id='count' styleClass="int6"/>
    126 
    +            </cell>
    120 127 
             </row>
    121 128
    122 129 
             <!-- weight -->
    130 
    +        <!-- weightMeasureMethod -->
    123 131 
             <row>
    124 132 
                 <cell>
    125 133 
                     <JLabel id='weightLabel'/>
    ... ... @@ -127,9 +135,6 @@
    127 135 
                 <cell weightx='1' anchor='east'>
    128 136 
                     <NumberEditor id='weight' styleClass="float2"/>
    129 137 
                 </cell>
    130 
    -        </row>
    131 
    -        <!-- weightMeasureMethod -->
    132 
    -        <row>
    133 138 
                 <cell>
    134 139 
                     <JLabel id='weightMeasureMethodLabel'/>
    135 140 
                 </cell>
    ... ... @@ -138,17 +143,8 @@
    138 143 
                 </cell>
    139 144 
             </row>
    140 145
    141 
    -        <!-- count -->
    142 
    -        <row>
    143 
    -            <cell>
    144 
    -                <JLabel id='countLabel'/>
    145 
    -            </cell>
    146 
    -            <cell weightx='1' anchor='east'>
    147 
    -                <NumberEditor id='count' styleClass="int6"/>
    148 
    -            </cell>
    149 
    -        </row>
    150 
    -
    151 146 
             <!-- sex -->
    147 
    +        <!-- speciesFate -->
    152 148 
             <row>
    153 149 
                 <cell>
    154 150 
                     <JLabel id='sexLabel'/>
    ... ... @@ -156,10 +152,6 @@
    156 152 
                 <cell weightx='1' anchor='east'>
    157 153 
                     <JaxxComboBox id='sex' genericType='SexReference'/>
    158 154 
                 </cell>
    159 
    -        </row>
    160 
    -
    161 
    -        <!-- speciesFate -->
    162 
    -        <row>
    163 155 
                 <cell>
    164 156 
                     <JLabel id='speciesFateLabel'/>
    165 157 
                 </cell>
    ... ... @@ -169,6 +161,7 @@
    169 161 
             </row>
    170 162
    171 163 
             <!-- reference pĥoto -->
    164 
    +        <!-- tagNumber -->
    172 165 
             <row>
    173 166 
                 <cell>
    174 167 
                     <JLabel id='picturesReferencesLabel'/>
    ... ... @@ -176,10 +169,6 @@
    176 169 
                 <cell weightx='1' anchor='east'>
    177 170 
                     <NormalTextEditor id='picturesReferences'/>
    178 171 
                 </cell>
    179 
    -        </row>
    180 
    -
    181 
    -        <!-- tagNumber -->
    182 
    -        <row>
    183 172 
                 <cell anchor='west'>
    184 173 
                     <JLabel id='tagNumberLabel'/>
    185 174 
                 </cell>
    ... ... @@ -187,7 +176,6 @@
    187 176 
                     <NormalTextEditor id='tagNumber'/>
    188 177 
                 </cell>
    189 178 
             </row>
    190 
    -
    191 179 
         </Table>
    192 180
    193 181 
         <Table id='extraZone' fill='both' weightx='1' insets='0'>

  • services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -13,7 +13,7 @@ observe.Id.sex=Sexe
    13 13 
     observe.Id.sizeMeasureType=Type de mensuration
    14 14 
     observe.Id.validation.required.latitude=La latitude doit être renseignée.
    15 15 
     observe.Id.validation.required.longitude=La longitude doit être renseignée.
    16 
    -observe.Id.weightMeasureType=Type de mesure de poids
    16 
    +observe.Id.weightMeasureType=Type de pesée
    17 17 
     observe.Id.whenArriving=À l'arrivée
    18 18 
     observe.Id.whenLeaving=Au départ
    19 19 
     observe.business.module.common.common.referential.title=Référentiel commun
    ... ... @@ -665,7 +665,7 @@ observe.referential.common.VesselSizeCategory.gaugeLabel=Libellé jauge
    665 665 
     observe.referential.common.VesselSizeCategory.type=Catégorie de bateau
    666 666 
     observe.referential.common.VesselType.type=Type de pêcherie
    667 667 
     observe.referential.common.WeightMeasureMethod.type=Méthode de mesure de poids
    668 
    -observe.referential.common.WeightMeasureType.type=Type de mesure de poids
    668 
    +observe.referential.common.WeightMeasureType.type=Type de pesée
    669 669 
     observe.referential.common.Wind.speedRange=Libellé vitesse vent
    670 670 
     observe.referential.common.Wind.type=Vent Beaufort
    671 671 
     observe.referential.common.Wind.waveHeight=Libellé Hauteur moyenne vagues

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