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 d1cdb0f8a67100360825818bcff56cfa93a9e06d Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 10 19:30:42 2014 +0200 fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié --- .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 7 +++---- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + .../ifremer/tutti/ui/swing/action/NewFishingOperationAction.java | 1 + .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 +++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index 8ff4542..120ec7c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -336,10 +336,9 @@ public class WeightComputingService extends AbstractTuttiService { Float rejectedWeight = catchBatch.getCatchTotalRejectedWeight(); if (rejectedWeight == null && totalWeight != null) { - if (!totalWeight.equals(totalUnsortedWeight - + totalSortedWeight)) { - throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.incoherentTotal")); - + if (totalWeight.compareTo(totalUnsortedWeight + totalSortedWeight) < 1) { + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.totalLessThanSortedAndUnsorted")); +// } else { catchBatch.setCatchTotalRejectedComputedWeight( Weights.roundKiloGram(totalWeight diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index e810af7..60a31ec 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -150,6 +150,7 @@ tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequen tutti.service.operations.computeWeights.error.species.incoherentSampleWeight= tutti.service.operations.computeWeights.error.species.incoherentTotalSorted= tutti.service.operations.computeWeights.error.species.noWeight= +tutti.service.operations.computeWeights.error.totalLessThanSortedAndUnsorted= tutti.service.operations.exportCatchesReport.error= tutti.service.operations.exportCatchesReport.specialRows.benthos.code= tutti.service.operations.exportCatchesReport.specialRows.benthos.name= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 5854009..1cea1ff 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -135,6 +135,7 @@ tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequen tutti.service.operations.computeWeights.error.species.incoherentSampleWeight=Espèces - Le poids de sous-échantillon du lot %s/%s - %s (%skg) est supérieur au poids du lot (%skg) tutti.service.operations.computeWeights.error.species.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié tutti.service.operations.computeWeights.error.species.noWeight=Espèces - Le lot de %s/%s/%s n'a pas de poids +tutti.service.operations.computeWeights.error.totalLessThanSortedAndUnsorted=Le poids total de la capture est inférieur à la somme des poids total Vrac et Hors Vrac. tutti.service.operations.exportCatchesReport.error=Erreur lors de la génération du rapport des captures tutti.service.operations.exportCatchesReport.specialRows.benthos.code=BENTHOS tutti.service.operations.exportCatchesReport.specialRows.benthos.name=Benthos diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java index 7b72914..7e2e8fd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java @@ -79,6 +79,7 @@ public class NewFishingOperationAction extends EditFishingOperationAction { newFishingOperation.setGearShootingStartDate(null); newFishingOperation.setGearShootingEndDate(null); + newFishingOperation.setFishingOperationValid(true); setFishingOperation(newFishingOperation); super.doAction(); 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 3dc2eee..0ab5aac 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 @@ -567,10 +567,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci getTable().scrollRowToVisible(rowIndex); - if (fromIchtyometer) { +// if (fromIchtyometer) { String unit = model.getLengthStepCaracteristicUnit(); + //Ajout d'un individu de taille <strong>%1$s</strong>%3$s (classe de taille <strong>%2$s</strong>%3$s) showInformationMessage(t("tutti.editSpeciesFrequencies.addMeasure", step, aroundLengthStep, unit)); - } +// } } public void editBatch(FrequencyCellEditor editor) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.