Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4cc38f9 by Tony Chemit at 2021-02-11T17:42:58+01:00 Mauvaise disposition de l'encadré des espèces et quelques améliorations sur les deux écrans - Closes #1781 - - - - - 5 changed files: - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx - services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss ===================================== @@ -25,7 +25,7 @@ } #acquisitionModePanel { - border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.acquisitionMode"))}; + border:{new TitledBorder(t("observe.data.Data.acquisitionMode"))}; } #acquisitionModeNumber { @@ -45,7 +45,7 @@ } #speciesAndMeasureTypesPanel { - border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.speciesAndMeasureTypes"))}; + border:{new TitledBorder(t("observe.data.Data.speciesAndMeasureTypes"))}; } #sizeMeasureType { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx ===================================== @@ -72,13 +72,13 @@ <!-- mode de saisie - espèce - type de mesures --> <row> - <cell> + <cell columns="2"> <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> <JRadioButton id='acquisitionModeNumber'/> <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> - <cell weightx='1' anchor='east'> + <cell columns="2" weightx='1' anchor='east'> <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> <row> <cell> @@ -119,6 +119,7 @@ </row> <!-- length --> + <!-- lengthMeasureMethod --> <row> <cell> <JLabel id='lengthLabel' styleClass="i18n"/> @@ -126,9 +127,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> - </row> - <!-- lengthMeasureMethod --> - <row> <cell> <JLabel id='lengthMeasureMethodLabel'/> </cell> @@ -138,6 +136,7 @@ </row> <!-- weight --> + <!-- weightMeasureMethod --> <row> <cell> <JLabel id='weightLabel' styleClass="i18n"/> @@ -145,9 +144,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - </row> - <!-- weightMeasureMethod --> - <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> @@ -157,6 +153,7 @@ </row> <!-- count --> + <!-- tagNumber --> <row> <cell> <JLabel id='countLabel' styleClass="i18n"/> @@ -164,10 +161,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='count' styleClass="int6"/> </cell> - </row> - - <!-- tagNumber --> - <row> <cell anchor='west'> <JLabel id='tagNumberLabel' styleClass="i18n"/> </cell> @@ -175,7 +168,6 @@ <NormalTextEditor id='tagNumber'/> </cell> </row> - </Table> <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 @@ errorTableModel='{getErrorTableModel()}' context='update' parentValidator='{validator}'/> <ButtonGroup id='acquisitionModeGroup'/> - <JLabel id='hideFormInformation' styleClass='skipI18n' - text="observe.data.ps.observation.KeptTargetSample.message.cantAdd"/> - <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean" _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'> <!-- mode de saisie - espèce - type de mesures --> <row> - <cell> + <cell columns="2"> <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> <JRadioButton id='acquisitionModeNumber'/> <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> - <cell weightx='1' anchor='east'> + <cell columns="2" weightx='1' anchor='east'> <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> <row> <cell> @@ -118,6 +115,7 @@ </row> <!-- length --> + <!-- lengthMeasureMethod --> <row> <cell> <JLabel id='lengthLabel' styleClass="i18n"/> @@ -125,9 +123,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> - </row> - <!-- lengthMeasureMethod --> - <row> <cell> <JLabel id='lengthMeasureMethodLabel'/> </cell> @@ -137,6 +132,7 @@ </row> <!-- weight --> + <!-- weightMeasureMethod --> <row> <cell> <JLabel id='weightLabel' styleClass="i18n"/> @@ -144,9 +140,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - </row> - <!-- weightMeasureMethod --> - <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> @@ -156,6 +149,7 @@ </row> <!-- count --> + <!-- tagNumber --> <row> <cell> <JLabel id='countLabel' styleClass="i18n"/> @@ -163,10 +157,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='count' styleClass="int6"/> </cell> - </row> - - <!-- tagNumber --> - <row> <cell anchor='west'> <JLabel id='tagNumberLabel' styleClass="i18n"/> </cell> @@ -177,6 +167,9 @@ </Table> + <JLabel id='hideFormInformation' styleClass='skipI18n' + text="observe.data.ps.observation.KeptTargetSample.message.cantAdd"/> + <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <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 @@ <!-- mode de saisie - espèce - type de mesures --> <row> - <cell> + <cell columns="2"> <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> <JRadioButton id='acquisitionModeNumber'/> <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> - <cell weightx='1' anchor='east'> + <cell columns="2" weightx='1' anchor='east'> <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> <row> <cell> @@ -110,6 +110,7 @@ </row> <!-- length --> + <!-- count --> <row> <cell> <JLabel id='lengthLabel'/> @@ -117,9 +118,16 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> + <cell> + <JLabel id='countLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='count' styleClass="int6"/> + </cell> </row> <!-- weight --> + <!-- weightMeasureMethod --> <row> <cell> <JLabel id='weightLabel'/> @@ -127,9 +135,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - </row> - <!-- weightMeasureMethod --> - <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> @@ -138,17 +143,8 @@ </cell> </row> - <!-- count --> - <row> - <cell> - <JLabel id='countLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='count' styleClass="int6"/> - </cell> - </row> - <!-- sex --> + <!-- speciesFate --> <row> <cell> <JLabel id='sexLabel'/> @@ -156,10 +152,6 @@ <cell weightx='1' anchor='east'> <JaxxComboBox id='sex' genericType='SexReference'/> </cell> - </row> - - <!-- speciesFate --> - <row> <cell> <JLabel id='speciesFateLabel'/> </cell> @@ -169,6 +161,7 @@ </row> <!-- reference pĥoto --> + <!-- tagNumber --> <row> <cell> <JLabel id='picturesReferencesLabel'/> @@ -176,10 +169,6 @@ <cell weightx='1' anchor='east'> <NormalTextEditor id='picturesReferences'/> </cell> - </row> - - <!-- tagNumber --> - <row> <cell anchor='west'> <JLabel id='tagNumberLabel'/> </cell> @@ -187,7 +176,6 @@ <NormalTextEditor id='tagNumber'/> </cell> </row> - </Table> <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 observe.Id.sizeMeasureType=Type de mensuration observe.Id.validation.required.latitude=La latitude doit être renseignée. observe.Id.validation.required.longitude=La longitude doit être renseignée. -observe.Id.weightMeasureType=Type de mesure de poids +observe.Id.weightMeasureType=Type de pesée observe.Id.whenArriving=À l'arrivée observe.Id.whenLeaving=Au départ observe.business.module.common.common.referential.title=Référentiel commun @@ -665,7 +665,7 @@ observe.referential.common.VesselSizeCategory.gaugeLabel=Libellé jauge observe.referential.common.VesselSizeCategory.type=Catégorie de bateau observe.referential.common.VesselType.type=Type de pêcherie observe.referential.common.WeightMeasureMethod.type=Méthode de mesure de poids -observe.referential.common.WeightMeasureType.type=Type de mesure de poids +observe.referential.common.WeightMeasureType.type=Type de pesée observe.referential.common.Wind.speedRange=Libellé vitesse vent observe.referential.common.Wind.type=Vent Beaufort observe.referential.common.Wind.waveHeight=Libellé Hauteur moyenne vagues View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b4cc38f9f70524a924d4df25e5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b4cc38f9f70524a924d4df25e5... You're receiving this email because of your account on gitlab.com.