branch develop updated (1618131 -> 2ad2fc9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 1618131 fixes #6817: [TECHN] Ne pas bloquer l'application à l'ouverture même si certains fichiers temporaires ne peuvent être détruit new 6290d1b refs #6848 on utilise l'espèce complete dans les lots new 2ad2fc9 refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration The 2 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 2ad2fc9ffa0ac0568e3451dc6046c0e31186f00a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:04 2015 +0100 refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration commit 6290d1b5c05551ddcc6cb1aa76d0d4b785efe78d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:12:27 2015 +0100 refs #6848 on utilise l'espèce complete dans les lots Summary of changes: .../tutti/service/bigfin/BigfinImportService.java | 17 ++++++++++++++++- .../benthos/frequency/BenthosFrequencyTableModel.java | 15 +++++++++------ .../species/frequency/SpeciesFrequencyTableModel.java | 15 +++++++++------ 3 files changed, 34 insertions(+), 13 deletions(-) -- 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 develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6290d1b5c05551ddcc6cb1aa76d0d4b785efe78d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:12:27 2015 +0100 refs #6848 on utilise l'espèce complete dans les lots --- .../tutti/service/bigfin/BigfinImportService.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 3ccb390..4fb893e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -50,6 +50,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; 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.persistence.entities.referential.Speciess; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -134,7 +135,6 @@ public class BigfinImportService extends AbstractTuttiService { } List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); - Map<String, Species> speciesBySurveyCode = Maps.newTreeMap(); for (Species species : allReferentSpecies) { String surveyCode = species.getSurveyCode(); @@ -159,6 +159,21 @@ public class BigfinImportService extends AbstractTuttiService { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + // make sure we use survey codes if possible in species batches (see https://forge.codelutin.com/issues/6848) + if (!rootSpeciesBatch.isEmptyChildren()) { + + Map<String, Species> speciesByReferenceTaxonId = Speciess.splitByTaxonId(allReferentSpecies); + + for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { + Species species = speciesBatch.getSpecies(); + Integer referenceTaxonId = species.getReferenceTaxonId(); + Preconditions.checkNotNull(referenceTaxonId, "Can't have a null referenceTaxonId for species: " + species); + Species species1 = speciesByReferenceTaxonId.get(referenceTaxonId.toString()); + speciesBatch.setSpecies(species1); + } + + } + BigfinImportContext bigfinImportContext = new BigfinImportContext(importFile, operation, catchBatch, signsToCaracteristicValue, speciesBySurveyCode, speciesProtocolBySurveyCode, rootSpeciesBatch); return bigfinImportContext; -- 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 develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2ad2fc9ffa0ac0568e3451dc6046c0e31186f00a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:04 2015 +0100 refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration --- .../benthos/frequency/BenthosFrequencyTableModel.java | 15 +++++++++------ .../species/frequency/SpeciesFrequencyTableModel.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java index 246821b..b9e661f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java @@ -233,11 +233,13 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be } - uiModel.recomputeTotalNumberAndWeight(); - uiModel.recomputeRowsValidateState(); uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + fireTableDataChanged(); } @@ -275,11 +277,13 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be } - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeCanEditLengthStep(); uiModel.recomputeRowValidState(row); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + } }; } @@ -295,12 +299,11 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); modelCache.updateRowWithWeight(row); - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); - fireTableDataChanged(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); } }; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index 2abde8d..57898f7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -233,11 +233,13 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp } - uiModel.recomputeTotalNumberAndWeight(); - uiModel.recomputeRowsValidateState(); uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + fireTableDataChanged(); } @@ -275,11 +277,13 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp } - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeCanEditLengthStep(); uiModel.recomputeRowValidState(row); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + } }; } @@ -295,12 +299,11 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); modelCache.updateRowWithWeight(row); - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); - fireTableDataChanged(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); } }; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm