This is an automated email from the git hooks/post-receive script. New commit to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit bf6203c4ee9e76314914d248568413f0e93dee25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 28 11:20:35 2015 +0200 correction du ration d'élévation pour un lot (pris en compte du vrac non trié) (refs #7021) --- .../ifremer/tutti/service/export/generic/TuttiExportService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java index 57c4721..12185b9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java @@ -589,6 +589,10 @@ public class TuttiExportService extends AbstractTuttiService { catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); + Float totalRejectedWeight = Numbers.getValueOrComputedValue( + catchBatch.getCatchTotalRejectedWeight(), + catchBatch.getCatchTotalRejectedComputedWeight()); + Float totalUnsortedWeight = catchBatch.getCatchTotalUnsortedComputedWeight(); @@ -611,8 +615,10 @@ public class TuttiExportService extends AbstractTuttiService { //FIXME tchemit 2013-07-12 J'utilise en fait la formule (Poids de la capture totale - poids du HV dans la capture totale) / (poids total capture triée) // (Poids de la capture totale - poids du HV dans la capture totale) / (poids total capture triée - poids du HV dans la capture totale) +// Float catchRaisingFactor = totalWeight == null || totalUnsortedWeight == null || totalSortedWeight == null ? 1 : (totalWeight - totalUnsortedWeight) / totalSortedWeight; - Float catchRaisingFactor = totalWeight == null || totalUnsortedWeight == null || totalSortedWeight == null ? 1 : (totalWeight - totalUnsortedWeight) / totalSortedWeight; + // tchemit 2015-04-28 see http://forge.codelutin.com/issues/7021 + float catchRaisingFactor = totalWeight == null || totalSortedWeight == null || totalRejectedWeight == null ? 1 : (totalWeight - totalRejectedWeight) / totalSortedWeight; Float speciesCatchRaisingFactor = totalSampleSortedSpeciesWeight == null || totalSortedSpeciesWeight == null || totalSampleSortedSpeciesWeight == null ? 1 : (totalSampleSortedSpeciesWeight == 0 ? 0 : (totalSortedSpeciesWeight / totalSampleSortedSpeciesWeight) * catchRaisingFactor); Float benthosCatchRaisingFactor = totalSampleSortedBenthosWeight == null || totalSortedBenthosWeight == null || totalSampleSortedBenthosWeight == null ? 1 : (totalSampleSortedBenthosWeight == 0 ? 0 : (totalSortedBenthosWeight / totalSampleSortedBenthosWeight) * catchRaisingFactor); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.