This is an automated email from the git hooks/post-receive script. New commit to branch feature/8198 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 35ae2c446227b301098b2c93c7ae80c61850dcc1 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 31 10:19:57 2016 +0200 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) --- .../IndividualObservationBatchTableModel.java | 17 +++++++++++++++++ .../species/frequency/SpeciesFrequencyUIHandler.java | 1 + 2 files changed, 18 insertions(+) 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 5c18896..b6577c8 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 @@ -24,6 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservatio import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.sampling.SamplingCodePrefix; import fr.ifremer.tutti.type.WeightUnit; @@ -104,12 +105,16 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab protected Optional<Caracteristic> maturityCaracteristic; + protected Caracteristic sexCaracteristic; + public IndividualObservationBatchTableModel(WeightUnit weightUnit, Collection<Caracteristic> defaultCaracteristicsSet, + Caracteristic sexCaracteristic, TableColumnModelExt columnModel) { super(columnModel, true, false); this.weightUnit = weightUnit; this.defaultCaracteristicsMap = CaracteristicMap.fromCollection(defaultCaracteristicsSet); + this.sexCaracteristic = sexCaracteristic; columnModel.addColumnModelListener(new TableColumnModelListener() { @@ -187,6 +192,18 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab result.setLengthStepCaracteristic(lengthstepCaracteristic); result.setMaturityCaracteristic(maturityCaracteristic); + if (getRowCount() > 0) { + IndividualObservationBatchRowModel lastRow = getRows().get(getRowCount() - 1); + + CaracteristicQualitativeValue gender = lastRow.getGender(sexCaracteristic); + result.getDefaultCaracteristics().put(sexCaracteristic, gender); + + Optional<CaracteristicQualitativeValue> maturityState = lastRow.getMaturityState(); + if (maturityCaracteristic.isPresent() && maturityState.isPresent()) { + result.getDefaultCaracteristics().put(maturityCaracteristic.get(), maturityState.get()); + } + } + // quand l'utilisateur change le prefix dans la conf, si la ligne a deja un code prélèvement, // le prefix reste le même, même si l'utilisateur supprime le code et en regénère un // il faut pousser le nouveau prefix si l'utilisateur supprime le code 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 0999b24..6d6158b 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 @@ -1552,6 +1552,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci IndividualObservationBatchTableModel tableModel = new IndividualObservationBatchTableModel(individualObservationWeightUnit, defaultCaracteristic, + sexCaracteristic, columnModel); obsTable.setModel(tableModel); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.