This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5731c8b5e3234edc204e528b3f4a62360406aea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:53 2016 +0100 Ajout length.tagNumber (ui) --- .../ui/content/table/impl/longline/CatchLonglineUI.jaxx | 15 +++++++++++++-- .../ui/content/table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../ui/content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++++ .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 15 +++++++++++++++ .../ui/content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++++ .../content/table/impl/seine/TargetSampleUIModel.java | 3 ++- .../resources/i18n/application-swing_en_GB.properties | 2 ++ .../resources/i18n/application-swing_es_ES.properties | 2 ++ .../resources/i18n/application-swing_fr_FR.properties | 2 ++ 10 files changed, 88 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 14815cc..4aa6e01 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -181,14 +181,25 @@ </row> <!-- speciesCatch --> + <!-- tagNumber --> <row> <cell> <JLabel id='speciesCatchLabel'/> </cell> - <cell weightx='1' anchor='east' columns="3"> + <cell weightx='1' anchor='east'> <BeanComboBox id='speciesCatch' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> </cell> - + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> </row> <!-- count --> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index ed5c587..3c3faae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -137,6 +137,23 @@ _tablePropertyName:{CatchLonglineDto.PROPERTY_PHOTO_REFERENCES}; } +#tagNumberLabel { + text:"observe.content.common.tagNumber"; + labelFor:{tagNumber}; +} + +#resetTagNumber { + toolTipText:"observe.content.common.action.reset.tagNumber.tip"; + _resetTablePropertyName:{CatchLonglineDto.PROPERTY_TAG_NUMBER}; + enabled:{tableEditBean.getAcquisitionMode() == 0}; +} + +#tagNumber { + text:{getStringValue(tableEditBean.getTagNumber())}; + _tablePropertyName:{CatchLonglineDto.PROPERTY_TAG_NUMBER}; + enabled:{tableEditBean.getAcquisitionMode() == 0}; +} + #countLabel { text:"observe.content.catchLongline.count"; labelFor:{count}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java index c5ce76c..054e30e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java @@ -70,6 +70,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt CatchLonglineDto.PROPERTY_HOOK_POSITION, CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_TAG_NUMBER, CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED).build(); public static final Set<String> DEPREDATED_TAB_PROPERTIES = @@ -142,6 +143,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt CatchLonglineDto.PROPERTY_SECTION, CatchLonglineDto.PROPERTY_BASKET, CatchLonglineDto.PROPERTY_BRANCHLINE, + CatchLonglineDto.PROPERTY_TAG_NUMBER, CatchLonglineDto.PROPERTY_COMMENT }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss index 7e76dab..2abd16d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss @@ -104,3 +104,20 @@ JToolBar { #comment2 { text:{getStringValue(bean.getComment())}; } + +#tagNumberLabel { + text:"observe.content.common.tagNumber"; + labelFor:{tagNumber}; +} + +#resetTagNumber { + toolTipText:"observe.content.common.action.reset.tagNumber.tip"; + _resetTablePropertyName:{"tagNumber"}; + enabled:{tableEditBean.getAcquisitionMode() == 1}; +} + +#tagNumber { + text:{getStringValue(tableEditBean.getTagNumber())}; + _tablePropertyName:{"tagNumber"}; + enabled:{tableEditBean.getAcquisitionMode() == 1}; +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 1098ec4..ac03944 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -203,6 +203,21 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species </cell> </row> + <!-- tagNumber --> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> <Table id='extraZone' fill='both' weightx='1' insets='0'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index a660b5e..63d969c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -175,6 +175,22 @@ public String getLengthDataTip(boolean computed) { <NumberEditor id='count' constructorParams='this'/> </cell> </row> + + <!-- tagNumber --> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='tagNumberToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetTagNumber' styleClass='resetButton'/> + </JToolBar> + <JTextField id='tagNumber' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> <Table id='extraZone' fill='both' weightx='1' insets='0'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 1efdf22..7c41275 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -61,7 +61,8 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, - TargetLengthDto.PROPERTY_ACQUISITION_MODE}); + TargetLengthDto.PROPERTY_ACQUISITION_MODE, + TargetLengthDto.PROPERTY_TAG_NUMBER}); List<ContentTableMeta<TargetLengthDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SPECIES, true), diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 71ac088..da89e82 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Choose where to export data observe.content.choose.sensorUsed.title.importData=Choose file to import observe.content.choose.tdr.title.exportData=Choose where to export data observe.content.choose.tdr.title.importData=Choose file to import +observe.content.common.action.reset.tagNumber.tip=Reset tag number +observe.content.common.tagNumber=Tag number observe.content.encounter.action.create=Insert this encounter observe.content.encounter.action.create.tip=Insert this encounter observe.content.encounter.count=Count diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index c36a56a..fc25e7b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Elegir la ubicación del arch observe.content.choose.sensorUsed.title.importData=Elegir el archivo de datos a importar observe.content.choose.tdr.title.exportData=Elegir la ubicación del archivo de datos a exportar observe.content.choose.tdr.title.importData=Elegir el archivo de datos a importar +observe.content.common.action.reset.tagNumber.tip=Réinitialiser le numéro d'échantillon \#TODO +observe.content.common.tagNumber=Numéro d'échantillon \#TODO observe.content.encounter.action.create=Insertar este encuentro observe.content.encounter.action.create.tip=Insertar este encuentro observe.content.encounter.count=Numéro diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 6005e77..432bdde 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -787,6 +787,8 @@ observe.content.choose.sensorUsed.title.exportData=Choisir l'emplacement du fich observe.content.choose.sensorUsed.title.importData=Choisir le fichier de données à importer observe.content.choose.tdr.title.exportData=Choisir l'emplacement du fichier de données à exporter observe.content.choose.tdr.title.importData=Choisir le fichier de données à importer +observe.content.common.action.reset.tagNumber.tip=Réinitialiser le numéro d'échantillon +observe.content.common.tagNumber=Numéro échantillon observe.content.encounter.action.create=Insérer cette rencontre observe.content.encounter.action.create.tip=Insérer cette rencontre observe.content.encounter.count=Nombre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.