Author: tchemit Date: 2013-04-08 12:17:28 +0200 (Mon, 08 Apr 2013) New Revision: 750 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/750 Log: fixes #2227: [CAPTURE] Revoir la structure de l'arbre d'?\195?\169chantillonage Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-08 10:09:01 UTC (rev 749) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-08 10:17:28 UTC (rev 750) @@ -397,8 +397,8 @@ recorderDepartmentId, enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_VRAC_ID, - null, - null); + source.getCatchTotalSortedCarousselWeight(), + source.getCatchTotalSortedTremisWeight()); batch.setRankOrder((short) 1); { @@ -723,7 +723,7 @@ Integer sortingPmfmId, Integer sortingQualitativeValueId, Float weight, - Float sampleWeight) { + Float weightBeforeSampling) { Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); @@ -758,26 +758,30 @@ } // Sampling Ratio - if (sampleWeight == null || weight == null) { + if (weightBeforeSampling == null || weight == null) { target.setSamplingRatio(null); target.setSamplingRatioText(null); } else { - String samplingRatioText = weight + "/" + sampleWeight; + String samplingRatioText = weight + "/" + weightBeforeSampling; samplingRatioText = samplingRatioText.replaceAll(",", "."); target.setSamplingRatioText(samplingRatioText); - target.setSamplingRatio(weight / sampleWeight); + target.setSamplingRatio(weight / weightBeforeSampling); } // Weight - if (sampleWeight == null && weight == null) { + if (weightBeforeSampling == null && weight == null) { // Nothing to do : will be removed later, using notChangedQuantificationMeasurements } else { Float batchReferenceWeight = weight; if (batchReferenceWeight == null) { - batchReferenceWeight = sampleWeight; + batchReferenceWeight = weightBeforeSampling; } - QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement(target, - enumeration.PMFM_ID_WEIGHT_MEASURED, recorderDepartmentId, batchReferenceWeight, true); + QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement( + target, + enumeration.PMFM_ID_WEIGHT_MEASURED, + recorderDepartmentId, + batchReferenceWeight, + true); notChangedQuantificationMeasurements.remove(quantificationMeasurement); }