[Observe-commits] [Git][ultreiaio/ird-observe][develop-7.x] [PS] Placement des champs sur échantillon faune accessoire - Closes #983

1 Jul 2018

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


Commits:
59204dfc by Tony CHEMIT at 2018-07-01T15:38:44Z
[PS] Placement des champs sur échantillon faune accessoire - Closes #983

- - - - -


6 changed files:

- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties


Changes:

=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
=====================================

--- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
+++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
@@ -47,17 +47,12 @@ JToolBar {
   selectedItem:{tableEditBean.getSex()};
 }
 
-#modeAndCodePanel {
-  layout:{new GridLayout(1,0)};
-}
-
 #acquisitionModeGroup {
   selectedValue:{AcquisitionMode.valueOf(tableEditBean.getAcquisitionMode())};
 }
 
 #acquisitionModePanel {
   border:{new TitledBorder(t("observe.common.acquisitionMode"))};
-  layout:{new GridLayout(1,0)};
 }
 
 #acquisitionModeEffectif {
@@ -77,7 +72,7 @@ JToolBar {
 }
 
 #sizeMeasureTypePanel {
-  border:{new TitledBorder(t("observe.common.sizeMeasureType"))};
+  border:{new TitledBorder(t("observe.common.speciesAndSizeMeasure"))};
 }
 
 #sizeMeasureType {
@@ -85,11 +80,13 @@ JToolBar {
   bean:{tableEditBean};
   _tablePropertyName:{"sizeMeasureType"};
   selectedItem:{tableEditBean.getSizeMeasureType()};
+  enabled:{tableEditBean.getSpecies() != null};
 }
 
 #defaultSizeMeasureType {
   actionIcon:combobox-reset2;
   toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip";
+  enabled:{tableEditBean.getSpecies() != null};
 }
 
 #length {


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx
@@ -109,32 +109,38 @@ public String getSpeciesFauneTypeTaille(SpeciesReference species) {
     <!-- mode de saisie -->
     <row>
       <cell columns="3">
-        <JPanel id="modeAndCodePanel">
-          <JPanel id='acquisitionModePanel'>
+        <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
+          <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
             <JRadioButton id='acquisitionModeEffectif'/>
             <JRadioButton id='acquisitionModeIndividu'/>
           </JPanel>
-          <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'>
-            <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/>
-            <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
-                          constructorParams='this' constraints="BorderLayout.CENTER"/>
-            <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
-                     onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
-          </JPanel>
+          <Table id='sizeMeasureTypePanel' fill='both' insets='1' constraints="BorderLayout.EAST">
+            <row>
+              <cell>
+                <JLabel id='speciesLabel' styleClass="i18n"/>
+              </cell>
+              <cell weightx='1' anchor='east'>
+                <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
+              </cell>
+            </row>
+            <row>
+              <cell>
+                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
+              </cell>
+              <cell>
+                <JPanel layout='{new BorderLayout()}'>
+                  <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
+                                constructorParams='this' constraints="BorderLayout.CENTER"/>
+                  <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
+                           onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
+                </JPanel>
+              </cell>
+            </row>
+          </Table>
         </JPanel>
       </cell>
     </row>
 
-    <!-- species faune -->
-    <row>
-      <cell>
-        <JLabel id='speciesLabel'/>
-      </cell>
-      <cell weightx='1' anchor='east'>
-        <BeanComboBox id='species' constructorParams='this' genericType='SpeciesReference'/>
-      </cell>
-    </row>
-
     <!-- length -->
     <row>
       <cell>


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
=====================================
--- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
+++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx
@@ -101,32 +101,38 @@ public String getLengthDataTip(boolean computed) {
     <!-- mode de saisie -->
     <row>
       <cell columns="3">
-        <JPanel id="modeAndCodePanel">
-          <JPanel id='acquisitionModePanel'>
+        <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'>
+          <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}">
             <JRadioButton id='acquisitionModeEffectif'/>
             <JRadioButton id='acquisitionModeIndividu'/>
           </JPanel>
-          <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'>
-            <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/>
-            <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
-                          constructorParams='this' constraints="BorderLayout.CENTER"/>
-            <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
-                     onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
-          </JPanel>
+          <Table id='sizeMeasureTypePanel' fill='both' insets='1' constraints="BorderLayout.EAST">
+            <row>
+              <cell>
+                <JLabel id='speciesLabel' styleClass="i18n"/>
+              </cell>
+              <cell weightx='1' anchor='east'>
+                <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
+              </cell>
+            </row>
+            <row>
+              <cell>
+                <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/>
+              </cell>
+              <cell>
+                <JPanel layout='{new BorderLayout()}'>
+                  <BeanComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'
+                                constructorParams='this' constraints="BorderLayout.CENTER"/>
+                  <JButton id="defaultSizeMeasureType" constraints="BorderLayout.EAST"
+                           onActionPerformed="getHandler().resetDefaultSizeMeasureType()"/>
+                </JPanel>
+              </cell>
+            </row>
+          </Table>
         </JPanel>
       </cell>
     </row>
 
-    <!-- species thon -->
-    <row>
-      <cell>
-        <JLabel id='speciesLabel' styleClass="i18n"/>
-      </cell>
-      <cell weightx='1' anchor='east'>
-        <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/>
-      </cell>
-    </row>
-
     <!-- sex -->
     <row>
       <cell>


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


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


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



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/59204dfcb047991f4eae3247059c...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/59204dfcb047991f4eae3247059c...
You're receiving this email because of your account on gitlab.com.

    