This is an automated email from the git hooks/post-receive script. New commit to branch feature/7277 in repository tutti. See http://git.codelutin.com/tutti.git commit b6ef4f99ec7359019c74ae89b0ca74f2a45e2f35 Author: Kevin Morin <morin@codelutin.com> Date: Wed Dec 23 15:24:41 2015 +0100 on garde dans le modèle la dernirèe categorie V/HV qui a été utilisée à la création d'un batch pour la resélectionner dans la combo lors de la création du batch suivant (quand on choisit une espèce)(refs #7277) --- .../catches/species/SpeciesBatchUIHandler.java | 2 ++ .../species/create/CreateSpeciesBatchUI.jaxx | 22 +++++++++++----------- .../create/CreateSpeciesBatchUIHandler.java | 19 +++++++++++++------ .../species/create/CreateSpeciesBatchUIModel.java | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 68dc8e1..bfc554f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -967,6 +967,8 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec batchRootRowModel.getSampleWeight() ); } + + batchRootRowModel.setLastSampleCategoryUsed(batchRootRowModel.getSampleCategory()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx index d523757..95a1393 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx @@ -82,35 +82,35 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { </cell> </row> - <!-- Species batch weight --> + <!-- Sample Category --> <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='sampleCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchWeightField' constructorParams='this'/> + <BeanFilterableComboBox id='sampleCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> - <!-- Species batch count --> + <!-- Species batch weight --> <row> <cell anchor='west'> - <JLabel id='batchCountLabel'/> + <JLabel id='batchWeightLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchCountField' constructorParams='this'/> + <NumberEditor id='batchWeightField' constructorParams='this'/> </cell> </row> - <!-- Sample Category --> + <!-- Species batch count --> <row> <cell anchor='west'> - <JLabel id='sampleCategoryLabel'/> + <JLabel id='batchCountLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanFilterableComboBox id='sampleCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + <NumberEditor id='batchCountField' constructorParams='this'/> </cell> </row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index bc5eb3d..f7023f7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -112,19 +112,26 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl } else { - // look for best value for V/HV category : if sorted is available then use it + // select the last used V/HV category used, or sorted if no batch has been created List<CaracteristicQualitativeValue> qualitativeValues = CreateSpeciesBatchUIHandler.this.ui.getSampleCategoryComboBox().getData(); CaracteristicQualitativeValue newCategory = null; - for (CaracteristicQualitativeValue qualitativeValue : qualitativeValues) { - if (source.isSpeciesAndCategoryAvailable(newValue, qualitativeValue)) { - newCategory = qualitativeValue; + CaracteristicQualitativeValue defaultCategory = getModel().getLastSampleCategoryUsed(); + if (defaultCategory == null) { + defaultCategory = sortedValue; + } + + if (newCategory == null) { + for (CaracteristicQualitativeValue qualitativeValue : qualitativeValues) { + if (source.isSpeciesAndCategoryAvailable(newValue, qualitativeValue)) { + newCategory = qualitativeValue; - if (newCategory.equals(sortedValue)) { - break; + if (newCategory.equals(defaultCategory)) { + break; + } } } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java index ce2edc3..3892a3a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java @@ -55,6 +55,8 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; + public static final String PROPERTY_LAST_SAMPLE_CATEGORY_USED = "lastSampleCategoryUsed"; + public static final String PROPERTY_BATCH_WEIGHT = "batchWeight"; public static final String PROPERTY_BATCH_COUNT = "batchCount"; @@ -87,6 +89,13 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS protected CaracteristicQualitativeValue sampleCategory; /** + * Last first category used. + * + * @since 4.2 + */ + protected CaracteristicQualitativeValue lastSampleCategoryUsed; + + /** * Batch weight. * * @since 0.3 @@ -181,6 +190,16 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); } + public CaracteristicQualitativeValue getLastSampleCategoryUsed() { + return lastSampleCategoryUsed; + } + + public void setLastSampleCategoryUsed(CaracteristicQualitativeValue lastSampleCategoryUsed) { + Object oldValue = getLastSampleCategoryUsed(); + this.lastSampleCategoryUsed = lastSampleCategoryUsed; + firePropertyChange(PROPERTY_LAST_SAMPLE_CATEGORY_USED, oldValue, lastSampleCategoryUsed); + } + public Float getBatchWeight() { return batchWeight; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.