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

Commits:

6 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
    ... ... @@ -47,17 +47,12 @@ JToolBar {
    47 47 
       selectedItem:{tableEditBean.getSex()};
    48 48 
     }
    49 49
    50 
    -#modeAndCodePanel {
    51 
    -  layout:{new GridLayout(1,0)};
    52 
    -}
    53 
    -
    54 50 
     #acquisitionModeGroup {
    55 51 
       selectedValue:{AcquisitionMode.valueOf(tableEditBean.getAcquisitionMode())};
    56 52 
     }
    57 53
    58 54 
     #acquisitionModePanel {
    59 55 
       border:{new TitledBorder(t("observe.common.acquisitionMode"))};
    60 
    -  layout:{new GridLayout(1,0)};
    61 56 
     }
    62 57
    63 58 
     #acquisitionModeEffectif {
    ... ... @@ -77,7 +72,7 @@ JToolBar {
    77 72 
     }
    78 73
    79 74 
     #sizeMeasureTypePanel {
    80 
    -  border:{new TitledBorder(t("observe.common.sizeMeasureType"))};
    75 
    +  border:{new TitledBorder(t("observe.common.speciesAndSizeMeasure"))};
    81 76 
     }
    82 77
    83 78 
     #sizeMeasureType {
    ... ... @@ -85,11 +80,13 @@ JToolBar {
    85 80 
       bean:{tableEditBean};
    86 81 
       _tablePropertyName:{"sizeMeasureType"};
    87 82 
       selectedItem:{tableEditBean.getSizeMeasureType()};
    83 
    +  enabled:{tableEditBean.getSpecies() != null};
    88 84 
     }
    89 85
    90 86 
     #defaultSizeMeasureType {
    91 87 
       actionIcon:combobox-reset2;
    92 88 
       toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip";
    89 
    +  enabled:{tableEditBean.getSpecies() != null};
    93 90 
     }
    94 91
    95 92 
     #length {

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
    ... ... @@ -109,32 +109,38 @@ public String getSpeciesFauneTypeTaille(SpeciesReference species) {
    109 109 
         <!-- mode de saisie -->
    110 110 
         <row>
    111 111 
           <cell columns="3">
    112 
    -        <JPanel id="modeAndCodePanel">
    113 
    -          <JPanel id='acquisitionModePanel'>
    112 
    +        <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    113 
    +          <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    114 114 
                 <JRadioButton id='acquisitionModeEffectif'/>
    115 115 
                 <JRadioButton id='acquisitionModeIndividu'/>
    116 116 
               </JPanel>
    117 
    -          <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'>
    118 
    -            <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/>
    119 
    -            <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
    120 
    -                          constructorParams='this' constraints="BorderLayout.CENTER"/>
    121 
    -            <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
    122 
    -                     onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
    123 
    -          </JPanel>
    117 
    +          <Table id='sizeMeasureTypePanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    118 
    +            <row>
    119 
    +              <cell>
    120 
    +                <JLabel id='speciesLabel' styleClass="i18n"/>
    121 
    +              </cell>
    122 
    +              <cell weightx='1' anchor='east'>
    123 
    +                <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
    124 
    +              </cell>
    125 
    +            </row>
    126 
    +            <row>
    127 
    +              <cell>
    128 
    +                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    129 
    +              </cell>
    130 
    +              <cell>
    131 
    +                <JPanel layout='{new BorderLayout()}'>
    132 
    +                  <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
    133 
    +                                constructorParams='this' constraints="BorderLayout.CENTER"/>
    134 
    +                  <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
    135 
    +                           onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
    136 
    +                </JPanel>
    137 
    +              </cell>
    138 
    +            </row>
    139 
    +          </Table>
    124 140 
             </JPanel>
    125 141 
           </cell>
    126 142 
         </row>
    127 143
    128 
    -    <!-- species faune -->
    129 
    -    <row>
    130 
    -      <cell>
    131 
    -        <JLabel id='speciesLabel'/>
    132 
    -      </cell>
    133 
    -      <cell weightx='1' anchor='east'>
    134 
    -        <BeanComboBox id='species' constructorParams='this' genericType='SpeciesReference'/>
    135 
    -      </cell>
    136 
    -    </row>
    137 
    -
    138 144 
         <!-- length -->
    139 145 
         <row>
    140 146 
           <cell>

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
    ... ... @@ -101,32 +101,38 @@ public String getLengthDataTip(boolean computed) {
    101 101 
         <!-- mode de saisie -->
    102 102 
         <row>
    103 103 
           <cell columns="3">
    104 
    -        <JPanel id="modeAndCodePanel">
    105 
    -          <JPanel id='acquisitionModePanel'>
    104 
    +        <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
    105 
    +          <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
    106 106 
                 <JRadioButton id='acquisitionModeEffectif'/>
    107 107 
                 <JRadioButton id='acquisitionModeIndividu'/>
    108 108 
               </JPanel>
    109 
    -          <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'>
    110 
    -            <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/>
    111 
    -            <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
    112 
    -                          constructorParams='this' constraints="BorderLayout.CENTER"/>
    113 
    -            <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
    114 
    -                     onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
    115 
    -          </JPanel>
    109 
    +          <Table id='sizeMeasureTypePanel' fill='both' insets='1' constraints="BorderLayout.EAST">
    110 
    +            <row>
    111 
    +              <cell>
    112 
    +                <JLabel id='speciesLabel' styleClass="i18n"/>
    113 
    +              </cell>
    114 
    +              <cell weightx='1' anchor='east'>
    115 
    +                <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
    116 
    +              </cell>
    117 
    +            </row>
    118 
    +            <row>
    119 
    +              <cell>
    120 
    +                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
    121 
    +              </cell>
    122 
    +              <cell>
    123 
    +                <JPanel layout='{new BorderLayout()}'>
    124 
    +                  <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
    125 
    +                                constructorParams='this' constraints="BorderLayout.CENTER"/>
    126 
    +                  <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
    127 
    +                           onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
    128 
    +                </JPanel>
    129 
    +              </cell>
    130 
    +            </row>
    131 
    +          </Table>
    116 132 
             </JPanel>
    117 133 
           </cell>
    118 134 
         </row>
    119 135
    120 
    -    <!-- species thon -->
    121 
    -    <row>
    122 
    -      <cell>
    123 
    -        <JLabel id='speciesLabel' styleClass="i18n"/>
    124 
    -      </cell>
    125 
    -      <cell weightx='1' anchor='east'>
    126 
    -        <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
    127 
    -      </cell>
    128 
    -    </row>
    129 
    -
    130 136 
         <!-- sex -->
    131 137 
         <row>
    132 138 
           <cell>

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -1165,6 +1165,7 @@ observe.common.saveFile.overwrite.ok=Replace
    1165 1165 
     observe.common.saveFile.overwrite.title=Be ware\!
    1166 1166 
     observe.common.sizeMeasureType=Size measure type
    1167 1167 
     observe.common.species=Species
    1168 
    +observe.common.speciesAndSizeMeasure=Species - Measure type
    1168 1169 
     observe.common.step.description=Step description
    1169 1170 
     observe.common.storage.not.valid=Data source not configured
    1170 1171 
     observe.common.whenArriving=When arriving

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -1165,6 +1165,7 @@ observe.common.saveFile.overwrite.ok=Reemplazar
    1165 1165 
     observe.common.saveFile.overwrite.title=Cuidado
    1166 1166 
     observe.common.sizeMeasureType=Tipo de medida
    1167 1167 
     observe.common.species=Especie
    1168 
    +observe.common.speciesAndSizeMeasure=Especie - Tipo de medida del tamaño
    1168 1169 
     observe.common.step.description=Descripción de la etapa
    1169 1170 
     observe.common.storage.not.valid=Fuente de datos no configurada
    1170 1171 
     observe.common.whenArriving=À l'arrivée \#TODO

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -1165,6 +1165,7 @@ observe.common.saveFile.overwrite.ok=Remplacer
    1165 1165 
     observe.common.saveFile.overwrite.title=Attention
    1166 1166 
     observe.common.sizeMeasureType=Type de mensuration
    1167 1167 
     observe.common.species=Espèce
    1168 
    +observe.common.speciesAndSizeMeasure=Espèce - type de mesure de taille
    1168 1169 
     observe.common.step.description=Description de l'étape
    1169 1170 
     observe.common.storage.not.valid=Source de données non configurée
    1170 1171 
     observe.common.whenArriving=À l'arrivée

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