branch feature/8066 created (now 97d710c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 97d710c ajout du champ et de la colonne du code de prelevement (refs #8066) This branch includes the following new commits: new 97d710c ajout du champ et de la colonne du code de prelevement (refs #8066) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 97d710cf336a6a85a4a770efe8301ecfdd6a571a Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 18:08:53 2016 +0100 ajout du champ et de la colonne du code de prelevement (refs #8066) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 97d710cf336a6a85a4a770efe8301ecfdd6a571a Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 18:08:53 2016 +0100 ajout du champ et de la colonne du code de prelevement (refs #8066) --- .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59391 bytes .../IndividualObservationBatchRowModel.java | 12 ++++++++++++ .../IndividualObservationBatchTableModel.java | 5 +++++ .../frequency/SpeciesFrequencyUIHandler.java | 8 ++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 6 files changed, 29 insertions(+) diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index c721325..0e935b9 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index 5029d7d..0faa14d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -350,6 +350,18 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel editObject.setCopyIndividualObservationMode(copyIndividualObservationMode); } + @Override + public String getSamplingCode() { + return editObject.getSamplingCode(); + } + + @Override + public void setSamplingCode(String samplingCode) { + Object oldValue = getSamplingCode(); + editObject.setSamplingCode(samplingCode); + firePropertyChange(PROPERTY_SAMPLING_CODE, oldValue, samplingCode); + } + //------------------------------------------------------------------------// //-- AttachmentModelAware --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index 8161804..1279f66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -70,6 +70,11 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab n("tutti.editIndividualObservationBatch.table.header.otherCaracteristics"), n("tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip")); + public static final ColumnIdentifier<IndividualObservationBatchRowModel> SAMPLING_CODE = ColumnIdentifier.newId( + IndividualObservationBatchRowModel.PROPERTY_SAMPLING_CODE, + n("tutti.editIndividualObservationBatch.table.header.samplingCode"), + n("tutti.editIndividualObservationBatch.table.header.samplingCode.tip")); + public static final ColumnIdentifier<IndividualObservationBatchRowModel> COMMENT = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_COMMENT, n("tutti.editIndividualObservationBatch.table.header.comment"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index b82607c..52373ca 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -1514,6 +1514,14 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } + { + // Smapling code column + + addColumnToModel(columnModel, + IndividualObservationBatchTableModel.SAMPLING_CODE); + + } + { // Comment column addColumnToModel(columnModel, diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 8a568db..ff790cf 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -996,6 +996,8 @@ tutti.editIndividualObservationBatch.table.header.otherCaracteristics= tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip= tutti.editIndividualObservationBatch.table.header.rank= tutti.editIndividualObservationBatch.table.header.rank.tip= +tutti.editIndividualObservationBatch.table.header.samplingCode= +tutti.editIndividualObservationBatch.table.header.samplingCode.tip= tutti.editIndividualObservationBatch.table.header.size= tutti.editIndividualObservationBatch.table.header.size.tip= tutti.editIndividualObservationBatch.table.header.species= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 4ab3800..a8ff064 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -946,6 +946,8 @@ tutti.editIndividualObservationBatch.table.header.otherCaracteristics=Autres car tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip=Autres caractéristiques tutti.editIndividualObservationBatch.table.header.rank=N° tutti.editIndividualObservationBatch.table.header.rank.tip=N° de l'observation +tutti.editIndividualObservationBatch.table.header.samplingCode= +tutti.editIndividualObservationBatch.table.header.samplingCode.tip= tutti.editIndividualObservationBatch.table.header.size=Taille tutti.editIndividualObservationBatch.table.header.size.tip=Taille tutti.editIndividualObservationBatch.table.header.weight=Poids -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm